OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "JankBench: Add Bitmap Upload to list of runnable tests" am: 9c4b6532b2
Joel Fernandes [Fri, 25 Jan 2019 17:57:50 +0000 (09:57 -0800)]
Merge "JankBench: Add Bitmap Upload to list of runnable tests" am: 9c4b6532b2
am: 1f90d94383

Change-Id: Ic714757588429fb0ef97b6c1967e1768a773e847

5 years agoMerge "JankBench: Fix execution of incorrect benchmark" am: 8a52fda1fa
Joel Fernandes [Fri, 25 Jan 2019 17:52:35 +0000 (09:52 -0800)]
Merge "JankBench: Fix execution of incorrect benchmark" am: 8a52fda1fa
am: 187fcc9fad

Change-Id: I6ce4a5a92e5ec90521d20d9a32d14556c32163ff

5 years agoMerge "JankBench: Add Bitmap Upload to list of runnable tests"
Joel Fernandes [Fri, 25 Jan 2019 17:40:21 +0000 (09:40 -0800)]
Merge "JankBench: Add Bitmap Upload to list of runnable tests"
am: 9c4b6532b2

Change-Id: I4b085d22ae316b8308f9b4173c73fd55c1ed1c7f

5 years agoMerge "JankBench: Fix execution of incorrect benchmark"
Joel Fernandes [Fri, 25 Jan 2019 17:36:27 +0000 (09:36 -0800)]
Merge "JankBench: Fix execution of incorrect benchmark"
am: 8a52fda1fa

Change-Id: I2032004ccf5e57a0ebb785e9adc0a871750529c4

5 years ago[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup depende...
Suren Baghdasaryan [Fri, 25 Jan 2019 17:30:02 +0000 (09:30 -0800)]
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include""" am: 113fbed900 -s ours
am: a2052d9f7d -s ours
am skip reason: subject contains skip directive

Change-Id: I2e606e75c6e75860b19e3e4f25d9a9ee13bc81af

5 years ago[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup depende...
Suren Baghdasaryan [Fri, 25 Jan 2019 17:19:52 +0000 (09:19 -0800)]
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include"""
am: 113fbed900 -s ours
am skip reason: subject contains skip directive

Change-Id: I068ed1b928689e97c24ac0f48a28c05e6a0c7c09

5 years agoMerge "JankBench: Add Bitmap Upload to list of runnable tests"
Joel Fernandes [Fri, 25 Jan 2019 17:14:44 +0000 (17:14 +0000)]
Merge "JankBench: Add Bitmap Upload to list of runnable tests"

5 years agoMerge "JankBench: Fix execution of incorrect benchmark"
Joel Fernandes [Fri, 25 Jan 2019 17:14:15 +0000 (17:14 +0000)]
Merge "JankBench: Fix execution of incorrect benchmark"

5 years agoMerge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_pol...
Suren Baghdasaryan [Fri, 25 Jan 2019 17:09:02 +0000 (17:09 +0000)]
Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include"""

5 years agoDO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy...
Suren Baghdasaryan [Fri, 25 Jan 2019 05:23:40 +0000 (05:23 +0000)]
DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include""

This reverts commit c5e0fdab2c7ff039db26e4d6512bd3d69bdd71d6.

Reason for revert: AOSP is fixed with new vendor image

Change-Id: Iae858f743fbd7e4f58f89b8ba0498f10f6ae0e81
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
5 years agoMerge "Fix IpClientTest" am: 5e823ab263
Remi NGUYEN VAN [Fri, 25 Jan 2019 06:19:45 +0000 (22:19 -0800)]
Merge "Fix IpClientTest" am: 5e823ab263
am: 3d212804df

Change-Id: Iaf861221325d914202f4d9d7f7d584b7bba7a774

5 years agoMerge "Fix IpClientTest"
Remi NGUYEN VAN [Fri, 25 Jan 2019 06:07:26 +0000 (22:07 -0800)]
Merge "Fix IpClientTest"
am: 5e823ab263

Change-Id: I25077d83d0821b9ba1449b7c1c716a44a71f7287

5 years agoMerge "Fix IpClientTest"
Remi NGUYEN VAN [Fri, 25 Jan 2019 05:55:08 +0000 (05:55 +0000)]
Merge "Fix IpClientTest"

5 years agoMerge "Enables the use of the blastula pool." am: 33a09948e5
Christian Wailes [Fri, 25 Jan 2019 02:31:37 +0000 (18:31 -0800)]
Merge "Enables the use of the blastula pool." am: 33a09948e5
am: b649fda0ef

Change-Id: I489ce1f3a9aa072d9627376448bb6bf25b026d5e

5 years agoMerge "Added Java Language methods for blastula management." am: 0d9156a9c0
Christian Wailes [Fri, 25 Jan 2019 02:23:22 +0000 (18:23 -0800)]
Merge "Added Java Language methods for blastula management." am: 0d9156a9c0
am: 8a2facfa4c

Change-Id: Iec674c1318ae87310ff3327fc5f10d48e3191af5

5 years agoMerge "Enables the use of the blastula pool."
Christian Wailes [Fri, 25 Jan 2019 02:22:15 +0000 (18:22 -0800)]
Merge "Enables the use of the blastula pool."
am: 33a09948e5

Change-Id: Ibe2aa45a1df74674b82127f0c8588694c39461cf

5 years agoMerge "Added Java Language methods for blastula management."
Christian Wailes [Fri, 25 Jan 2019 02:14:40 +0000 (18:14 -0800)]
Merge "Added Java Language methods for blastula management."
am: 0d9156a9c0

Change-Id: I7833c149e1aac2b0621da6d4f33b4fe800fb0a3e

5 years agoMerge "Enables the use of the blastula pool."
Christian Wailes [Fri, 25 Jan 2019 02:06:47 +0000 (02:06 +0000)]
Merge "Enables the use of the blastula pool."

5 years agoMerge "Added Java Language methods for blastula management."
Christian Wailes [Fri, 25 Jan 2019 02:06:28 +0000 (02:06 +0000)]
Merge "Added Java Language methods for blastula management."

5 years agoMerge "A get method for NR status in ServiceState" am: c09b41cada
Pengquan Meng [Fri, 25 Jan 2019 01:03:41 +0000 (17:03 -0800)]
Merge "A get method for NR status in ServiceState" am: c09b41cada
am: 145fc05417

Change-Id: I36d4378149959c7d4c04b0b90a070d8b6686f8a7

5 years agoMerge changes If54fa3a8,Ie7bd1459 am: 166c3aa030
Lorenzo Colitti [Fri, 25 Jan 2019 00:54:10 +0000 (16:54 -0800)]
Merge changes If54fa3a8,Ie7bd1459 am: 166c3aa030
am: dab15ff5f8

Change-Id: If68ce4578c30fdb1e5d87f67bcaaec125f647b2c

5 years agoMerge "A get method for NR status in ServiceState"
Pengquan Meng [Fri, 25 Jan 2019 00:53:22 +0000 (16:53 -0800)]
Merge "A get method for NR status in ServiceState"
am: c09b41cada

Change-Id: Ifc6f7ef34c6e84c361c02493a1afb3dcaa6ae25a

5 years agoEnables the use of the blastula pool.
Chris Wailes [Sat, 12 Jan 2019 01:13:00 +0000 (17:13 -0800)]
Enables the use of the blastula pool.

This commit adds the code necessar to initialize and use the blastula
pool during application launching.  Highlights include:
* Modifying ZygoteState to allow the creation of blastula session
sockets
* Modified application startup to track if a web view process is being
created.
* Initialization of the blastula pool during Zygote initialization.
* Blastula lifecycle management via reporting pipes and event FDs.
* Launching of applications via the blastula pool.

The creation, maintenance, and use of the blastula pool can be disabled
by setting Zygote.BLASTULA_POOL_ENABLED to false.  When this feature is
disabled applications will launch as they did before this patch.

Topic: zygote-prefork
Test: make & flash & launch app & check log message
Bug: 68253328
Change-Id: I46c32ad09400591e866b6c6121d5a9b0332092f3
Merged-In: I46c32ad09400591e866b6c6121d5a9b0332092f3

5 years agoAdded Java Language methods for blastula management.
Chris Wailes [Sat, 12 Jan 2019 01:04:41 +0000 (17:04 -0800)]
Added Java Language methods for blastula management.

This commit adds Java Language wrappers for native blastula management
functions.  No changes are made to the application lifecycle.

Topic: zygote-prefork
Test: make & flash & launch apps & check log for messages
Bug: 68253328
Change-Id: Ie9fd0aea2952dbd3baaca22c820e9af700f5e89d
Merged-In: Ie9fd0aea2952dbd3baaca22c820e9af700f5e89d

5 years agoMerge changes If54fa3a8,Ie7bd1459
Lorenzo Colitti [Fri, 25 Jan 2019 00:46:51 +0000 (16:46 -0800)]
Merge changes If54fa3a8,Ie7bd1459
am: 166c3aa030

Change-Id: I492f9fab4b7e69d214911820f7d4c0a00540bac7

5 years agoMerge "Fix IPMS tests timeout." am: 1f9d80f6ee
Chalard Jean [Fri, 25 Jan 2019 00:46:01 +0000 (16:46 -0800)]
Merge "Fix IPMS tests timeout." am: 1f9d80f6ee
am: 618ff5185a

Change-Id: Ie8d1934205810586812714e5a63f10dc5fa01841

5 years agoMerge "A get method for NR status in ServiceState"
Pengquan Meng [Fri, 25 Jan 2019 00:40:48 +0000 (00:40 +0000)]
Merge "A get method for NR status in ServiceState"

5 years agoMerge "Fix IPMS tests timeout."
Chalard Jean [Fri, 25 Jan 2019 00:36:27 +0000 (16:36 -0800)]
Merge "Fix IPMS tests timeout."
am: 1f9d80f6ee

Change-Id: Ia73f410da8c42e9933dd290deacb82909b4348a6

5 years agoMerge changes If54fa3a8,Ie7bd1459
Lorenzo Colitti [Fri, 25 Jan 2019 00:25:51 +0000 (00:25 +0000)]
Merge changes If54fa3a8,Ie7bd1459

* changes:
  Extract network observer code from NetworkManagementService.
  Change the signature of notifyInterfaceClassActivity.

5 years agoMerge "Fix IPMS tests timeout."
Treehugger Robot [Fri, 25 Jan 2019 00:15:50 +0000 (00:15 +0000)]
Merge "Fix IPMS tests timeout."

5 years agoMerge "Fix NPE in parcel constructor" am: 23a6598fe4
Jordan Liu [Thu, 24 Jan 2019 23:28:50 +0000 (15:28 -0800)]
Merge "Fix NPE in parcel constructor" am: 23a6598fe4
am: 12b8ba1667

Change-Id: I7be389cacc368dd60506cbf0824350ac4247a016

5 years agoMerge "Fix NPE in parcel constructor"
Jordan Liu [Thu, 24 Jan 2019 23:17:03 +0000 (15:17 -0800)]
Merge "Fix NPE in parcel constructor"
am: 23a6598fe4

Change-Id: I686adb8ab08b17681a10caacca47a926477487d1

5 years agoMerge "Fix NPE in parcel constructor"
Jordan Liu [Thu, 24 Jan 2019 22:50:43 +0000 (22:50 +0000)]
Merge "Fix NPE in parcel constructor"

5 years agoMerge "Add a new bugreport error code" am: 1bed967833
Nandana Dutt [Thu, 24 Jan 2019 22:46:28 +0000 (14:46 -0800)]
Merge "Add a new bugreport error code" am: 1bed967833
am: 9bf1411e38

Change-Id: Ie153b43c6bc698d8daaf93f3bda1ce589307c6b3

5 years agoMerge "Add a new bugreport error code"
Nandana Dutt [Thu, 24 Jan 2019 22:35:59 +0000 (14:35 -0800)]
Merge "Add a new bugreport error code"
am: 1bed967833

Change-Id: Id99ec17d82435ac3eb108d2bce56cbca8f1140eb

5 years agoMerge "Add a new bugreport error code"
Treehugger Robot [Thu, 24 Jan 2019 22:21:16 +0000 (22:21 +0000)]
Merge "Add a new bugreport error code"

5 years agoMerge "Revert "Whitelist packages from VPN lockdown."" am: 9f73671651
Dan Albert [Thu, 24 Jan 2019 21:58:15 +0000 (13:58 -0800)]
Merge "Revert "Whitelist packages from VPN lockdown."" am: 9f73671651
am: 2f94ef95c4

Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8

5 years agoA get method for NR status in ServiceState
Pengquan Meng [Fri, 7 Dec 2018 01:48:05 +0000 (17:48 -0800)]
A get method for NR status in ServiceState

Bug: 111453000
Bug: 123099654
Test: build
Merged-In: I07749ff00fc9d53796208ca78721b498ed4c16fd
Change-Id: I07749ff00fc9d53796208ca78721b498ed4c16fd

5 years agoMerge "Revert "Whitelist packages from VPN lockdown.""
Dan Albert [Thu, 24 Jan 2019 21:45:19 +0000 (13:45 -0800)]
Merge "Revert "Whitelist packages from VPN lockdown.""
am: 9f73671651

Change-Id: Ibaf799dc2664a6b3b743030da956679a3414ad9d

5 years agoKeep PluginManager reference to avoid NPE
Lucas Dupin [Thu, 24 Jan 2019 21:31:35 +0000 (13:31 -0800)]
Keep PluginManager reference to avoid NPE
am: 5d378dfeac

Change-Id: Ibe4591fbf787f4fd6781a7927728db394735d9e8

5 years agoMerge "Revert "Whitelist packages from VPN lockdown.""
Dan Albert [Thu, 24 Jan 2019 21:08:46 +0000 (21:08 +0000)]
Merge "Revert "Whitelist packages from VPN lockdown.""

5 years agoMerge "Define Nfc statistic data atoms" am: 961a43eae2
Jack Yu [Thu, 24 Jan 2019 21:07:37 +0000 (13:07 -0800)]
Merge "Define Nfc statistic data atoms" am: 961a43eae2
am: 20548152f7

Change-Id: Ie72691a9bbdc505497c4cc99a1feadcc088a1baa

5 years agoRevert "Whitelist packages from VPN lockdown."
Dan Albert [Thu, 24 Jan 2019 21:05:39 +0000 (21:05 +0000)]
Revert "Whitelist packages from VPN lockdown."

This reverts commit bb9cef04c5b6699412d43d82bdd31c7a4f692cbc.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68

5 years agoMerge "Define Nfc statistic data atoms"
Jack Yu [Thu, 24 Jan 2019 20:51:27 +0000 (12:51 -0800)]
Merge "Define Nfc statistic data atoms"
am: 961a43eae2

Change-Id: I78c78169f9c75b8ca0dc527d2606cdbc0e15af6f

5 years agoMerge "Define Nfc statistic data atoms"
Treehugger Robot [Thu, 24 Jan 2019 20:25:57 +0000 (20:25 +0000)]
Merge "Define Nfc statistic data atoms"

5 years agoMerge "ParcelFileDescriptor: fix various ownership mistakes." am: 8d7976a37e
Josh Gao [Thu, 24 Jan 2019 19:23:02 +0000 (11:23 -0800)]
Merge "ParcelFileDescriptor: fix various ownership mistakes." am: 8d7976a37e
am: d152e75a7c

Change-Id: I3e20c989ed4ea141c14163421ce02b7d2c4c1470

5 years agoMerge "Use delta reads for per uid traffic stats" am: 48f46ac83c
Chenbo Feng [Thu, 24 Jan 2019 19:12:54 +0000 (11:12 -0800)]
Merge "Use delta reads for per uid traffic stats" am: 48f46ac83c
am: d5cc53302f

Change-Id: Ibc1e7d1b6be2915d4000cda2b7a9141ac387f7f0

5 years agoMerge "ParcelFileDescriptor: fix various ownership mistakes."
Josh Gao [Thu, 24 Jan 2019 19:02:17 +0000 (11:02 -0800)]
Merge "ParcelFileDescriptor: fix various ownership mistakes."
am: 8d7976a37e

Change-Id: I4a6b274fcbb09ab52242f00a85630e91c1d87a5a

5 years agoMerge changes from topics "ut_provision_api", "ims_prov_api_defs" am: 3fc958475b
Brad Ebinger [Thu, 24 Jan 2019 18:58:53 +0000 (10:58 -0800)]
Merge changes from topics "ut_provision_api", "ims_prov_api_defs" am: 3fc958475b
am: 1e6ed3c5eb

Change-Id: Ib16f22466459b5a294cfab5d020f64aad11cecfc

5 years agoFix NPE in parcel constructor
Jordan Liu [Thu, 24 Jan 2019 18:55:15 +0000 (10:55 -0800)]
Fix NPE in parcel constructor

Instead of calling .getClass().getClassLoader, we use .class to avoid
NPE on the uninitialized PreciseCallState and CallQuality.

Test: manual
Bug: 110107501
Change-Id: I1092122a69aa17235627a22fd973f21d49fc4812

5 years agoMerge "Use delta reads for per uid traffic stats"
Chenbo Feng [Thu, 24 Jan 2019 18:55:09 +0000 (10:55 -0800)]
Merge "Use delta reads for per uid traffic stats"
am: 48f46ac83c

Change-Id: I17faec2cc2a73e56d0f19abad32154b378857fc4

5 years agoDefine a subset of provisioning integers as public am: ad9aec3522
Brad Ebinger [Thu, 24 Jan 2019 18:53:29 +0000 (10:53 -0800)]
Define a subset of provisioning integers as public am: ad9aec3522
am: 7b353e207e

Change-Id: I55969aca6c0f948dc911eac8c587e322f8da6901

5 years agoMerge "ParcelFileDescriptor: fix various ownership mistakes."
Josh Gao [Thu, 24 Jan 2019 18:49:03 +0000 (18:49 +0000)]
Merge "ParcelFileDescriptor: fix various ownership mistakes."

5 years agoMerge changes from topics "ut_provision_api", "ims_prov_api_defs"
Brad Ebinger [Thu, 24 Jan 2019 18:42:58 +0000 (10:42 -0800)]
Merge changes from topics "ut_provision_api", "ims_prov_api_defs"
am: 3fc958475b

Change-Id: I5d3132d6b8c2ae69bb808350dc81786774bdc3ea

5 years agoMerge "Introduce system APIs for Bluetooth silence mode." am: d17b284bdb
Ugo Yu [Thu, 24 Jan 2019 18:37:47 +0000 (10:37 -0800)]
Merge "Introduce system APIs for Bluetooth silence mode." am: d17b284bdb
am: 5a5217d2b8

Change-Id: Icdc5720da633f3cba7e1acb730b4ca21475d6f4b

5 years agoDefine a subset of provisioning integers as public
Brad Ebinger [Thu, 24 Jan 2019 18:35:59 +0000 (10:35 -0800)]
Define a subset of provisioning integers as public
am: ad9aec3522

Change-Id: I89c0b4242b68f545cce6043341150d45d4e22643

5 years agoKeep PluginManager reference to avoid NPE
Lucas Dupin [Fri, 16 Nov 2018 19:31:33 +0000 (11:31 -0800)]
Keep PluginManager reference to avoid NPE

Test: manual
Change-Id: Ie7ff3eca7a9a02afff0a12d64ec8e40f136ed8d4
Fixes: 118969577
(cherry picked from commit c8a01350d3961e8eb0f49a5d9247fc633da2cb44)

5 years agoMerge "Introduce system APIs for Bluetooth silence mode."
Ugo Yu [Thu, 24 Jan 2019 18:28:07 +0000 (10:28 -0800)]
Merge "Introduce system APIs for Bluetooth silence mode."
am: d17b284bdb

Change-Id: Ie772b9b3aa4ac4e4592f20323a0a627c24410dd6

5 years agoMerge "Add API for proxy configuration over VPN." am: 8b5917965d
Irina Dumitrescu [Thu, 24 Jan 2019 18:20:32 +0000 (10:20 -0800)]
Merge "Add API for proxy configuration over VPN." am: 8b5917965d
am: ac77629a1e

Change-Id: I51930e4ed99cc3df10db2c8bbef27989f0a06a46

5 years agoMerge "Use delta reads for per uid traffic stats"
Chenbo Feng [Thu, 24 Jan 2019 18:16:25 +0000 (18:16 +0000)]
Merge "Use delta reads for per uid traffic stats"

5 years agoMerge changes from topics "ut_provision_api", "ims_prov_api_defs"
Brad Ebinger [Thu, 24 Jan 2019 18:09:14 +0000 (18:09 +0000)]
Merge changes from topics "ut_provision_api", "ims_prov_api_defs"

* changes:
  Add new UT provisioning CarrierConfig options
  Define a subset of provisioning integers as public

5 years agoMerge "Add API for proxy configuration over VPN."
Irina Dumitrescu [Thu, 24 Jan 2019 18:08:07 +0000 (10:08 -0800)]
Merge "Add API for proxy configuration over VPN."
am: 8b5917965d

Change-Id: I647aec5f7678668b8ef7d616150adac1086dbbdd

5 years agoMerge "Introduce system APIs for Bluetooth silence mode."
Treehugger Robot [Thu, 24 Jan 2019 18:08:05 +0000 (18:08 +0000)]
Merge "Introduce system APIs for Bluetooth silence mode."

5 years agoMerge "Whitelist packages from VPN lockdown." am: efc773525c
Pavel Grafov [Thu, 24 Jan 2019 18:06:37 +0000 (10:06 -0800)]
Merge "Whitelist packages from VPN lockdown." am: efc773525c
am: 295016b22b

Change-Id: I643fc2603f7cd2b928fe517eb473048004273835

5 years agoMerge "Add API for proxy configuration over VPN."
Treehugger Robot [Thu, 24 Jan 2019 17:52:22 +0000 (17:52 +0000)]
Merge "Add API for proxy configuration over VPN."

5 years agoMerge "Whitelist packages from VPN lockdown."
Pavel Grafov [Thu, 24 Jan 2019 17:49:42 +0000 (09:49 -0800)]
Merge "Whitelist packages from VPN lockdown."
am: efc773525c

Change-Id: I329e24f1359a11a72ae9d0a23d2dc5b5de5aa8a7

5 years agoMerge "Whitelist packages from VPN lockdown."
Pavel Grafov [Thu, 24 Jan 2019 17:34:55 +0000 (17:34 +0000)]
Merge "Whitelist packages from VPN lockdown."

5 years agoWhitelist packages from VPN lockdown.
Pavel Grafov [Wed, 5 Dec 2018 10:40:23 +0000 (10:40 +0000)]
Whitelist packages from VPN lockdown.

Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Merged-In: I7f6c5b9172063b588feacd6b9930a6cb88f764ab

5 years agoAdd API for proxy configuration over VPN.
Irina Dumitrescu [Wed, 5 Dec 2018 16:19:47 +0000 (16:19 +0000)]
Add API for proxy configuration over VPN.

Test: runtest -x
frameworks/base/tests/net/java/com/android/server/ConnectivityServiceTest.java
&& atest HostsideVpnTests
Bug: 76001058
Change-Id: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
Merged-In: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a

5 years agoExtract network observer code from NetworkManagementService.
Lorenzo Colitti [Thu, 24 Jan 2019 04:28:50 +0000 (13:28 +0900)]
Extract network observer code from NetworkManagementService.

This will allow us to use network observers in the NetworkStack
app without duplicating too much code.

Bug: 112869080
Test: atest FrameworksNetTests
Test: builds, boots, wifi works
Change-Id: If54fa3a88110ffa815899d385dbb0d5770abaead

5 years agoMerge "Allow light HAL to exit if it's a lazy HAL" am: 1146f76c55
Peter Kalauskas [Thu, 24 Jan 2019 15:37:35 +0000 (07:37 -0800)]
Merge "Allow light HAL to exit if it's a lazy HAL" am: 1146f76c55
am: a1fc94c6ba

Change-Id: Ie897ae2603736c6ddb9043a844239eec57b41471

5 years agoChange the signature of notifyInterfaceClassActivity.
Lorenzo Colitti [Thu, 24 Jan 2019 07:00:25 +0000 (16:00 +0900)]
Change the signature of notifyInterfaceClassActivity.

This simplifies an upcoming refactoring of the notification code.
There is no change in functionality because DC_POWER_STAET_MEDIUM
was never actually used.

Bug: 112869080
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: Ie7bd145961bbd7f2a424be4299e2085da9cddc38

5 years agoMerge "Allow light HAL to exit if it's a lazy HAL"
Peter Kalauskas [Thu, 24 Jan 2019 15:26:40 +0000 (07:26 -0800)]
Merge "Allow light HAL to exit if it's a lazy HAL"
am: 1146f76c55

Change-Id: Iaaa50c53383eae94bf07eda443589e647301f248

5 years agoMerge "Allow light HAL to exit if it's a lazy HAL"
Peter Kalauskas [Thu, 24 Jan 2019 15:11:02 +0000 (15:11 +0000)]
Merge "Allow light HAL to exit if it's a lazy HAL"

5 years agoMerge "Add jar files from the runtime APEX in the whitelist." am: 4d3a2f95c6
Nicolas Geoffray [Thu, 24 Jan 2019 15:03:32 +0000 (07:03 -0800)]
Merge "Add jar files from the runtime APEX in the whitelist." am: 4d3a2f95c6
am: b5a3c59d3a

Change-Id: Iec1e66f533063cde4529a0f4d874418b4f01e0d6

5 years agoMerge "Add jar files from the runtime APEX in the whitelist."
Nicolas Geoffray [Thu, 24 Jan 2019 14:54:57 +0000 (06:54 -0800)]
Merge "Add jar files from the runtime APEX in the whitelist."
am: 4d3a2f95c6

Change-Id: I78c60b3a378298531a7ef219ae0930965ddfb64d

5 years agoMerge "Add jar files from the runtime APEX in the whitelist."
Nicolas Geoffray [Thu, 24 Jan 2019 14:38:17 +0000 (14:38 +0000)]
Merge "Add jar files from the runtime APEX in the whitelist."

5 years agoMerge "Include OrgApacheHttpLegacyUpdater unconditionally" am: 87c1081c42
Paul Duffin [Thu, 24 Jan 2019 11:46:43 +0000 (03:46 -0800)]
Merge "Include OrgApacheHttpLegacyUpdater unconditionally" am: 87c1081c42
am: 34269e4b74

Change-Id: I19a0c5d9d9a2c2c0e5cf482a5a574f304a8ce765

5 years agoMerge "Popup a notification after logging in the captive portal network" am: 6fa3d391b8
Lucas Lin [Thu, 24 Jan 2019 11:41:40 +0000 (03:41 -0800)]
Merge "Popup a notification after logging in the captive portal network" am: 6fa3d391b8
am: ff4106fc42

Change-Id: I46598799c8a21d986d1790afc5c4b01726081e97

5 years agoMerge "Include OrgApacheHttpLegacyUpdater unconditionally"
Paul Duffin [Thu, 24 Jan 2019 11:32:25 +0000 (03:32 -0800)]
Merge "Include OrgApacheHttpLegacyUpdater unconditionally"
am: 87c1081c42

Change-Id: I724fa0b8b997aa58ce444aa8a929f47af665abed

5 years agoMerge "Popup a notification after logging in the captive portal network"
Lucas Lin [Thu, 24 Jan 2019 11:27:36 +0000 (03:27 -0800)]
Merge "Popup a notification after logging in the captive portal network"
am: 6fa3d391b8

Change-Id: I78321e10014525dfb02da29ee2f3cd4487bf30db

5 years agoFix IpClientTest
Remi NGUYEN VAN [Thu, 24 Jan 2019 11:13:09 +0000 (20:13 +0900)]
Fix IpClientTest

NetworkStackTests is run with a version of mockito that allows mocking
final methods, which broke mocking of the ConnectivityService.

Test: atest NetworkStackTests
Change-Id: I430fe12216c43a0c4265a504dbefafad37c09291

5 years agoMerge "Include OrgApacheHttpLegacyUpdater unconditionally"
Paul Duffin [Thu, 24 Jan 2019 11:12:47 +0000 (11:12 +0000)]
Merge "Include OrgApacheHttpLegacyUpdater unconditionally"

5 years agoMerge "Popup a notification after logging in the captive portal network"
Lucas Lin [Thu, 24 Jan 2019 11:06:12 +0000 (11:06 +0000)]
Merge "Popup a notification after logging in the captive portal network"

5 years agoMerge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef" am: 54d74bbf06
Pengquan Meng [Thu, 24 Jan 2019 11:01:00 +0000 (03:01 -0800)]
Merge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef" am: 54d74bbf06
am: 28b34fac22

Change-Id: Id81adaed00949117d5a732a5756afec5da40c4ee

5 years agoMerge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef"
Pengquan Meng [Thu, 24 Jan 2019 10:51:46 +0000 (02:51 -0800)]
Merge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef"
am: 54d74bbf06

Change-Id: Ie6cd95f5f6b1569c6b3d84a24ecd69664fcdad67

5 years agoMerge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef"
Pengquan Meng [Thu, 24 Jan 2019 10:35:40 +0000 (10:35 +0000)]
Merge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef"

5 years agoFix IPMS tests timeout.
Chalard Jean [Thu, 24 Jan 2019 10:34:39 +0000 (19:34 +0900)]
Fix IPMS tests timeout.

The tests used to correctly detect failures but would mostly wait
for timeout instead of succeeding immediately. If timeout were to
happen, that would not have been detected.

Test: atest IpMemoryStoreServiceTest
Change-Id: Ic1e7fcac3020739af7dc3e2c294d0838d8ffc711

5 years agoMerge "Add additional SystemApi for NetworkStack" am: 2ffdcc26b0
Remi NGUYEN VAN [Thu, 24 Jan 2019 10:17:38 +0000 (02:17 -0800)]
Merge "Add additional SystemApi for NetworkStack" am: 2ffdcc26b0
am: aee43d2387

Change-Id: I5bdc50e7886731f61222bd1edd33765941118175

5 years agoMerge "Add additional SystemApi for NetworkStack"
Remi NGUYEN VAN [Thu, 24 Jan 2019 10:06:15 +0000 (02:06 -0800)]
Merge "Add additional SystemApi for NetworkStack"
am: 2ffdcc26b0

Change-Id: I2614b1484498ad9d285be5f6628a94983f1561e4

5 years agoMerge "Add additional SystemApi for NetworkStack"
Remi NGUYEN VAN [Thu, 24 Jan 2019 09:55:01 +0000 (09:55 +0000)]
Merge "Add additional SystemApi for NetworkStack"

5 years agoAdd jar files from the runtime APEX in the whitelist.
Nicolas Geoffray [Tue, 22 Jan 2019 20:56:44 +0000 (20:56 +0000)]
Add jar files from the runtime APEX in the whitelist.

Those files moved from /system to the APEX.

Test: m && boots
Change-Id: I68c4c8243dae3eab321da4b0923c1a422d300c10

5 years agoPopup a notification after logging in the captive portal network
lucaslin [Thu, 24 Jan 2019 07:55:30 +0000 (15:55 +0800)]
Popup a notification after logging in the captive portal network

Captive portal app will be auto dismissed after user login the
captive portal network. In order to improve the user experience,
popup a notification to notify user that the captive portal
network is connected.

Bug: 113629026
Test: 1.atest FrameworksNetTests:NetworkNotificationManagerTest
      2.Connect to a captive portal network and login, check if
      there is a notification popup.

Change-Id: Id54d12268e107af2f213c2bb348c5f7908e880f4

5 years agoMerge "Align coding format in data_stall_event.proto" am: 0d4002db35
Chiachang Wang [Thu, 24 Jan 2019 07:40:51 +0000 (23:40 -0800)]
Merge "Align coding format in data_stall_event.proto" am: 0d4002db35
am: 5419f98396

Change-Id: Ib0e7c12df86634a0b6dc4e5c441a370c38fa26e2

5 years agoMerge "Change MetadataListener to a abstract static class" am: 9d3ce3e55e
Ugo Yu [Thu, 24 Jan 2019 07:30:18 +0000 (23:30 -0800)]
Merge "Change MetadataListener to a abstract static class" am: 9d3ce3e55e
am: 745c6de6eb

Change-Id: I796dfccf741a1ef6c45d804772415ed198e8e8d1

5 years agoMerge "Align coding format in data_stall_event.proto"
Chiachang Wang [Thu, 24 Jan 2019 07:24:47 +0000 (23:24 -0800)]
Merge "Align coding format in data_stall_event.proto"
am: 0d4002db35

Change-Id: I8fbf9ba20fd870143a264216e80e93224f14d0ab

5 years agoMerge "Change MetadataListener to a abstract static class"
Ugo Yu [Thu, 24 Jan 2019 07:20:44 +0000 (23:20 -0800)]
Merge "Change MetadataListener to a abstract static class"
am: 9d3ce3e55e

Change-Id: Iad82a0046826c548db25c50dcc7cbdb0a90de25a

5 years ago[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency...
Suren Baghdasaryan [Thu, 24 Jan 2019 07:16:32 +0000 (23:16 -0800)]
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency and fix sched_policy include"" am: 71e3387254 -s ours
am: a57ac928b4 -s ours
am skip reason: subject contains skip directive

Change-Id: I5960a10c6dd4233d3281d0a598819b505923668f

5 years agoDefine Nfc statistic data atoms
Jack Yu [Wed, 23 Jan 2019 09:42:54 +0000 (17:42 +0800)]
Define Nfc statistic data atoms

Test: Manual
Bug:116641110

Change-Id: Ia7e56c159d64804049abf39717e3eeae43373a76
Merged-In: Ib521a9f2d4d098022d973fe6c775231a518f3f49

5 years agoMerge "Align coding format in data_stall_event.proto"
Chiachang Wang [Thu, 24 Jan 2019 07:11:27 +0000 (07:11 +0000)]
Merge "Align coding format in data_stall_event.proto"