am: 17e641da

Change-Id: I3689c95bb249a77e6736f66e23065474a0916b9f

am: 41718e24

Change-Id: Ie3052ec70e478b69629e16526542cb616168b58b

am: 4ccf8b83

Change-Id: I54fadc1bd30cc508faccabe1553c2db4cc040904

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: d98024a1

Change-Id: I917a65a35bc607cdc9b820ac55a98d6bfab1b782

am: d2c8dcfc

Change-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab

am: a428392c

Change-Id: Ide67520d074330ec050ded71118bff0bc88be784

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

am: 791a698a

Change-Id: I9b98013a894aa01268ed69a14c6b425e04771936

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

am: a5a493cc

Change-Id: I633d8e838d559056a331bc81bd5db5f644fa4489

am: bd51de1b

Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d

am: ae21b894

Change-Id: If96a33f26fed64a84219868d28765b7581ad453d

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: 8625194c

Change-Id: I5025d99e35dd267ffc3a0c0393a24ebb87cc0546

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: d45a0072

Change-Id: I31e9dddaf3086f885f1a75c88583953da95c8191

Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970  -s ours am: f433884a am: ba928bd5 am: 1add6be2 am: ba460643 am: 111a2c79 am: 4d608d2f am: a6e0a6e3 am: cba64fb4 am: 998ef870 am: bb89a1e3 am: f645a57a am: c3fc745a am: 26e98edf
am: f75d22dc

Change-Id: I587db7b7c343221948ad7a1abccbbfb41de27659

am: 2fa880d0

Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959

Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970  -s ours am: f433884a am: ba928bd5 am: 1add6be2 am: ba460643 am: 111a2c79 am: 4d608d2f am: a6e0a6e3 am: cba64fb4 am: 998ef870 am: bb89a1e3 am: f645a57a am: c3fc745a
am: 26e98edf

Change-Id: I75d7844c2a000fab74cc82881f8ca4cc43f7acf3

Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970  -s ours am: f433884a am: ba928bd5 am: 1add6be2 am: ba460643 am: 111a2c79 am: 4d608d2f am: a6e0a6e3 am: cba64fb4 am: 998ef870 am: bb89a1e3 am: f645a57a
am: c3fc745a

Change-Id: I534f11f2eb0f737a2640acf4482a4af27927f694

Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970  -s ours am: f433884a am: ba928bd5 am: 1add6be2 am: ba460643 am: 111a2c79 am: 4d608d2f am: a6e0a6e3 am: cba64fb4 am: 998ef870 am: bb89a1e3
am: f645a57a

Change-Id: Ibff94cad13a97c9b4a696f5e6df0522e8ac89d50

Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970  -s ours am: f433884a am: ba928bd5 am: 1add6be2 am: ba460643 am: 111a2c79 am: 4d608d2f am: a6e0a6e3 am: cba64fb4 am: 998ef870
am: bb89a1e3

Change-Id: I9e53b0461cb3f28ddc023ba551c1cb4eb1007340

Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970  -s ours am: f433884a am: ba928bd5 am: 1add6be2 am: ba460643 am: 111a2c79 am: 4d608d2f am: a6e0a6e3 am: cba64fb4
am: 998ef870

Change-Id: Icaf066033ce67780052b30be3de891907129404e

Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970  -s ours am: f433884a am: ba928bd5 am: 1add6be2 am: ba460643 am: 111a2c79 am: 4d608d2f am: a6e0a6e3
am: cba64fb4

Change-Id: I9c4fc2279ffa79ee85dc8a46be21095918fa52ad

Back-port fixes for b/62196835 am: 5bdffc5d am: 5a7eb970  -s ours am: f433884a am: ba928bd5 am: 1add6be2 am: ba460643 am: 111a2c79 am: 4d608d2f
am: a6e0a6e3

Change-Id: Ia5af67f07974b520d8c3e7424c07402793a486f2