OSDN Git Service
Tobias Thierer [Sat, 6 Apr 2019 14:21:32 +0000 (14:21 +0000)]
Merge changes I4e32a588,I202c5653
* changes:
Make MediaHTTPConnection thread safe.
Revert "MediaHTTPConnection: move connection states into an inner class"
Jack Yu [Fri, 5 Apr 2019 20:30:46 +0000 (20:30 +0000)]
Merge "Improved the debug message"
Treehugger Robot [Fri, 5 Apr 2019 20:29:38 +0000 (20:29 +0000)]
Merge "Fix for NetworkStats/Telephony deadlock"
Treehugger Robot [Fri, 5 Apr 2019 19:27:22 +0000 (19:27 +0000)]
Merge "Move NetworkStatsFactory into service directory"
Nathan Harold [Fri, 5 Apr 2019 18:47:37 +0000 (18:47 +0000)]
Merge "Opportunistic Sub Grouping Keys in CarrierConfig"
Tor Norbye [Fri, 5 Apr 2019 18:44:55 +0000 (18:44 +0000)]
Merge "Revert "Revert "Update MbmsDownloadServiceBase to reflect implements IInterface"""
Jack Yu [Thu, 4 Apr 2019 22:10:17 +0000 (15:10 -0700)]
Improved the debug message
Improved the log readability by printed out data state
in string format instead of integer. Also added listen
local log.
Bug:
129631771
Test: Manual
Merged-In: If786d51b35380f606bc388e29a441bb24a2792e0
Change-Id: If786d51b35380f606bc388e29a441bb24a2792e0
(cherry picked from commit
0c92c2395124c95acc9d0e184ff8d472bd562245)
Treehugger Robot [Fri, 5 Apr 2019 16:45:49 +0000 (16:45 +0000)]
Merge "Add dependency on libdl_android"
Neil Fuller [Fri, 5 Apr 2019 16:18:42 +0000 (16:18 +0000)]
Merge "Track ErrnoException API changes in libcore"
Treehugger Robot [Fri, 5 Apr 2019 15:25:47 +0000 (15:25 +0000)]
Merge "Don't set sehash when calling restoreconRecursive"
Sungsoo Lim [Fri, 5 Apr 2019 13:10:03 +0000 (13:10 +0000)]
Merge "DO NOT MERGE: Fix system_server watchdog timeout"
Treehugger Robot [Fri, 5 Apr 2019 09:35:11 +0000 (09:35 +0000)]
Merge "zygote: initialize ashmem early"
Treehugger Robot [Fri, 5 Apr 2019 09:26:21 +0000 (09:26 +0000)]
Merge "Fix BT keeping wrong state issue"
Remi NGUYEN VAN [Fri, 5 Apr 2019 07:30:02 +0000 (07:30 +0000)]
Merge "Add a mechanism to pass the L2Key and group hint to IpClient"
Remi NGUYEN VAN [Fri, 5 Apr 2019 07:13:54 +0000 (07:13 +0000)]
Merge "Remove SocketUtils#setSocketTimeValueOption"
Treehugger Robot [Fri, 5 Apr 2019 06:50:43 +0000 (06:50 +0000)]
Merge "Add Vts test for xsd_config"
Remi NGUYEN VAN [Fri, 5 Apr 2019 06:38:08 +0000 (06:38 +0000)]
Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack"
Treehugger Robot [Fri, 5 Apr 2019 04:59:14 +0000 (04:59 +0000)]
Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp"
Chalard Jean [Fri, 15 Mar 2019 14:10:40 +0000 (23:10 +0900)]
Add a mechanism to pass the L2Key and group hint to IpClient
Test: IpClientTest
Change-Id: I399b20ce29a385a74971b7a7248a48cb4d66deb6
Amith Yamasani [Tue, 19 Feb 2019 17:57:32 +0000 (09:57 -0800)]
Fix for NetworkStats/Telephony deadlock
Call into NetworkStatsService to update uid foreground
state without the NPMS lock held. Both calls are from
the handler thread, so no sequencing issues.
Bug:
123274986
Bug:
74007921
Test: atest CtsHostsideNetworkTests
Change-Id: I9e8449e5a75db616e646f55c930ff82982fc9083
Merged-In: I9e8449e5a75db616e646f55c930ff82982fc9083
Remi NGUYEN VAN [Fri, 5 Apr 2019 01:54:08 +0000 (01:54 +0000)]
Merge "Call clearCallingIdentity before notifyDnsResponse"
Treehugger Robot [Fri, 5 Apr 2019 00:36:00 +0000 (00:36 +0000)]
Merge "Change to choice"
Tim Murray [Thu, 4 Apr 2019 16:19:03 +0000 (09:19 -0700)]
zygote: initialize ashmem early
avoids dlopen of ashmemd_client in every app startup.
Test: boots, works, doesn't dlopen in app startup
Bug:
129543489
Change-Id: I76ba230af30cd007dbbca054e06660e8a30aca36
Nick Kralevich [Thu, 4 Apr 2019 22:54:58 +0000 (15:54 -0700)]
Don't set sehash when calling restoreconRecursive
restorecon_recursive updates the SELinux label of the files in the
filesystem, and then attempts to write the xattr "security.sehash" as an
optimization for future restorecons. Writing security.* extended
attributes requires CAP_SYS_ADMIN, which system_server doesn't have (and
shouldn't have).
Suppress the computation and writing of the hash value. It's not
needed.
This bug has been around for a long time, but due to the fix for
bug
62302954, the error message is being generated more frequently
now.
TODO: It would be better if the default for restorecon was to suppress
the hash computation, since otherwise it encourages programs to be
overprivileged with CAP_SYS_ADMIN. I'll plan on doing that in a followup
commit.
Bugs where this error message has been called out:
Bug:
129766333
Bug:
129271240
Bug:
128700692
Bug:
129925723
Test: install an APK and ensure that no "SELinux: setxattr failed"
error messages are generated.
Change-Id: I83f4f225e4e73453daea42dbcabf0f8a06d320d6
Steven Moreland [Thu, 4 Apr 2019 23:10:04 +0000 (23:10 +0000)]
Merge "ApplicationLoaders: hard failures & tests"
Sasha Smundak [Wed, 3 Apr 2019 17:38:02 +0000 (10:38 -0700)]
Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp
Cherrypick of https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/
6924098
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: I8d270949cb2dd4391ceeaf57ea8557be849c9ed8
Merged-In: I8d270949cb2dd4391ceeaf57ea8557be849c9ed8
Tyler Gunn [Thu, 4 Apr 2019 19:35:10 +0000 (19:35 +0000)]
Merge "Remove call identification APIs."
Treehugger Robot [Thu, 4 Apr 2019 19:27:20 +0000 (19:27 +0000)]
Merge "Convert core/tests/**/Android.mk file to Android.bp"
Tyler Gunn [Thu, 4 Apr 2019 18:26:29 +0000 (18:26 +0000)]
Merge "Add @hide API to get the phone account handle for a subId."
Treehugger Robot [Thu, 4 Apr 2019 15:55:11 +0000 (15:55 +0000)]
Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp"
Neil Fuller [Tue, 2 Apr 2019 19:12:33 +0000 (20:12 +0100)]
Track ErrnoException API changes in libcore
See the associated change in libcore.
Bug:
129935077
Test: See libcore/ change
Change-Id: I68a98df35f070db31fa3eb2967d7fab0a78d0ecf
Treehugger Robot [Thu, 4 Apr 2019 12:29:44 +0000 (12:29 +0000)]
Merge "Add common tests for FrameworksBaseTests and CTS"
Remi NGUYEN VAN [Thu, 4 Apr 2019 07:12:51 +0000 (16:12 +0900)]
Remove SocketUtils#setSocketTimeValueOption
This API was added in Q but is not necessary anymore as
Os#setsockoptTimeval was exposed as public API.
Test: m
Fixes:
129433363
Change-Id: Ifd04c0314f7f7c0dbd0ed89dbaf69b9c152d3330
Lorenzo Colitti [Thu, 4 Apr 2019 08:09:06 +0000 (08:09 +0000)]
Merge "Fix flaky UdpEncapsulationSocket test"
Sungsoo Lim [Thu, 4 Apr 2019 08:00:00 +0000 (17:00 +0900)]
DO NOT MERGE: Fix system_server watchdog timeout
AudioPlayerStateMonitor can't implement IPlaybackConfigDispatcher.Stub
directly, instead it needs to go through AudioManager to prevent
potential deadlock.
Bug:
124415216
Test: build
Change-Id: Id2ef99ed6271ceb63a27f895a6c08f79d60ba7eb
Colin Cross [Thu, 4 Apr 2019 04:00:13 +0000 (04:00 +0000)]
Merge "Export framework-res raw resources to robolectric"
Treehugger Robot [Thu, 4 Apr 2019 03:48:29 +0000 (03:48 +0000)]
Merge "Temporarily disable InetDiagSocketTest."
Tyler Gunn [Wed, 3 Apr 2019 22:26:05 +0000 (15:26 -0700)]
Add @hide API to get the phone account handle for a subId.
This is used in SubscriptionManager to figure out which phone account
is being updated when the default voice sub changes. It seemed like
a good spot to put it since we should really have an api for this in
the future.
Test: Manual, manual, manual
Bug:
128916238
Change-Id: If5137c0e7f01a14810e0ee94e5d857d69f368a87
Nathan Harold [Tue, 12 Mar 2019 22:51:42 +0000 (15:51 -0700)]
Opportunistic Sub Grouping Keys in CarrierConfig
Add two keys to allow new subscriptions to be added
into subscription groups before carrier config changes
are broadcast.
Bug:
123721160
Test: atest SubscriptionInfoUpdaterTest
Change-Id: Ib6f811b70e41eba897b9bde0c0aeb0c880169f66
Lorenzo Colitti [Thu, 4 Apr 2019 01:24:54 +0000 (10:24 +0900)]
Temporarily disable InetDiagSocketTest.
This test is too flaky to run in presubmits.
Bug:
124354087
Test: atest InetDiagSocketTest
Change-Id: I90bc52a6f5b92d634862e3464634dfdbd3cada6a
Chen Xu [Thu, 4 Apr 2019 01:53:53 +0000 (01:53 +0000)]
Merge "scrub pii (imsi) from carrierIdentifier logging"
Sundong Ahn [Wed, 27 Mar 2019 06:02:28 +0000 (15:02 +0900)]
Change to choice
The sequence element is changed to choice element with minOccurs="0" and
maxOccurs="unbounded" for supporting any order and any times sub
element. And maxOccurs of subelement is deleted because maxOccurs are
not needed.
Bug:
127435354
Test: m -j
Change-Id: I72866da5b2a8ac37d725f5b604dae37a06f30162
Yifan Hong [Thu, 4 Apr 2019 01:21:34 +0000 (01:21 +0000)]
Merge "Fix NetworkStackTests."
Yifan Hong [Thu, 4 Apr 2019 01:15:22 +0000 (18:15 -0700)]
Fix NetworkStackTests.
NetworkStackTests dlopens library which indirectly
uses libcgrouprc. Add it to jni_libs.
Test: atest
Fixes:
129902619
Change-Id: I0d60d7a317fa60607d6fdaea15f61b458aefd2f0
Benedict Wong [Wed, 20 Mar 2019 16:44:09 +0000 (09:44 -0700)]
Fix flaky UdpEncapsulationSocket test
This commit reduces the flakiness of the
testOpenAndCloseUdpEncapsulationSocket by retrying up to three times.
Unfortunately, testing port-selected socket creation is racy against
other applications. This helps to handle the same race condition as done
in IpSecService#bindToRandomPort
Bug:
128024100
Test: 200x runs of testOpenAndCloseUdpEncapsulationSocket
Change-Id: I7e036ce821019dbac6c50899bd0894e89d2fe82a
chen xu [Thu, 28 Mar 2019 23:28:45 +0000 (16:28 -0700)]
scrub pii (imsi) from carrierIdentifier logging
Bug:
129229239
Test: Manual
Change-Id: I642d60e4ba1001bfd481aada87fa08dbd19098be
(cherry picked from commit
61b2c86719b0d599a2ecde8aeaa4369167e893cf)
Merged-in: I642d60e4ba1001bfd481aada87fa08dbd19098be
Sasha Smundak [Wed, 3 Apr 2019 18:42:07 +0000 (11:42 -0700)]
Convert core/tests/featureflagtests/Android.mk file to Android.bp
Cherrypick of https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/
6924943
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: If3f574bc15dedcd7880be605667297d257175c8d
Merged-In: If3f574bc15dedcd7880be605667297d257175c8d
Cody Kesting [Thu, 4 Apr 2019 00:01:06 +0000 (00:01 +0000)]
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel."
Treehugger Robot [Wed, 3 Apr 2019 23:54:38 +0000 (23:54 +0000)]
Merge "Fix ConnectivityServiceTest fail."
Jack Yu [Wed, 3 Apr 2019 23:39:24 +0000 (23:39 +0000)]
Merge "Removed data and voice RAT from service state"
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:06:47 +0000 (23:06 +0000)]
Merge "Clean up a few names of Telephony intent extra."
Jack Yu [Tue, 2 Apr 2019 20:14:03 +0000 (13:14 -0700)]
Removed data and voice RAT from service state
The voice and data RAT are now derived from
CS and PS network registration info.
Test: Manual + unit tests
Bug:
129863444
Merged-In: I3f4cb6057a4ae821363099583eeac7c867147afb
Change-Id: I3f4cb6057a4ae821363099583eeac7c867147afb
(cherry picked from commit
5ff5ab5649644eded4f662303fdacee08aaad044)
Shuo Qian [Wed, 3 Apr 2019 22:18:31 +0000 (22:18 +0000)]
Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber"
sqian [Tue, 2 Apr 2019 02:26:18 +0000 (19:26 -0700)]
Modify the deprecation of PhoneNumberUtil isEmergencyNumber
1) Telephony API is still called by a bunch of Util methods in Android that
don't have context, therefore the service can be null. Throwing an
exception can cause crash.
2) Fix the usage of isEmergencyNumber and isPotentialEmergencyNumber.
Test: Manual
Fixes:
129721537
Change-Id: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c
Merged-In: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c
(cherry picked from commit
c6d55453ee9a4c352be873eb73c4ec433be11faf)
Treehugger Robot [Wed, 3 Apr 2019 19:24:22 +0000 (19:24 +0000)]
Merge "Use Class.forName instead of ClassLoader.loadClass."
Yifan Hong [Wed, 3 Apr 2019 19:08:51 +0000 (19:08 +0000)]
Merge "libmedia2_jni: link to libcgrouprc"
Steven Moreland [Wed, 27 Mar 2019 13:38:42 +0000 (06:38 -0700)]
ApplicationLoaders: hard failures & tests
Make errors in ApplicationLoaders caching hard failures since they are
only ever expected under bad configuration. Tests for these are also
added.
Test: atest android.app.ApplicationLoadersTest
Bug:
128529256
Change-Id: Ib259bcdf472e6a2f7f6b1071bb70cfead4502231
Merged-In: Ib259bcdf472e6a2f7f6b1071bb70cfead4502231
Chenbo Feng [Fri, 1 Mar 2019 23:07:24 +0000 (15:07 -0800)]
Move NetworkStatsFactory into service directory
In order to notify netd to swap eBPF maps before pulling the
networkStats from eBPF maps, NetworkStatsFactory need to use the
NetdServices to issue binder calls. So it need to be moved from
framework/base/core to framework/base/service since object in
framework/base/core cannot get any system services. This change is also
necessary for setting up a lock inside NetworkStatsFactory to prevent
racing between two netstats caller since the lock need to be hold before
netd trigger the map swap.
Also fix the compile problem caused by moving the NetworkStatsFactory
and the related tests. Rename the packages and the jni functions to a
more proper name.
Bug:
124764595
Bug:
128900919
Test: NetworkStatsFactoryTest
android.app.usage.cts.NetworkUsageStatsTest
android.net.cts.TrafficStatsTest
Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
Treehugger Robot [Wed, 3 Apr 2019 18:23:31 +0000 (18:23 +0000)]
Merge "Convert Android.mk file to Android.bp"
Cody Kesting [Fri, 29 Mar 2019 20:06:41 +0000 (13:06 -0700)]
Clarify documentation for TelMan#iccOpenLogicalChannel.
TelephonyManager#iccOpenLogicalChannel documentation should be improved
to clarify the function and its inputs. Relevant standards are also
explicitly referenced.
Bug:
129555815
Test: Only documentation is changed. Tests not affected.
Change-Id: I0664572c83cde480a9ac5f39d8664723b9ac81c9
Nicolas Geoffray [Wed, 3 Apr 2019 16:24:34 +0000 (17:24 +0100)]
Use Class.forName instead of ClassLoader.loadClass.
Class.forName has a fast path that ClassLoader.loadClass doesn't
have yet.
Bug:
129834244
Test: m
Change-Id: I52427be9dae5acd8eef530f706626246d16dc82a
Treehugger Robot [Wed, 3 Apr 2019 17:15:48 +0000 (17:15 +0000)]
Merge "Clean up permissions when uids are no longer used"
paulhu [Wed, 3 Apr 2019 16:07:40 +0000 (00:07 +0800)]
Fix ConnectivityServiceTest fail.
NetdService#getInstance() will get null object in
WrappedConnectivityService constructor. Then pass this null
INetd object to PermissionMonitor will case NPE in
PermissionMonitor#sendPackagePermissionsToNetd()
Bug: None
Test: atest FrameworksNetTests
Change-Id: Ia1c80f9600a19c4aaf3f3c1b497b355d96c49c8e
David Brazdil [Wed, 3 Apr 2019 15:21:45 +0000 (15:21 +0000)]
Merge "Pass 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
Treehugger Robot [Wed, 3 Apr 2019 10:50:09 +0000 (10:50 +0000)]
Merge "Fix NetworkMonitor won't do private dns resolution"
Mark Chien [Wed, 3 Apr 2019 10:16:25 +0000 (10:16 +0000)]
Merge "Some cleanups for Tethering"
Remi NGUYEN VAN [Wed, 3 Apr 2019 08:21:41 +0000 (17:21 +0900)]
Add common tests for FrameworksBaseTests and CTS
The common package covers tests that should be included both in CTS and
unit tests.
Test: atest FrameworksBaseTests
Bug:
129199908
Change-Id: I9c138d49ce010edde095e4bd3c47e36ca301634a
paulhu [Fri, 29 Mar 2019 09:22:20 +0000 (17:22 +0800)]
Move attach*Filter() and addArpEntry() methods to NetworkStack
The SocketUtils.attach*Filter and SocketUtils.addArpEntry methods
were added there because they could not be added as JNI inside
the NetworkStack. This was not possible because on Go devices,
the NetworkStack was a jar library. But now, Go also uses an APK.
Hence, move these methods to the NetworkStack.
Change-Id: I1d88a0f0be23f2b15d5103fa092b9bf982329d7c
Fix:
129433183
Test: atest NetworkStackTests FrameworksNetTests
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
Nicolas Geoffray [Wed, 3 Apr 2019 08:22:35 +0000 (08:22 +0000)]
Merge "Remove 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
Remi NGUYEN VAN [Wed, 3 Apr 2019 06:51:35 +0000 (06:51 +0000)]
Merge "Fix API in CaptivePortal, StaticIpConfiguration"
Treehugger Robot [Wed, 3 Apr 2019 06:12:12 +0000 (06:12 +0000)]
Merge "Add tests for PermissionMonitor"
Colin Cross [Wed, 3 Apr 2019 05:58:28 +0000 (22:58 -0700)]
Export framework-res raw resources to robolectric
Robolectric needs the raw resources from framework-res for now,
export them as a filegroup.
Bug:
122331577
Test: m checkbuild
Change-Id: I3981743d579c6ed1a93da81e583d565c9d8a2cba
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
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
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
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
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
Paul Hu [Wed, 3 Apr 2019 02:42:06 +0000 (02:42 +0000)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
Malcolm Chen [Sat, 23 Mar 2019 01:01:45 +0000 (18:01 -0700)]
Clean up a few names of Telephony intent extra.
Bug:
128645056
Test: build
Change-Id: Iaf004d6881964bd19072e9ef623f2e89f2529639
Merged-In: Iaf004d6881964bd19072e9ef623f2e89f2529639
Treehugger Robot [Tue, 2 Apr 2019 23:46:52 +0000 (23:46 +0000)]
Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES"
Treehugger Robot [Tue, 2 Apr 2019 23:21:31 +0000 (23:21 +0000)]
Merge "Change UT to disabled by default"
Tobias Thierer [Tue, 2 Apr 2019 19:14:20 +0000 (20:14 +0100)]
Make MediaHTTPConnection thread safe.
MediaHTTPConnection's public methods are called from multiple Binder
threads. Since both HttpURLConnection and access to the various
connection related fields is not thread safe, this CL guards most
methods by a single lock. This means that the methods can now block
when called, although this should be rare:
- there are two processes that call these methods. One process
only calls getSize(), and the other process calls methods
from a single thread (ie. at not overlapping clock times).
- should lock contention unexpectedly increase in future, then
that would be bad (because Binder thread pool threads would
be blocked/unavailable), but it would not be easy to detect.
It would be easy to detect if we could stop getSize() being
called at overlapping clock times, since we could then use
ReentrantLock.tryLock() to assert that the lock is never contended
outside of disconnect().
Because it's a requirement for disconnect() to quickly stop another
thread that is blocked in readAt(), disconnect() is the only method
that doesn't acquire the lock immediately; the mConnection field
is marked volatile so that disconnect() has a high chance of reading
that field and calling disconnect() on it without waiting for
another thread (there's a small risk that another thread might
acquire the lock and start a new connection while disconnect()
is waiting for the lock; in that case, after acquiring the lock,
disconnect() will also disconnect that new connection; this is
subject to potential change in future.
Initially, a ReentrantLock object was considered but for now this
CL instead uses the synchronized lock on "this" because:
- it minimizes churn on the lines of code in this file because
synchronized (this) { } can be expressed by introduction of
the word "synchronized" on the method header, whereas
mLock.lock(); try { ... } finally { mLock.unlock(); } would
indent all the lines in-between and thus pollute git annotate.
- some methods were already synchronized.
- ReentrantLock.tryLock() is not used for now; most of the time,
lock acquisition should be uncontended but the two cases of
lock contention mentioned above exist, which makes it difficult
to distinguish surprising from unsurprising lock contention.
While this is the case, it seems better to keep the code
simple and to just unconditionally block.
Fixes:
114337214
Fixes:
119900000
Fixes:
129444137
Fixes:
128758794
Fixes:
63002045
Test: Checked manually that bug
114337214 no longer reproduces on
Android API level 27 (Oreo MR1) after cherrypicking this CL.
Test: Ran the following on internal master with this CL:
make cts && cts-tradefed run cts -m CtsMediaTestCases \
-t android.media.cts.NativeDecoderTest#testAMediaDataSourceClose \
--abi arm64-v8a
Test: Ran the following both on AOSP (158 tests) and internal master (178):
atest CtsMediaTestCases:android.media.cts.{MediaPlayer{,2},Routing}Test
All these tests pass except that on AOSP only, the following test
fails both before and after my CL (appears unrelated):
android.media.cts.RoutingTest#test_MediaPlayer_RoutingChangedCallback
Change-Id: I4e32a58891c3ce60ddfa72d36060486d37906f8d
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
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)
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)
Tobias Thierer [Fri, 22 Mar 2019 11:15:44 +0000 (11:15 +0000)]
Revert "MediaHTTPConnection: move connection states into an inner class"
This reverts commit
621e7968adf0253d5e22406f02ccc8bcc0eda5ec.
Many of the fields that were moved are annotated @UnsupportedAppUsage,
so the CL would have had undesirable app compat impact. Further,
because investigation has revealed that lock contention *is* possible,
we need to always acquire the lock anyway so there is no longer a
benefit in keeping all of the mutable state in a single field that
can be atomically set to null.
Test: Treehugger
Change-Id: I202c5653cb086d99228491e161a159bad640105a
Colin Cross [Tue, 2 Apr 2019 16:39:04 +0000 (16:39 +0000)]
Merge "Convert frameworks/base/cmds/* to Android.bp"
Treehugger Robot [Tue, 2 Apr 2019 15:14:28 +0000 (15:14 +0000)]
Merge "docs: Linked VpnService class description to guide."
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:10:37 +0000 (13:10 +0000)]
Merge "Automatically greylist code in 3P packages"
Junyu Lai [Tue, 2 Apr 2019 10:48:23 +0000 (10:48 +0000)]
Merge "Ignore the asynchronous result while stopping keepalive"
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
Paul Hu [Tue, 2 Apr 2019 07:39:04 +0000 (07:39 +0000)]
Merge "Address leftover comments on 923337 and 930217."
Steven Moreland [Tue, 2 Apr 2019 02:19:44 +0000 (02:19 +0000)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 01:46:19 +0000 (01:46 +0000)]
Merge "API Feedback for CBRS"
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
Paul Hu [Tue, 2 Apr 2019 01:39:38 +0000 (01:39 +0000)]
Merge "[IPMS] Implement regular maintenance"
Paul Hu [Tue, 2 Apr 2019 01:33:02 +0000 (01:33 +0000)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail."