OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "libmedia2_jni: link to libcgrouprc" am: 847de83188
Yifan Hong [Wed, 3 Apr 2019 19:49:52 +0000 (12:49 -0700)]
Merge "libmedia2_jni: link to libcgrouprc" am: 847de83188
am: 751f3484ed

Change-Id: I72dfa890c7c514eae28dd0ec14cd6bc35c979ffd

5 years agoMerge "libmedia2_jni: link to libcgrouprc"
Yifan Hong [Wed, 3 Apr 2019 19:22:47 +0000 (12:22 -0700)]
Merge "libmedia2_jni: link to libcgrouprc"
am: 847de83188

Change-Id: If9c9289f1ce10cbdb1fa9a8d81c463756dfebada

5 years agoMerge "libmedia2_jni: link to libcgrouprc"
Yifan Hong [Wed, 3 Apr 2019 19:08:51 +0000 (19:08 +0000)]
Merge "libmedia2_jni: link to libcgrouprc"

5 years agoMerge "Convert Android.mk file to Android.bp" am: e6bcf626be
Sasha Smundak [Wed, 3 Apr 2019 18:51:12 +0000 (11:51 -0700)]
Merge "Convert Android.mk file to Android.bp" am: e6bcf626be
am: 7f0a256a78

Change-Id: Ib00a5e849ecacbdb4a37e49c41def82ab394f7ab

5 years agoMerge "Convert Android.mk file to Android.bp"
Sasha Smundak [Wed, 3 Apr 2019 18:39:45 +0000 (11:39 -0700)]
Merge "Convert Android.mk file to Android.bp"
am: e6bcf626be

Change-Id: I960027bd43c94d6d9908b83a1a13bffab8973549

5 years agoMerge "Convert Android.mk file to Android.bp"
Treehugger Robot [Wed, 3 Apr 2019 18:23:31 +0000 (18:23 +0000)]
Merge "Convert Android.mk file to Android.bp"

5 years agoMerge "Clean up permissions when uids are no longer used" am: 7754d368f4
Chenbo Feng [Wed, 3 Apr 2019 17:50:39 +0000 (10:50 -0700)]
Merge "Clean up permissions when uids are no longer used" am: 7754d368f4
am: ecb28c1948

Change-Id: I256ca6f16ea1fcd240a1b7cd2b3199d4504e6c33

5 years agoMerge "Clean up permissions when uids are no longer used"
Chenbo Feng [Wed, 3 Apr 2019 17:38:57 +0000 (10:38 -0700)]
Merge "Clean up permissions when uids are no longer used"
am: 7754d368f4

Change-Id: I3c06a36368abb9a1e7885d281ea1155fce857eea

5 years agoMerge "Clean up permissions when uids are no longer used"
Treehugger Robot [Wed, 3 Apr 2019 17:15:48 +0000 (17:15 +0000)]
Merge "Clean up permissions when uids are no longer used"

5 years agoMerge "Pass app's data dir to ART" am: 16749ac83e
David Brazdil [Wed, 3 Apr 2019 16:13:31 +0000 (09:13 -0700)]
Merge "Pass app's data dir to ART" am: 16749ac83e
am: 33ed677361

Change-Id: I9a7c617f13dadc91b735837d1778e3d526be8520

5 years agoMerge "Pass app's data dir to ART"
David Brazdil [Wed, 3 Apr 2019 15:35:34 +0000 (08:35 -0700)]
Merge "Pass app's data dir to ART"
am: 16749ac83e

Change-Id: I170cbff78d12ccc418cb440820a584f141f28433

5 years agoMerge "Pass app's data dir to ART"
David Brazdil [Wed, 3 Apr 2019 15:21:45 +0000 (15:21 +0000)]
Merge "Pass app's data dir to ART"

5 years agoPass app's data dir to ART
David Brazdil [Wed, 3 Apr 2019 12:00:55 +0000 (13:00 +0100)]
Pass app's data dir to ART

Inform ART about the location of the app's data directory when setting
up the process. This is part of an optimization that has ART cache
verification data into that directory.

Test: compiles, boots
Bug: 72131483
Change-Id: Ic80526b6ee383733eb5860e66f6c608109d838fb

5 years agoMerge "Fix NetworkMonitor won't do private dns resolution" am: c895b818e0
lucaslin [Wed, 3 Apr 2019 11:25:18 +0000 (04:25 -0700)]
Merge "Fix NetworkMonitor won't do private dns resolution" am: c895b818e0
am: aecea736d2

Change-Id: I5ec0cb096f2704e21e0c0f296d5cf81ab8808627

5 years agoMerge "Fix NetworkMonitor won't do private dns resolution"
lucaslin [Wed, 3 Apr 2019 11:13:48 +0000 (04:13 -0700)]
Merge "Fix NetworkMonitor won't do private dns resolution"
am: c895b818e0

Change-Id: I7c7a573bef77ba952219e6f6f56ab11f0211e0a7

5 years agoMerge "Fix NetworkMonitor won't do private dns resolution"
Treehugger Robot [Wed, 3 Apr 2019 10:50:09 +0000 (10:50 +0000)]
Merge "Fix NetworkMonitor won't do private dns resolution"

5 years agoMerge "Some cleanups for Tethering" am: 31b33b6f41
Mark Chien [Wed, 3 Apr 2019 10:45:05 +0000 (03:45 -0700)]
Merge "Some cleanups for Tethering" am: 31b33b6f41
am: 5dff3c98c5

Change-Id: I0e00187f9a5eee9e55f961ce0458c9b91af19fb7

5 years agoMerge "Some cleanups for Tethering"
Mark Chien [Wed, 3 Apr 2019 10:35:42 +0000 (03:35 -0700)]
Merge "Some cleanups for Tethering"
am: 31b33b6f41

Change-Id: Ifb60c76855a2bea5a1cccf26034e6c582ad16021

5 years agoMerge "Some cleanups for Tethering"
Mark Chien [Wed, 3 Apr 2019 10:16:25 +0000 (10:16 +0000)]
Merge "Some cleanups for Tethering"

5 years agoMerge "Remove support for dexopting shared libraries." am: 75a76da717
Nicolas Geoffray [Wed, 3 Apr 2019 09:29:05 +0000 (02:29 -0700)]
Merge "Remove support for dexopting shared libraries." am: 75a76da717
am: bd0b7295a6

Change-Id: I3ce34a72359aa8fa53066311d37caabdd7b9717f

5 years agoMerge "Remove support for dexopting shared libraries."
Nicolas Geoffray [Wed, 3 Apr 2019 09:12:43 +0000 (02:12 -0700)]
Merge "Remove support for dexopting shared libraries."
am: 75a76da717

Change-Id: I2b77a9abfe953c0b2f3e1889a2f95ac78b7a8219

5 years agoMerge "Fix API in CaptivePortal, StaticIpConfiguration" am: 0470353c2e
Remi NGUYEN VAN [Wed, 3 Apr 2019 09:12:22 +0000 (02:12 -0700)]
Merge "Fix API in CaptivePortal, StaticIpConfiguration" am: 0470353c2e
am: 77daae9b3d

Change-Id: I82eee20855710de2b4fb541dd5e2b887140ed364

5 years agoFix NetworkMonitor won't do private dns resolution
lucaslin [Wed, 3 Apr 2019 09:09:28 +0000 (17:09 +0800)]
Fix NetworkMonitor won't do private dns resolution

NetworkMonitor cannot do the private dns resolution due to lack
"mNetworkCapabilities". ConnectivityService will call
NetworkStackService#notifyPrivateDnsChanged() before doing
network validation. After NetworkMonitor received
CMD_PRIVATE_DNS_SETTINGS_CHANGED, it will call
isValidationRequired to check if the validation is required.
But mNetworkCapabilities didn't be set, so the
mPrivateDnsProviderHostname will be set to empty and make
EvaluatingPrivateDnsState doesn't do private dns resolution.

Bug: 129375892
Test: 1. Build pass
      2. atest FrameworksNetTests
      3. atest NetworkStackTests

Change-Id: I637212fb4746bb2e9a2f4a4457fd36c4c2701149

5 years agoMerge "Add tests for PermissionMonitor" am: a84cdf4fc6
Chenbo Feng [Wed, 3 Apr 2019 09:05:07 +0000 (02:05 -0700)]
Merge "Add tests for PermissionMonitor" am: a84cdf4fc6
am: b9ee567881

Change-Id: I9be22991bd590a7aee4d0a4b2908e0023870d0b6

5 years agoMerge "Remove support for dexopting shared libraries."
Nicolas Geoffray [Wed, 3 Apr 2019 08:22:35 +0000 (08:22 +0000)]
Merge "Remove support for dexopting shared libraries."

5 years agoRemove support for dexopting shared libraries.
Nicolas Geoffray [Mon, 1 Apr 2019 09:54:53 +0000 (10:54 +0100)]
Remove support for dexopting shared libraries.

The CL landed after feature complete, and has shown it can cause related issues,
not easy to deal with (eg b/128529256 or b/128912573).

The libs are expected to be preopted (as in P).

Partial revert of 653356f114fa798ee0cc3d5d5ac4ccd0ab4783de.

Test: BackgroundDexOptServiceIntegrationTests
Test: DexoptUtilsTest
Bug: 119800099
Change-Id: I3570fbc0e4f7079da3315691d676452b17e516a7

5 years agoMerge "Fix API in CaptivePortal, StaticIpConfiguration"
Remi NGUYEN VAN [Wed, 3 Apr 2019 08:21:38 +0000 (01:21 -0700)]
Merge "Fix API in CaptivePortal, StaticIpConfiguration"
am: 0470353c2e

Change-Id: Ia36ba5946e8dc956c5c71cbebe7dc02658fdb7a0

5 years agoMerge "Add tests for PermissionMonitor"
Chenbo Feng [Wed, 3 Apr 2019 08:10:07 +0000 (01:10 -0700)]
Merge "Add tests for PermissionMonitor"
am: a84cdf4fc6

Change-Id: I2079c4ce13aae962c1d907009edc107e861bb3b5

5 years agoMerge "Fix API in CaptivePortal, StaticIpConfiguration"
Remi NGUYEN VAN [Wed, 3 Apr 2019 06:51:35 +0000 (06:51 +0000)]
Merge "Fix API in CaptivePortal, StaticIpConfiguration"

5 years agoMerge "Add tests for PermissionMonitor"
Treehugger Robot [Wed, 3 Apr 2019 06:12:12 +0000 (06:12 +0000)]
Merge "Add tests for PermissionMonitor"

5 years agoSome cleanups for Tethering
markchien [Wed, 3 Apr 2019 02:43:09 +0000 (10:43 +0800)]
Some cleanups for Tethering

Bug: 126481523
Test: -build, flash, boot
      -FrameworksNetTests

Change-Id: I904646efa87eb5434124c7828aca4ab09c5dc38e

5 years agolibmedia2_jni: link to libcgrouprc
Yifan Hong [Thu, 28 Mar 2019 22:54:10 +0000 (15:54 -0700)]
libmedia2_jni: link to libcgrouprc

libcgrouprc is an LLNDK library used by libprocessgroup.
libprocessgroup is linked statically, so the dependency needs
to be explicitly stated in libmedia2_jni.

Test: boots (sanity)
Bug: 123664216
Change-Id: Ieebba36417d1f83a5946f927043f15dc8abc188a
Merged-In: Ieebba36417d1f83a5946f927043f15dc8abc188a

5 years ago[automerger skipped] Merge changes from topic "am-ee7381fd1a8845c99ba642b88f8db9d4...
Jack Yu [Wed, 3 Apr 2019 04:31:11 +0000 (21:31 -0700)]
[automerger skipped] Merge changes from topic "am-ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master
am: f2b4fcbacc -s ours
am skip reason: change_id Ib152f97711441fded998a36528ef007f9e28ccbf with SHA1 27ff407104 is in history

Change-Id: I91228bb25d5d27440dbb8fe6297dfc91ac83bec5

5 years agoMerge changes from topic "am-77824143cfe54e8ebd083716dd4fb16f" into stage-aosp-master
Jack Yu [Wed, 3 Apr 2019 04:19:15 +0000 (21:19 -0700)]
Merge changes from topic "am-77824143cfe54e8ebd083716dd4fb16f" into stage-aosp-master
am: 259ea052e8

Change-Id: I9f66f83c96be53f9b27aea8356c6ce2e0e8c1ec1

5 years agoMerge "Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as...
Android Build Merger (Role) [Wed, 3 Apr 2019 03:58:43 +0000 (03:58 +0000)]
Merge "Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe660" into stage-aosp-master am: 78d17025e8" into pi-dev-plus-aosp

5 years agoMerge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library...
Paul Hu [Wed, 3 Apr 2019 03:57:51 +0000 (20:57 -0700)]
Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe660" into stage-aosp-master
am: 78d17025e8

Change-Id: Ide6e0120b57228d2dd4c9895abf716f18b41b1fa

5 years agoMerge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library...
Android Build Merger (Role) [Wed, 3 Apr 2019 03:47:48 +0000 (03:47 +0000)]
Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe660 am: 2d20cd2378" into pi-dev-plus-aosp

5 years agoMerge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am...
Paul Hu [Wed, 3 Apr 2019 03:47:27 +0000 (20:47 -0700)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe660
am: 2d20cd2378

Change-Id: Ibf8b3f0c986acb156c3705ee569554bf673269f0

5 years agoMerge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am...
Paul Hu [Wed, 3 Apr 2019 03:45:17 +0000 (20:45 -0700)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe660
am: 2d20cd2378

Change-Id: I5a5fd9f900bb1d7217364812d9d0e5477179bfc9

5 years agoMerge changes from topic "am-ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master
Android Build Merger (Role) [Wed, 3 Apr 2019 03:35:37 +0000 (03:35 +0000)]
Merge changes from topic "am-ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master

* changes:
  Merge changes from topics "lte_ca_support", "ss_provider" am: 8dedf2b5e4
  Passing ServiceState as byte array into ServiceStateProvider am: 2d9b4faedc

5 years agoMerge changes from topic "am-77824143cfe54e8ebd083716dd4fb16f" into stage-aosp-master
Android Build Merger (Role) [Wed, 3 Apr 2019 03:34:48 +0000 (03:34 +0000)]
Merge changes from topic "am-77824143cfe54e8ebd083716dd4fb16f" into stage-aosp-master

* changes:
  Merge changes from topics "lte_ca_support", "ss_provider" am: 8dedf2b5e4
  Passing ServiceState as byte array into ServiceStateProvider am: 2d9b4faedc

5 years agoMerge changes from topics "lte_ca_support", "ss_provider"
Jack Yu [Wed, 3 Apr 2019 03:34:06 +0000 (20:34 -0700)]
Merge changes from topics "lte_ca_support", "ss_provider"
am: 8dedf2b5e4

Change-Id: I6906070f9df82b57e49c5edf50e8931aa5192cdf

5 years agoMerge changes from topics "lte_ca_support", "ss_provider"
Jack Yu [Wed, 3 Apr 2019 03:33:21 +0000 (20:33 -0700)]
Merge changes from topics "lte_ca_support", "ss_provider"
am: 8dedf2b5e4

Change-Id: I3cb0bad3aa3c6b24b79709c507739baab670c044

5 years agoClean up permissions when uids are no longer used
Chenbo Feng [Tue, 26 Mar 2019 01:13:34 +0000 (18:13 -0700)]
Clean up permissions when uids are no longer used

The kernel eBPF maps have a blacklist to store all the uids that doesn't
have internet permission. When an app is unintalled from the device and
it is the last package on device that uses that uid, make sure we
cleaned the uid from the map and do not add no longer used uids into the
eBPF map. This action helps reduce the number of entries stored in the
map and reduce the chance of overflow the eBPF map.

Bug: 128944261
Test: PermissionMonitorTest
Change-Id: I10dd0113d00d6cf9ca39902d9721f2591d387d4a

5 years agoAdd tests for PermissionMonitor
Chenbo Feng [Tue, 26 Feb 2019 06:55:58 +0000 (22:55 -0800)]
Add tests for PermissionMonitor

Add more tests to PermissionMonitor to verify the functionality related
to INTERNET permission and UPDATE_DEVIE_STATS permission. Modified some
of the class design of PermissionMonitor so that it is easier to test
the new functionalities.

Bug: 111560570
Test: PermissionMonitorTest

Change-Id: Ic5585f337db5de48e2f87bf4f01ed7d85c349827

5 years agoPassing ServiceState as byte array into ServiceStateProvider
Jack Yu [Wed, 3 Apr 2019 03:25:44 +0000 (20:25 -0700)]
Passing ServiceState as byte array into ServiceStateProvider
am: 2d9b4faedc

Change-Id: I8471dc9b1353135b0a9b693d2845c7f358213f6c

5 years agoPassing ServiceState as byte array into ServiceStateProvider
Jack Yu [Wed, 3 Apr 2019 03:24:53 +0000 (20:24 -0700)]
Passing ServiceState as byte array into ServiceStateProvider
am: 2d9b4faedc

Change-Id: I26dffc5c5c819a93c04cc64763d49e920f20cb01

5 years agoMerge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library...
Android Build Merger (Role) [Wed, 3 Apr 2019 03:17:56 +0000 (03:17 +0000)]
Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am: 3db9cfe660" into stage-aosp-master

5 years agoMerge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
Paul Hu [Wed, 3 Apr 2019 03:17:33 +0000 (20:17 -0700)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
am: 3db9cfe660

Change-Id: I33db2bd452f5b30b382f8e0e913862ad6bcc099e

5 years agoMerge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
Paul Hu [Wed, 3 Apr 2019 03:16:43 +0000 (20:16 -0700)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
am: 3db9cfe660

Change-Id: I387332fd5914474010eb1b29d6543028457599df

5 years agoMerge changes from topics "lte_ca_support", "ss_provider"
Jack Yu [Wed, 3 Apr 2019 02:47:20 +0000 (02:47 +0000)]
Merge changes from topics "lte_ca_support", "ss_provider"

* changes:
  Correctly support LTE carrier aggregation
  Passing ServiceState as byte array into ServiceStateProvider

5 years agoMerge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
Paul Hu [Wed, 3 Apr 2019 02:42:06 +0000 (02:42 +0000)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"

5 years agoMerge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES" am: 50b59...
Dan Willemsen [Wed, 3 Apr 2019 01:48:21 +0000 (18:48 -0700)]
Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES" am: 50b59ccafc
am: d092f8a234

Change-Id: I9db35be9e19d51be23b540340bc5a1066ade0292

5 years agoMerge "Change UT to disabled by default" am: 3c1a889a9c
Brad Ebinger [Wed, 3 Apr 2019 01:39:55 +0000 (18:39 -0700)]
Merge "Change UT to disabled by default" am: 3c1a889a9c
am: 94c06c609a

Change-Id: I930b6873fcc24aebcf430f356bc1002db665ce5d

5 years agoMerge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES"
Dan Willemsen [Wed, 3 Apr 2019 01:13:51 +0000 (18:13 -0700)]
Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES"
am: 50b59ccafc

Change-Id: Ia61b5c353a0d8316319c9bd9e5723795cfe41957

5 years agoMerge "Change UT to disabled by default"
Brad Ebinger [Wed, 3 Apr 2019 01:05:12 +0000 (18:05 -0700)]
Merge "Change UT to disabled by default"
am: 3c1a889a9c

Change-Id: Id0e575b3e17515667371ff626a4423e1cb82b2c0

5 years agoMerge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES"
Treehugger Robot [Tue, 2 Apr 2019 23:46:52 +0000 (23:46 +0000)]
Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES"

5 years agoMerge "Change UT to disabled by default"
Treehugger Robot [Tue, 2 Apr 2019 23:21:31 +0000 (23:21 +0000)]
Merge "Change UT to disabled by default"

5 years agoUse LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES
Dan Willemsen [Tue, 2 Apr 2019 21:49:32 +0000 (14:49 -0700)]
Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES

LOCAL_TARGET_REQUIRED_MODULES is intended for host -> target
dependencies, not target -> target dependencies (which can use
LOCAL_REQUIRED_MODULES).

Test: treehugger
Change-Id: I84de8adcdd772be0169b6d6b8df6f69b00ce888f

5 years agoCorrectly support LTE carrier aggregation
Jack Yu [Mon, 1 Apr 2019 22:01:13 +0000 (15:01 -0700)]
Correctly support LTE carrier aggregation

NetworkRegistrationInfo.getAccessNetworkTechnology() should
report LTE as the network type when modem reports the RAT
LTE_CA. Fixed by adding a flag in data specific registration
info.

Test: Manual
Bug: 129707180
Merged-In: Ib152f97711441fded998a36528ef007f9e28ccbf
Change-Id: Ib152f97711441fded998a36528ef007f9e28ccbf
(cherry picked from commit 05a6543248d87ee918a9019796d5ff8c7799f604)

5 years agoPassing ServiceState as byte array into ServiceStateProvider
Jack Yu [Tue, 2 Apr 2019 17:49:35 +0000 (10:49 -0700)]
Passing ServiceState as byte array into ServiceStateProvider

This allows the provider to reconstruct the service state
object correctly. Also we can get rid of all the 'set'
methods in ServiceState, which we'd like to remove in the future.

Test: Manual
Bug: 129768354
Merged-In: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
Change-Id: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
(cherry picked from commit 2e273b2f0f160487b75f5386a2a0cd688f095727)

5 years agoMerge "Convert frameworks/base/cmds/* to Android.bp" am: 179e132823
Colin Cross [Tue, 2 Apr 2019 17:19:15 +0000 (10:19 -0700)]
Merge "Convert frameworks/base/cmds/* to Android.bp" am: 179e132823
am: aa9e302a63

Change-Id: I05de333caa6aa5ed6b33389e2c320d845b9a36ee

5 years agoMerge "Convert frameworks/base/cmds/* to Android.bp"
Colin Cross [Tue, 2 Apr 2019 16:59:30 +0000 (09:59 -0700)]
Merge "Convert frameworks/base/cmds/* to Android.bp"
am: 179e132823

Change-Id: I22698f8a29dfe60b7dc1198ac62af5d59827e9d7

5 years agoMerge "Convert frameworks/base/cmds/* to Android.bp"
Colin Cross [Tue, 2 Apr 2019 16:39:04 +0000 (16:39 +0000)]
Merge "Convert frameworks/base/cmds/* to Android.bp"

5 years agoMerge "docs: Linked VpnService class description to guide." am: 97f778f0b5
Benjamin Miller [Tue, 2 Apr 2019 15:36:21 +0000 (08:36 -0700)]
Merge "docs: Linked VpnService class description to guide." am: 97f778f0b5
am: a2443f115e

Change-Id: I2a43d91af59ea51a8f81aecc0970e7ba77eaa3b1

5 years agoMerge "docs: Linked VpnService class description to guide."
Benjamin Miller [Tue, 2 Apr 2019 15:28:16 +0000 (08:28 -0700)]
Merge "docs: Linked VpnService class description to guide."
am: 97f778f0b5

Change-Id: I567720f4d1410b5d2da415321d7eebc2f79f35f6

5 years agoMerge "docs: Linked VpnService class description to guide."
Treehugger Robot [Tue, 2 Apr 2019 15:14:28 +0000 (15:14 +0000)]
Merge "docs: Linked VpnService class description to guide."

5 years agoMerge "Automatically greylist code in 3P packages" am: 1f80714c2d
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:40:33 +0000 (06:40 -0700)]
Merge "Automatically greylist code in 3P packages" am: 1f80714c2d
am: 8b1745650b

Change-Id: I73ba988cc378c6204a95e3f9e6931336aaf3d953

5 years agoMerge "Automatically greylist code in 3P packages"
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:29:51 +0000 (06:29 -0700)]
Merge "Automatically greylist code in 3P packages"
am: 1f80714c2d

Change-Id: Icb8a10c22c6ecfb807fa8d1669940f02edfd97c4

5 years agoMerge "Automatically greylist code in 3P packages"
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:10:37 +0000 (13:10 +0000)]
Merge "Automatically greylist code in 3P packages"

5 years agoMerge "Ignore the asynchronous result while stopping keepalive" am: 7934214f4c
Junyu Lai [Tue, 2 Apr 2019 11:15:07 +0000 (04:15 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive" am: 7934214f4c
am: deae9510db

Change-Id: I25daef8b1bbbbe93e636c320a032a486751ebcc9

5 years agoMerge "Ignore the asynchronous result while stopping keepalive"
Junyu Lai [Tue, 2 Apr 2019 11:05:49 +0000 (04:05 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive"
am: 7934214f4c

Change-Id: Idc6d76ca412f7bbae3b32e81756c419d84dc2c80

5 years agoMerge "Ignore the asynchronous result while stopping keepalive"
Junyu Lai [Tue, 2 Apr 2019 10:48:23 +0000 (10:48 +0000)]
Merge "Ignore the asynchronous result while stopping keepalive"

5 years agoMake CaptivePortalProbeSpec and CaptivePortalProbeResult as a library
paulhu [Fri, 29 Mar 2019 11:21:30 +0000 (19:21 +0800)]
Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library

These two classes were added to @SystemApi because they are used
both by NetworkMonitor and CaptivePortalLogin. However it turns
out they are not needed in the framework, so having them as a
library sounds better.

Change-Id: Iadf77ec5952b6da8812dc6d006a39bd4e93d2bd9
Fix: 129433264
Test: atest NetworkStackTests FrameworksNetTests

5 years agoMerge "Address leftover comments on 923337 and 930217." am: 1e97aab6f4
Paul Hu [Tue, 2 Apr 2019 08:14:24 +0000 (01:14 -0700)]
Merge "Address leftover comments on 923337 and 930217." am: 1e97aab6f4
am: 55a22b5d17

Change-Id: Ibbc8dd7bb869f76515c9f57793db02953dd07804

5 years agoMerge "Address leftover comments on 923337 and 930217."
Paul Hu [Tue, 2 Apr 2019 07:58:18 +0000 (00:58 -0700)]
Merge "Address leftover comments on 923337 and 930217."
am: 1e97aab6f4

Change-Id: I733160ae51b8f0e80f78ab375cdb0a547b74f68d

5 years agoMerge "Address leftover comments on 923337 and 930217."
Paul Hu [Tue, 2 Apr 2019 07:39:04 +0000 (07:39 +0000)]
Merge "Address leftover comments on 923337 and 930217."

5 years agoMerge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders.""" am: 4b5ca28dfe
Steven Moreland [Tue, 2 Apr 2019 02:50:13 +0000 (19:50 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders.""" am: 4b5ca28dfe
am: 4e709ea3fd

Change-Id: Ia5b6280f17a67f0fa791f36544a77e2af99e7e0e

5 years agoMerge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
Steven Moreland [Tue, 2 Apr 2019 02:38:43 +0000 (19:38 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
am: 4b5ca28dfe

Change-Id: I63fa6d4a8671db24bf9fce898414c27068547ed2

5 years agoMerge "API Feedback for CBRS" am: 9c706654a2
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:26:11 +0000 (19:26 -0700)]
Merge "API Feedback for CBRS" am: 9c706654a2
am: f9edc9fffd

Change-Id: I7c449a129ab8bd759b40e0aa0a429dd7847ef755

5 years agoMerge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
Steven Moreland [Tue, 2 Apr 2019 02:19:44 +0000 (02:19 +0000)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""

5 years agoMerge "API Feedback for CBRS"
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:10:02 +0000 (19:10 -0700)]
Merge "API Feedback for CBRS"
am: 9c706654a2

Change-Id: I6a6d0a81100093696fc6e4b66b32e34dbed49913

5 years agoMerge "[IPMS] Implement regular maintenance" am: 7f10bb1c11
Paul Hu [Tue, 2 Apr 2019 02:09:46 +0000 (19:09 -0700)]
Merge "[IPMS] Implement regular maintenance" am: 7f10bb1c11
am: c308297bc2

Change-Id: Ia9bb46e1ffaf3c3d0a268de1dc0a2fad03b4e240

5 years agoMerge "Fix IpPrefixTest#testContainsInetAddress fail." am: 66a133858b
Paul Hu [Tue, 2 Apr 2019 01:59:35 +0000 (18:59 -0700)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail." am: 66a133858b
am: 9872066d02

Change-Id: I257b51a4f0be974eacf8a6c0f12b5d5aacdc7a5f

5 years agoMerge "[IPMS] Implement regular maintenance"
Paul Hu [Tue, 2 Apr 2019 01:58:18 +0000 (18:58 -0700)]
Merge "[IPMS] Implement regular maintenance"
am: 7f10bb1c11

Change-Id: I82e4bc47ed3dc2d1b6907c7229df296ba2b4d88e

5 years agoMerge "Rename NetworkStackPermissionStub" am: 073e73a0c1
Remi NGUYEN VAN [Tue, 2 Apr 2019 01:54:02 +0000 (18:54 -0700)]
Merge "Rename NetworkStackPermissionStub" am: 073e73a0c1
am: 63d998d859

Change-Id: Iffecb9d56fe90d9c62e963c2c38094f0c2b21f39

5 years agoMerge "Fix IpPrefixTest#testContainsInetAddress fail."
Paul Hu [Tue, 2 Apr 2019 01:47:42 +0000 (18:47 -0700)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail."
am: 66a133858b

Change-Id: I0926ee39c306fefdd158e1c4c7e4c1ba4b7c5f7d

5 years agoMerge "API Feedback for CBRS"
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 01:46:19 +0000 (01:46 +0000)]
Merge "API Feedback for CBRS"

5 years agoMerge "Rename NetworkStackPermissionStub"
Remi NGUYEN VAN [Tue, 2 Apr 2019 01:43:14 +0000 (18:43 -0700)]
Merge "Rename NetworkStackPermissionStub"
am: 073e73a0c1

Change-Id: I616fb13add96c3c4708510138a4e920336695239

5 years agoFix API in CaptivePortal, StaticIpConfiguration
Remi NGUYEN VAN [Mon, 1 Apr 2019 08:09:05 +0000 (17:09 +0900)]
Fix API in CaptivePortal, StaticIpConfiguration

 - Add documentation to CaptivePortal#logEvent
 - Add paragraph breaks to StaticIpConfiguration class javadoc
 - Format javadoc for API documentation
 - Move setters to a builder and hide fields for apps targeting P or
   older
 - Document StaticIpConfiguration getters and builder setters
 - Add documentation for StaticIpConfiguration#getRoutes

Bug: 129362244
Bug: 129433304
Test: built, flashed, booted, WiFi working
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Ia66c1097f01ca87d02eba3456547aedb1e480186

5 years agoMerge "[IPMS] Implement regular maintenance"
Paul Hu [Tue, 2 Apr 2019 01:39:38 +0000 (01:39 +0000)]
Merge "[IPMS] Implement regular maintenance"

5 years agoMerge "Fix IpPrefixTest#testContainsInetAddress fail."
Paul Hu [Tue, 2 Apr 2019 01:33:02 +0000 (01:33 +0000)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail."

5 years agoMerge "Rename NetworkStackPermissionStub"
Remi NGUYEN VAN [Tue, 2 Apr 2019 01:31:51 +0000 (01:31 +0000)]
Merge "Rename NetworkStackPermissionStub"

5 years agoMerge "Cleanup SystemReady in the network stack" am: e0ef7ce4f7
Chalard Jean [Tue, 2 Apr 2019 00:41:35 +0000 (17:41 -0700)]
Merge "Cleanup SystemReady in the network stack" am: e0ef7ce4f7
am: 4b130e8567

Change-Id: Id1348ffa1406adf08b94eec18b3b1e6da40e84be

5 years agoMerge "Add a new carrier config to show the WFC location privacy policy UI" am: 4c508...
Hall Liu [Tue, 2 Apr 2019 00:24:01 +0000 (17:24 -0700)]
Merge "Add a new carrier config to show the WFC location privacy policy UI" am: 4c508d1b03
am: d94791b712

Change-Id: I435a8b653960e07931bb8c0c11fad3f805431dc6

5 years agoMerge "BluetoothHealth: hide auto-created default constructors" am: 463454432b
Jack He [Tue, 2 Apr 2019 00:18:16 +0000 (17:18 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors" am: 463454432b
am: 39a6d731bb

Change-Id: If1410685d139f44a87648bfdb87094cd30ec8462

5 years agoRename NetworkStackPermissionStub
Remi NGUYEN VAN [Tue, 26 Mar 2019 08:24:48 +0000 (17:24 +0900)]
Rename NetworkStackPermissionStub

Use NetworkStackPermissionConfig instead.

Bug: 129317412
Test: Flashed, booted, WiFi working
Merged-In: I7bdc058dddfa483823074055ad5c9d7d2efd37b9
Change-Id: I45299c12598cd3b33bfd78ae8698d98b77b18dc0

5 years agoMerge "Cleanup SystemReady in the network stack"
Chalard Jean [Tue, 2 Apr 2019 00:12:06 +0000 (17:12 -0700)]
Merge "Cleanup SystemReady in the network stack"
am: e0ef7ce4f7

Change-Id: I1a55078b74d5f94afde94da0dc5f6e1d2af10de3

5 years agoMerge "Pass debug.allocTracker.stackDepth to runtime if it exists" am: 72e80b5b1a
Mathieu Chartier [Tue, 2 Apr 2019 00:11:04 +0000 (17:11 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists" am: 72e80b5b1a
am: efeaad3225

Change-Id: I16ff57136a2f53e97b494c866ac3497e00996823

5 years agoMerge "Add a new carrier config to show the WFC location privacy policy UI"
Hall Liu [Mon, 1 Apr 2019 23:34:30 +0000 (16:34 -0700)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"
am: 4c508d1b03

Change-Id: I1b3c96de78b909dab372e3e3745c877b8becd2d6