am: d1ffb134

Change-Id: I2e8cde8a7be8bdbdeebb00df053fdc621d30cdec

am: 0f3d90ee  -s ours

Change-Id: If37c0a67a40a2b1ee0d5e3050cba38af5e932e83

ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.

All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.

Bug: 37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29

am: 29926838

Change-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100

am: 4ccf8b83

Change-Id: I54fadc1bd30cc508faccabe1553c2db4cc040904

ALOGD_IF_SLOW isn't intuitively implemented as it cannot handle
temporaries used as its parameters.  Since there are so few users of
it already and since it's just sugar on top of 2 otherwise trivial
lines, we opt to remove it entirely.

Bug: 62820330
Test: Build
Change-Id: I196443b3717497f6cab31bfaee94a229e4838556
Merged-In: I196443b3717497f6cab31bfaee94a229e4838556

Added new subitems for
.dex:
boot vdex
app vdex
app odex

.art
app art
boot art

Fixed accounting for dalvik other to be subitems of other subsection
instead of dalvik.

Sample output:
261,892K: Native
213,196K: .dex mmap
    111,620K: .App vdex
    65,070K: .App dex
    36,506K: .Boot vdex
192,320K: EGL mtrack
161,835K: .so mmap
134,922K: .apk mmap
85,612K: Dalvik
    74,656K: .Heap
    4,526K: .Zygote
    4,218K: .LOS
    2,212K: .NonMoving
64,906K: Unknown
52,119K: .oat mmap
42,828K: Dalvik Other
    32,704K: .LinearAlloc
    3,672K: .JITCache
    3,248K: .IndirectRef
    3,204K: .GC
40,754K: .art mmap
    31,133K: .Boot art
    9,621K: .App art
21,976K: Other mmap
20,704K: Stack
16,270K: Gfx dev
9,200K: GL mtrack
3,428K: Other dev
2,744K: .ttf mmap
1,116K: Ashmem
1,052K: .jar mmap
0K: Cursor
0K: Other mtrack

Test: dumpsys meminfo -d
Test: dumpsys meminfo -s
Test: dumpsys meminfo
Test: dumpsys meminfo <pid>
Test: dumpsys memifno -d <pid>

Bug: 32331673

(cherry picked from commit 95550dd3)

Change-Id: I7557ee09510651c7b5ddee646c92adbcdd3472db

am: d2c8dcfc

Change-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031

This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.

At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.

This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
  1) easy extensibility for new test case,
  2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.

Bug: 62988545
Test: added new test in FrameworksNetTests,
      $ runtest frameworks-net
      $ runtest frameworks-wifi
Merged-In: I060b02603af7d73a6407df89344bf0c000574af2

(cherry pick of commit 2757fcf3)

Change-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53

am: d8dab115

Change-Id: I958ef6fc2d667a691e39e9fadd07303085a499f9

Test: CtsLibcoreTestCases
Bug: 62949898
Change-Id: Icc41052e9476cc08bf3fa9579964f141d164c36c

am: bd51de1b

Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d

am: de837a97

Change-Id: I741b6e31fb3adc922f47df824188786ff35e3aa9

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - observed calls to the HAL setLocalPrefixes in tethering log
Bug: 29337859
Bug: 32163131
Merged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Merged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1
Merged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
(cherry picked from commit 32179ff8)

Change-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05

am: 31419a4a

Change-Id: I455be72533c24ceb5ea352774ded30d0c0a2367f

This reverts commit 2df4e144. 
It was causing failures in packages/apps/DocumentsUI tests

Bug: 63638102
Bug: 63154326
Change-Id: I51fb54f705f58f159f4fcc30bfed41ababcba950

Bug: 36233029
Test: links, compiles, hidl_test_java

Change-Id: I7e2ec88b2098886983b1d93ab100a77db63f3976

* Implement listPendingDownloads and resetDownloadKnowledge
* Bring MbmsStreamingManager docs in line with vendor-side API docs.
* Remove activeStreamingServicesUpdated
* Reorganize the errors in MbmsException into categories.
* Add some vendor API docs for file-download

Change-Id: Ia29066ea6f2c0414171cffa1ae11bb467f187bee

am: 2fa880d0

Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959

am: aff0d1af

Change-Id: I4cebe1df49397405ee6492c8420f07f01ea2e3f7

am: 8ad1c81b

Change-Id: I261ae05664d620997d38ca40edaffd8ca11b308e

Re-enable use of isPrivilegedApp() since it appears to work.

Bug: 35995024
Bug: 31008728
Test: Manual testing
Change-Id: If5a59aeba19320d55b42ff3dd28a654bce27dd35

am: b279ec51

Change-Id: Idbb8fc5c6e6cd912acbca1b5b144533dbfff2775

am: b27c5e92

Change-Id: Ibb5f53e5e81c7969ae8edf73a42d11cd8505b0d4

Keep the android.hardware.tetheroffload.control.V1_0.OffloadCallbackEvent
import from leaking outside of OffloadHardwareInterface by converting each
event type into a separate callback.

Add basic logging implementation in OffloadController. Seems like every
call just needs to log save for two that actually need to do work:

    - onSupportAvailable()
      * poll stats and notify NetworkStatsService
      * (re)push all state, as the hardware now supports offload (again)

    - onStoppedLimitReached()
      * poll stats and notify NetworkStatsService

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passed
Bug: 29337859
Bug: 32163131
Merged-In: I7c7675922a561a4642120df51715a550dab7f503
Merged-In: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d
Merged-In: I46c2e5252ae72a09a1550862847c1af441ece072
(cherry picked from commit a0885000)

Change-Id: I1981d8da79f24dd0b4d76b930a5f179682500294