OSDN Git Service
Treehugger Robot [Tue, 19 Jun 2018 00:36:38 +0000 (00:36 +0000)]
Merge "Fixed the incorrect permission for data/network service binding"
Treehugger Robot [Mon, 18 Jun 2018 16:55:28 +0000 (16:55 +0000)]
Merge "Enabled annotations for Metalava based api-stubs."
Chalard Jean [Mon, 18 Jun 2018 09:00:40 +0000 (09:00 +0000)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
* changes:
[PT09] Add javadoc comments to all ProxyTracker methods/members.
[PT08] Move setDefaultProxy to ProxyTracker
[PT07] Small cleanup of setGlobalProxy
Treehugger Robot [Mon, 18 Jun 2018 06:16:23 +0000 (06:16 +0000)]
Merge "Apf: Avoid constant overflow"
Christopher Ferris [Fri, 15 Jun 2018 21:36:42 +0000 (21:36 +0000)]
Merge "Use the malloc debug heap dumper."
Jack Yu [Fri, 15 Jun 2018 21:34:22 +0000 (14:34 -0700)]
Fixed the incorrect permission for data/network service binding
The permission renaming was done in ag/
3552774. Other places
need to be fixed accordingly.
Test: Unit tests
Bug:
73659459
Change-Id: Ic325d666c333eef22dba95f8d2488fb172810c2c
Treehugger Robot [Fri, 15 Jun 2018 20:47:30 +0000 (20:47 +0000)]
Merge "Fix ManifestMerger issues"
Christopher Ferris [Wed, 13 Jun 2018 20:19:57 +0000 (13:19 -0700)]
Use the malloc debug heap dumper.
Instead of having the malloc debug heap dump code live in frameworks
code, call into malloc debug to do the dump.
Test: Ran am dumpheap -n <PID> <FILE> of a process with and without
Test: malloc debug enabled.
Change-Id: I7911a3ee7dcbc79dd11003a24e27ff99c8301d43
Merged-In: I7911a3ee7dcbc79dd11003a24e27ff99c8301d43
(cherry picked from commit
38e2c3bc9c50770aa5efce47f90fbcfcdda523de)
Treehugger Robot [Fri, 15 Jun 2018 03:41:18 +0000 (03:41 +0000)]
Merge "Build com.android.location.provider with java_sdk_library"
Treehugger Robot [Fri, 15 Jun 2018 02:32:54 +0000 (02:32 +0000)]
Merge "Make dumpHexString() tolerate null arrays."
Colin Cross [Thu, 14 Jun 2018 22:23:21 +0000 (15:23 -0700)]
Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in SettingsLib so that the build system
doesn't raise the minSdkVersion value specified in the manifest,
which causes ManifestMerger to error when trying to merge it into
a package that specifies a lower minSdkVersion.
Bug:
78447299
Test: m java
Change-Id: Ie2c2458647cd6495418999b35894dc92343992cc
Treehugger Robot [Thu, 14 Jun 2018 19:13:29 +0000 (19:13 +0000)]
Merge "Clear calling identity before doing any work"
Neil Fuller [Wed, 13 Jun 2018 15:56:38 +0000 (16:56 +0100)]
Clear calling identity before doing any work
This makes sure that the system server is credited/blamed
for the logic being executed.
Test: (internal) atest FrameworksServicesTests:com.android.server.timedetector
Bug:
78217059
Change-Id: Ie2586cf0d983e9aef9371d6db285c8420e9c8dc0
Andreas Gampe [Wed, 13 Jun 2018 18:35:16 +0000 (11:35 -0700)]
Apf: Avoid constant overflow
The used constant overflows. This is irrelevant to the test, so
decrease test constant.
Bug:
110155920
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Idfc7e987ba9c36389a20c7fc01b1161ef89483d8
Bernie Innocenti [Thu, 14 Jun 2018 08:55:58 +0000 (17:55 +0900)]
Make dumpHexString() tolerate null arrays.
Rationale: hexdumps are mainly used when verbose logging is enabled,
which means that callers are rarely exercised (let alone tested).
Crashing on unchecked null pointers doesn't make debugging any easier,
nor production code any more robust.
Moreover, this is the behavior of system.out.println() and other
logging APIs.
Test: runtest -x core/tests/coretests/src/com/android/internal/util/HexDumpTest.java
Bug:
110177912
Change-Id: Idccd81a5654ed0f7fee6b27177941bf8c311973e
Neil Fuller [Thu, 14 Jun 2018 08:21:27 +0000 (08:21 +0000)]
Merge "Add TimestampedValue.toString()"
Nan Zhang [Thu, 14 Jun 2018 00:38:37 +0000 (17:38 -0700)]
Enabled annotations for Metalava based api-stubs.
Test: m -j metalava-api-stubs-docs
Bug: b/
78245848
Change-Id: I4ba661900a52f246fc0191c31aabfc96b89fa2db
Pengquan Meng [Wed, 13 Jun 2018 20:47:13 +0000 (20:47 +0000)]
Merge changes from topic "clean"
* changes:
Remove internal ApnSetting.
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
Neil Fuller [Wed, 13 Jun 2018 14:23:32 +0000 (15:23 +0100)]
Add TimestampedValue.toString()
To make debug logging useful.
Bug:
78217059
Test: Build
Change-Id: I710b56d189afeb26ac50f55d9286d04219779ee7
Treehugger Robot [Wed, 13 Jun 2018 14:19:32 +0000 (14:19 +0000)]
Merge "Use disableForUser in StatusBarManager"
yuemingw [Wed, 13 Jun 2018 11:32:13 +0000 (12:32 +0100)]
Remove internal ApnSetting.
Bug:
77511388
Test: atest FrameworksTelephonyTests
Change-Id: I0da354c7d55ac49f90ca1376e8f2034e65e4e274
Merged-In: I9757ef4aae269d828c98a7363c98629c9be74846
Benjamin Miller [Thu, 7 Jun 2018 19:10:08 +0000 (19:10 +0000)]
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
Doc-only change.
Also improved the class descriptions and fixed some typos.
Bug:
80238372
Test: make ds-docs with visual inspection of generated HTML
Change-Id: I460d70d692cc1a04cf0efd6b9d0b1e13a9403968
Merged-In: Id4a00c1a44dc3cbbaefc94c0438eb1a077f06e5e
Treehugger Robot [Tue, 12 Jun 2018 19:24:19 +0000 (19:24 +0000)]
Merge "Frameworks: Remove complex boolean"
Treehugger Robot [Tue, 12 Jun 2018 19:19:57 +0000 (19:19 +0000)]
Merge "persist.sys.boot.reason is cleared once read by bootstat"
Evan Laird [Tue, 29 May 2018 21:28:58 +0000 (17:28 -0400)]
Use disableForUser in StatusBarManager
If a secondary user is added to the device and in the middle of SUW, the
SUW process can be killed via ADB. This will cause the process to get
restarted and call StatusBarManager#disable()/disable2(), which uses the
StatusBarManagerService methods that use the current uid.
The fix is to use Binder.getCallingUserHandle() in StatusBarManager so that the
SUW from another user can't affect the current user unless it is
current.
Test: start SUW from new user, cancel set up and go back to primary
user. Kill the SUW process. Nav bars remain un-hidden
Change-Id: Ie6f648827d8d384ae87f74e2d746b7566a7b9011
Fixes:
78360699
Andreas Gampe [Tue, 12 Jun 2018 17:37:04 +0000 (10:37 -0700)]
Frameworks: Remove complex boolean
To allow an Errorprone warning to become an error.
Bug:
72451126
Test: m
Change-Id: I8733f0ee74de615e4ffc979fb9de38730c2506c6
Merged-In: Ia6856157e8813856268fba003e1e591d690cb26e
Treehugger Robot [Tue, 12 Jun 2018 17:01:25 +0000 (17:01 +0000)]
Merge "Simple pass-through TimeDetectorService"
Neil Fuller [Fri, 8 Jun 2018 17:44:49 +0000 (18:44 +0100)]
Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.
This cherry-pick contains a small change: to use
SystemClock.elapsedRealtime() instead of the newer
SystemClock.elapsedRealtimeClock() with Clock.millis().
Bug:
78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Merged-In: Id7175878dc22e5272c31f3e478af4b0e4183b62b
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
(cherry picked from commit
24836bfb1564b1f98c322108a924965a8dbbee4f)
Chalard Jean [Tue, 12 Jun 2018 12:23:59 +0000 (12:23 +0000)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
* changes:
[PT06] Move setGlobalProxy into ProxyTracker
[PT05] Move sendProxyBroadcast into ProxyTracker.
[PT04] Move PacManager into ProxyTracker.
[PT03] Move some more code into ProxyTracker.
[PT02] Move static methods to ProxyTracker
[PT01] Introduce ProxyTracker
Remove a useless parameter.
Small cleanup of Network.
Cleanup of LinkProperties.
Chalard Jean [Fri, 8 Jun 2018 03:41:21 +0000 (12:41 +0900)]
[PT09] Add javadoc comments to all ProxyTracker methods/members.
Also rename some vars and inline a function that is now private.
Test: runtest
Change-Id: I4b1bca8b29f46d97056973cd38ed8effc3f5b591
Chalard Jean [Fri, 8 Jun 2018 03:20:15 +0000 (12:20 +0900)]
[PT08] Move setDefaultProxy to ProxyTracker
Test: runtest
Change-Id: Idb7d2f2895aac63d54e3a6481379b739a726eff6
Chalard Jean [Thu, 7 Jun 2018 09:37:59 +0000 (18:37 +0900)]
[PT06] Move setGlobalProxy into ProxyTracker
Test: runtest
Change-Id: I6abd2221882db368a411b7174c66d8bd3b6b5110
Chalard Jean [Thu, 7 Jun 2018 10:40:24 +0000 (19:40 +0900)]
[PT07] Small cleanup of setGlobalProxy
Test: runtest
Change-Id: I4825e6326f7ce7bd45d625d57824f8d27c51d6f2
Chalard Jean [Thu, 7 Jun 2018 10:30:29 +0000 (19:30 +0900)]
[PT05] Move sendProxyBroadcast into ProxyTracker.
Test: runtest
Change-Id: I2c149d29d4b75d3978021b940b6bc58f677b8d17
Chalard Jean [Thu, 7 Jun 2018 10:20:08 +0000 (19:20 +0900)]
[PT04] Move PacManager into ProxyTracker.
Test: runtest
Change-Id: I45d22857459fe1746d484ac04f8d5cd81fc61835
Chalard Jean [Thu, 7 Jun 2018 09:02:37 +0000 (18:02 +0900)]
[PT03] Move some more code into ProxyTracker.
Add finals and annotations. Remove comments that have lost their
context (they were in the context of disabling a permission check
that had been added, but constituted an API change that would not
serve any real purpose).
Test: runtest
Change-Id: I1f879b2c105d2127072b88233d72097a0d78fe14
Chalard Jean [Thu, 7 Jun 2018 08:41:29 +0000 (17:41 +0900)]
[PT02] Move static methods to ProxyTracker
No logic changes. Only changes are adding nullability annotations,
final modifiers, and adding an s in a comment.
Test: runtests
Change-Id: If4986a25bb36819de8ff459c4c0439c56d4e5a50
Chalard Jean [Thu, 7 Jun 2018 07:44:04 +0000 (16:44 +0900)]
[PT01] Introduce ProxyTracker
The goal of this is to simplify ConnectivityService by reducing
the amount of code it contains. This is small enough to be obviously
correct and followup changes will move code into this class.
Test: runtest
Change-Id: Ic5ab19b521e98ae397c9bf657856820304362fbb
Chalard Jean [Thu, 7 Jun 2018 07:11:34 +0000 (16:11 +0900)]
Remove a useless parameter.
This argument is useless because all its callers pass the same
value : false.
Test: runtest
Change-Id: Id921caa4ffadef535a5bbcfea052283a07320b28
Chalard Jean [Thu, 7 Jun 2018 04:46:52 +0000 (13:46 +0900)]
Small cleanup of Network.
Test: runtest
Change-Id: I56dbd37bb8f890938d360f45835de72be4beb91a
Chalard Jean [Thu, 7 Jun 2018 04:27:00 +0000 (13:27 +0900)]
Cleanup of LinkProperties.
Test: runtest
Change-Id: I7299de93a79901635ce755a2d933666ee43767d5
Neil Fuller [Tue, 12 Jun 2018 09:50:32 +0000 (09:50 +0000)]
Merge "Minimum viable TimeDetectorService"
Brad Ebinger [Mon, 11 Jun 2018 19:56:07 +0000 (19:56 +0000)]
Merge "Update Docs to clarify using a Message across IPC"
Treehugger Robot [Mon, 11 Jun 2018 15:23:38 +0000 (15:23 +0000)]
Merge "Framework: Disable native-bridge for non-zygote"
Jakub Pawlowski [Mon, 11 Jun 2018 14:43:57 +0000 (14:43 +0000)]
Merge "ScanRecord.getServiceData NPE fix"
Jakub Pawlowski [Mon, 4 Jun 2018 17:32:06 +0000 (10:32 -0700)]
ScanRecord.getServiceData NPE fix
Bug:
109662587
Change-Id: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a
Neil Fuller [Wed, 30 May 2018 13:35:24 +0000 (14:35 +0100)]
Minimum viable TimeDetectorService
This is a do-nothing TimeDetectorService that can be
populated in following commits. A temporary method has been
added so the service has one method.
Unit tests can be run with:
atest FrameworksServicesTests:TimeDetectorServiceTest
Test: build / boot
Test: See above
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
(cherry picked from commit
feeee682a23f25760c4a1aa07c00945901911ba3)
Treehugger Robot [Mon, 11 Jun 2018 11:54:21 +0000 (11:54 +0000)]
Merge changes Ifd7d73ad,Id79096fa
* changes:
Bugfixes in LinkProperties#toString
Cleanup of ConnectivityManager.
Chalard Jean [Thu, 7 Jun 2018 04:28:09 +0000 (13:28 +0900)]
Bugfixes in LinkProperties#toString
We should stop trying to use a human brain to write code
Test: manual
Change-Id: Ifd7d73ad65de0f671466080beacbd97287e17bfe
Chalard Jean [Mon, 4 Jun 2018 07:52:49 +0000 (16:52 +0900)]
Cleanup of ConnectivityManager.
This is not exhaustive, but still an undeniable improvement.
Test: runtest frameworks-net
Change-Id: Id79096faf20eec80de7c17b261ef338b895af1e0
Treehugger Robot [Mon, 11 Jun 2018 07:27:41 +0000 (07:27 +0000)]
Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"
Treehugger Robot [Mon, 11 Jun 2018 04:57:31 +0000 (04:57 +0000)]
Merge "No-op cleanup of ConnectivityService."
Treehugger Robot [Mon, 11 Jun 2018 03:26:26 +0000 (03:26 +0000)]
Merge "Copy clat modified linkProperties into new one."
Treehugger Robot [Fri, 8 Jun 2018 20:47:03 +0000 (20:47 +0000)]
Merge changes from topic "audio-package-update"
* changes:
Include InCallNotification.ogg in AllAudio.mk file
Add ChargingStarted + InCallNotif to AudioPackage
Treehugger Robot [Fri, 8 Jun 2018 20:16:14 +0000 (20:16 +0000)]
Merge "Check for null path in getInternalPathForUser"
Jerry Zhang [Wed, 6 Jun 2018 18:04:46 +0000 (11:04 -0700)]
Check for null path in getInternalPathForUser
In some situations, path could be null resulting
in a crash.
Test: no crash
Bug:
109730998
Change-Id: I2ce0410162d1327905d690331f461f9187e20906
(cherry picked from commit
6f6154bf0493cf66628c8f2418827fe54679b1eb)
Treehugger Robot [Fri, 8 Jun 2018 17:19:55 +0000 (17:19 +0000)]
Merge "API updated for ICU4J 61.1"
nharold [Fri, 8 Jun 2018 17:07:11 +0000 (17:07 +0000)]
Merge changes from topic "ipsec-sync-with-pi"
* changes:
Disable the AppOp Restriction for IpSec Tunnels
Rework Exception Handling for IpSecManager
Update IpSecManager to use InetAddress and prefixLen
Add AppOps Checks for MANAGE_IPSEC_TUNNELS
Add MANAGE_IPSEC_TUNNELS Permission
Brad Ebinger [Fri, 8 Jun 2018 17:03:14 +0000 (17:03 +0000)]
Merge "Adds a private field to parceled data."
Brad Ebinger [Fri, 8 Jun 2018 17:02:48 +0000 (17:02 +0000)]
Merge "Unhide @SystemApi Constructor"
David Brazdil [Fri, 8 Jun 2018 14:22:26 +0000 (14:22 +0000)]
Merge "Build dark greylist from public + light grey API"
Fredrik Roubert [Tue, 3 Apr 2018 18:55:14 +0000 (20:55 +0200)]
API updated for ICU4J 61.1
Bug:
77634530
Bug:
109837373
Test: make
Test: cts-tradefed run cts-dev -m CtsIcuTestCases -t android.icu.dev.test.format.MeasureUnitTest
for CTS coverage
Change-Id: I721fbef5c79df1310e144a48ab2f18929b10bdfa
Treehugger Robot [Fri, 8 Jun 2018 11:51:29 +0000 (11:51 +0000)]
Merge "Opportunistic typo fix"
Chalard Jean [Mon, 4 Jun 2018 04:33:12 +0000 (13:33 +0900)]
No-op cleanup of ConnectivityService.
Funny how these things accumulate. Not exhaustive of course, but
still an improvement.
- Remove unused imports.
- Remove unused variables and members.
- Replace members with locals where applicable.
- Remove useless type parameters and explicit unboxings for Java 7.
- Conversely add the diamond operator for auto-genericity for
Java 6.
- Reduce visibility of members where possible.
Test: runtest frameworks-net
Change-Id: I13586aee09b4cd1c87c525fafb5eee44dedb5360
junyulai [Tue, 5 Jun 2018 08:10:04 +0000 (16:10 +0800)]
Copy clat modified linkProperties into new one.
updateLinkProperties copied the linkProperties in networkAgent,
but the clat fix-up function did not copy stacked link into new one.
This caused an incorrect clat iface removal, and the IPv4 network
to be unreachable.
Clean cherry-pick of ag/
4260470
Bug:
80261579
Test: 1. ping after ipv6 only data call with 2g voice call on/off
2. runtest frameworks-net
3. run cts -m CtsNetTestCases
Change-Id: Ide47a3b0680dddfcf3e2e759a59b19aee3605050
Treehugger Robot [Fri, 8 Jun 2018 02:06:17 +0000 (02:06 +0000)]
Merge "Add field to set A2DP device volume on connect (1/2)"
Nathan Harold [Wed, 16 May 2018 02:18:38 +0000 (19:18 -0700)]
Disable the AppOp Restriction for IpSec Tunnels
This CL temporarily removes the AppOp restriction
that disallows creation of IpSec tunnels due to
the lack of the appropriate AppOp in AOSP/master.
When the relevant framework merges out to master,
this CL should be reverted.
Bug: none
Test: compilation
Change-Id: Ic06c193f85f6bcdd0ead4238825c1add78703cde
Nathan Harold [Tue, 3 Apr 2018 23:13:19 +0000 (16:13 -0700)]
Rework Exception Handling for IpSecManager
In order to properly support EOPNOTSUPP this CL
applies a consistent approach to handling Exceptions.
Hereafter, all exceptions that aren't of a special
method-specific type (such as SpiUnavailableException)
will all be returned to the calling process unchanged.
At the API call site, the ServiceSpecificException,
which is really an Errno, will be inspected and either
converted to an unchecked exception for types we know,
or it will be converted to an IOException in cases where
that method can return a checked exception. In cases
where we do not expect an errno, we will simply throw
a generic RuntimeException. This means all API calls
will now properly throw UnsupportedOperationException
and may be CTS tested accordingly.
Bug:
72420898
Test: runtest frameworks-net
Merged-In: I4a00e221618896223fcdb4b4279fb14cd14e34d8
Change-Id: I4a00e221618896223fcdb4b4279fb14cd14e34d8
(cherry picked from commit
ddeb90aa9db108d4a2e5aadc778a726b65e5c921)
Benedict Wong [Wed, 4 Apr 2018 03:30:54 +0000 (20:30 -0700)]
Update IpSecManager to use InetAddress and prefixLen
LinkAddress constructors are currently @hide; this change updates
IpSecManager to use InetAddress and prefixLen, and then construct a
LinkAddress internally. LinkAddress is used over the binder interface to
IpSecService to ensure validity.
Bug:
77528639
Test: CTS, Java unit tests ran on walleye
Merged-In: I19e124adef6d9f4992d8293db3190bcf74c95848
Change-Id: I19e124adef6d9f4992d8293db3190bcf74c95848
(cherry picked from commit
3f2c54b7820c3a568890700479230966fdbcf0a4)
Nathan Harold [Fri, 16 Mar 2018 01:06:06 +0000 (18:06 -0700)]
Add AppOps Checks for MANAGE_IPSEC_TUNNELS
Adds support for a new AppOp to permit services to
use IpSec tunnel mode. The IpSecService now needs
a context so change the service mode to a cached
service rather than a static service.
Bug:
66955045
Test: runtest frameworks-net
Merged-In: I17a4a286225b432c3e15ea1587d946189931b4f4
Change-Id: I17a4a286225b432c3e15ea1587d946189931b4f4
(cherry picked from commit
592dadbd43fcb7c5d67e737adb34d07923da90c4)
Nathan Harold [Wed, 21 Mar 2018 22:32:42 +0000 (15:32 -0700)]
Add MANAGE_IPSEC_TUNNELS Permission
Add a new MANAGE_IPSEC_TUNNELS permission and
protect all IPsec Tunnel mode APIs with it.
This permission is only granted to the system or
through an AppOp.
Bug:
66955045
Test: compilation
Merged-In: I0f618373b500c493ef2211bece681f74652a1833
Change-Id: I0f618373b500c493ef2211bece681f74652a1833
(cherry picked from commit
159788455c79fa47847d0c40fcee7aceff2551ae)
Mathieu Chartier [Thu, 7 Jun 2018 23:27:12 +0000 (23:27 +0000)]
Merge "Add filter for NoPreloadHolders"
Beverly [Thu, 7 Jun 2018 18:30:55 +0000 (14:30 -0400)]
Include InCallNotification.ogg in AllAudio.mk file
Test: manual
Change-Id: Ic7dee1ece7231731a6fdab5aa7057ff240b94071
Eric Laurent [Mon, 21 May 2018 16:28:46 +0000 (09:28 -0700)]
Add field to set A2DP device volume on connect (1/2)
Add a field to setBluetoothA2dpDeviceConnectionStateInt() to allow
Bluetooth to set a volume for the new device when it connects.
Bug:
79529581
Test: Switch repeatedly between devices and see that the old volume isn't
used on the new device or the new volume isn't used on the old device.
Change-Id: Iea13ca8b5c538c999149baba6e9069745ad9466b
Merged-In: I909fa3f40818c595fc977695fbfa1214f9a4de72
(cherry picked from commit
3e6fb6309033c50081c0789b5905d5cd539b38f6)
Mathieu Chartier [Thu, 7 Jun 2018 21:30:24 +0000 (14:30 -0700)]
Add filter for NoPreloadHolders
Avoid including these in the preloaded classes.
Test: manual
Bug:
109652611
Change-Id: I1efd1749e54e8b38ca8f7e3ff05058ddb0fe4460
Beverly [Tue, 5 Jun 2018 13:41:42 +0000 (09:41 -0400)]
Add ChargingStarted + InCallNotif to AudioPackage
Add the ChargingStarted and InCallNotification sounds
to AudioPackages to make them available to AOSP
Test: manual
Change-Id: I614bd69471ef19f6095f7d7874acbb85ff56d99c
Andreas Gampe [Thu, 7 Jun 2018 16:42:02 +0000 (09:42 -0700)]
Framework: Disable native-bridge for non-zygote
Non-zygotes may not have the permissions/capabilities to run a
bridge and may abort attempts to load a bridge because of seccomp
rules. So don't tell the runtime to load a bridge when starting
a non-zygote.
Bug:
77878177
Bug:
80118963
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I7894b89feec79e4bd478f649c004ad29fc46597e
Brad Ebinger [Thu, 7 Jun 2018 17:03:28 +0000 (17:03 +0000)]
Merge "Add GTS test APIs for testing ImsService"
Neil Fuller [Thu, 7 Jun 2018 15:50:06 +0000 (15:50 +0000)]
Merge "Remove CommonClock / CommonTimeManagementService"
Sundong Ahn [Mon, 21 May 2018 08:39:23 +0000 (17:39 +0900)]
Build com.android.location.provider with java_sdk_library
com.android.location.provider is built with java_sdk_library and api
files are added by running "make update-api".
Remove com.android.location.provider.xml since it will be
make auto generation by soong when the library is built with
java_sdk_library.
Bug:
77577799
Test: make -j
Test: make checkapi
Test: adb shell cmd package list libraries |\
grep com.android.location.provider
And check the com.android.location.provider library
Change-Id: Iad0b4452fd87716c277235f3da6f3540aafdbed3
Treehugger Robot [Thu, 7 Jun 2018 11:27:25 +0000 (11:27 +0000)]
Merge "com.android.mediadrm.signer is built with java_sdk_library"
David Brazdil [Thu, 31 May 2018 12:58:41 +0000 (13:58 +0100)]
Build dark greylist from public + light grey API
The dark greylist is meant to contain non-SDK APIs which are "related"
to APIs accessible to apps without restrictions. The list used to be
built as all non-SDK APIs in the same package as those on the light
greylist. That is not sufficient and should include the public SDK API
packages too.
This patch modifies the makefile to generate a list of public API DEX
signatures with Doclava and then use that as a basis for the dark
greylist generation.
Bug:
80461842
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: I4b1588013f26661207126b4006cdef0a0fc8ae2c
Chalard Jean [Thu, 7 Jun 2018 05:48:23 +0000 (14:48 +0900)]
Opportunistic typo fix
Test: unneeded
Change-Id: I2f5636f3d7ea4b6e9d3e6feddfd0cb586d658813
Brad Ebinger [Wed, 11 Apr 2018 18:25:05 +0000 (11:25 -0700)]
Update Docs to clarify using a Message across IPC
When using Message across IPC, the message must be sent
with a Messenger. Update Docs to reflect this.
Bug:
77870347
Test: Telephony Unit Tests
Merged-In: Ie1a0be63d26136f14cd30c354b889ec0311cc7ee
Change-Id: I27977a13f7ccb6875b5fdb7eb6c6836a84166eeb
Brad Ebinger [Mon, 9 Apr 2018 22:15:49 +0000 (15:15 -0700)]
Adds a private field to parceled data.
Bug:
77957465
Test: Manual/GTS
Merged-In: Ib87a7af0654cc1ec0db052d8ee72f4c74c0aea04
Change-Id: I321b667f9186feaf2579bd4dd27ebf67fc2e0d52
Brad Ebinger [Thu, 29 Mar 2018 18:12:24 +0000 (11:12 -0700)]
Unhide @SystemApi Constructor
There are a few small classes that never got properly
exposed as @SystemApi. These classes were not caught
because vendors currently build against the source
directly and have access to hidden APIs. We can not
change the vendor code at this point (different vendor
code for each year for all supported devices), but
we can start pulling back the API for new devices.
1) Keep all public mutable fields @hide and put
todo (and file bug b/
74402619) to make fields
private or final.
2) Add public constructor that populates all fields
so that @hide public mutable fields can be set to
private/final in the future.
3) Provide getters for fields that will not be
public in the future.
In this way, we can make minimal API changes for P,
support new vendor/3rd party ImsServices, and phase
out old ImsService implementations that still build
against the source instead of using the correct
@SystemApi.
Bug:
77278031
Bug:
74402619
Test: Manual
Merged-In: Idbf2a71018f1bd06f8445b07fc52bc65cb6776f6
Change-Id: Ifa3b6d0cbdb12e92efc699b760ca874768a89a7c
Brad Ebinger [Tue, 3 Apr 2018 22:16:38 +0000 (15:16 -0700)]
Add GTS test APIs for testing ImsService
Bug:
77141737
Test: Manual
Merged-In: Id60cf07121cf98ab3f0a10af10cf70beb25feb54
Change-Id: Ia41a96b5013bc6a7f534c347db72a14348c1fc5d
Tyler Gunn [Wed, 6 Jun 2018 21:19:04 +0000 (21:19 +0000)]
Merge "Ensure self-managed calls use voip audio mode."
Neil Fuller [Mon, 4 Jun 2018 14:35:31 +0000 (15:35 +0100)]
Remove CommonClock / CommonTimeManagementService
The service and associated code is unused.
Bug:
80462439
Test: build / boot
Merged-In: Ibdfab1b7d2951a0c45e07bd47850af037990841b
Change-Id: Ibdfab1b7d2951a0c45e07bd47850af037990841b
Chalard Jean [Wed, 6 Jun 2018 08:25:45 +0000 (08:25 +0000)]
Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ...
* changes:
Let tests enumerate all transports/capabilities.
Destroy networks as soon as they are disconnected.
Fix a ConcurrentModificationException crash.
Unify behavior of various cases of "no underlying networks"
Fix: VPNs update caps upon underlying network disconnect.
Add tests for setUnderlyingNetworks.
Fix setCapabilities.
Fix SSID not being logged by the validation logs
Make sure getActiveNetwork is consistent with default callbacks
Add tests for getActiveNetwork.
Guard the SSID with NETWORK_SETTINGS
Add a new ssid field in NetworkCapabilities.
Notif manager and captive portal app to read SSID again
Remove unwanted capability from the java-doc
Actually @hide unwanted capability methods.
API council requested tweaks to NetworkRequest.
Add OEM_PAID capability to system api
add airplane mode shell commands to connectivity
Enable cleartext for captive portal apps
Expose CONNECTIVITY_ACTION to Instant Apps
fix isActiveNetworkMetered with VPNs
Jeff Sharkey [Mon, 14 May 2018 19:49:07 +0000 (13:49 -0600)]
Let tests enumerate all transports/capabilities.
This gives them a way to collect all included values without
resorting to manual probing of each newly added value.
Cherry-pick of ag/
4052941 with minor conflicts in the imports.
Bug:
16207332
Test: atest com.android.cts.net.HostsideVpnTests
Change-Id: Ia764b3412bf834890612378e0c3846913f4e0a06
Merged-In: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0
Merged-In: If07e77c92046807235229a4f67ee087bdd7bccf1
Chalard Jean [Fri, 11 May 2018 11:19:20 +0000 (20:19 +0900)]
Destroy networks as soon as they are disconnected.
...as opposed to after the async channel finished disconnecting.
Clean cherry-pick of ag/
4043255
Bug:
78308259
Test: runtest frameworks-net
also used a device with this patch over the weekend and
tried all I could think of
Merged-In: Ic4c7520e907de353a01c2a3a8a50d661dee4a994
Merged-In: I0617f0ff6e46a1d3764335a1e7ad01b34c8cc5a8
Change-Id: I4e4b41bbdf25d7d7bea4124cb58da004d47f1090
Chalard Jean [Wed, 23 May 2018 00:07:51 +0000 (09:07 +0900)]
Fix a ConcurrentModificationException crash.
This is a pinpoint fix against the bug listed below. While a client
is synchronously reading the LinkProperties of a network, the
ConnectivityServiceThread is updating its properties. Make sure
that update is done atomically.
This is a stopgap countermeasure against a problem that is
pervasive with usage of LinkProperties, but fixing the problem
itself will happen later.
Clean cherry-pick of ag/
4174798
Bug:
80077223
Test: runtest frameworks-net
Change-Id: I61b262d824c98b4ced36395a597b73de9193a199
Merged-In: I25007ac26349e451bb47f966af70d590d699c347
Merged-In: I03526187645b6955eb89ca4d2e4a930ebac236b8
Chalard Jean [Mon, 21 May 2018 06:30:56 +0000 (15:30 +0900)]
Unify behavior of various cases of "no underlying networks"
Before this change, VPNs having no underlying networks would be
marked as metered as the safe option, but VPNs having only
disconnected underlying networks would be marked as unmetered.
Fix this discrepancy.
Clean cherry-pick of ag/
4113809
Bug:
79748782
Test: runtest frameworks-net
Change-Id: Ie6ace6bd95139605ffcfa8cd6c15cf28f8fa28c8
Merged-In: If19b85325e7d684e645470293b3c8a674084c641
Merged-in: I22f80a6a39d4a19ff74aa61fcbd66f1a041b1003
Chalard Jean [Fri, 18 May 2018 13:02:56 +0000 (22:02 +0900)]
Fix: VPNs update caps upon underlying network disconnect.
Clean cherry-pick of ag/
4083954
Bug:
79748782
Test: ConnectivityServiceTests still pass
Change-Id: I21e866c723099e5c3dee54ff13e830d44427fc7a
Merged-In: I12c948ebeb2b74290908f8320ff77220dc4a9fb9
Chalard Jean [Fri, 18 May 2018 12:47:45 +0000 (21:47 +0900)]
Add tests for setUnderlyingNetworks.
Fixes come later. This is complex enough as it is.
Clean cherry-pick of ag/
4083953
Bug:
79748782
Test: new test passes, old tests still pass
Change-Id: If7276fe1f751be7b9c18f689e97699e566e5bde0
Merged-In: I12c948ebeb2b74290908f8320ff77220dc4a9fb9
Chalard Jean [Fri, 18 May 2018 14:48:49 +0000 (23:48 +0900)]
Fix setCapabilities.
P introduced setSSID, UIDs and unwanted capabilities.
None of these exhibit commutative behavior through combineCapabilities
because their semantics don't allow it. Therefore
NetworkRequest.setCapabilities() is badly broken around any of
these. Look at the comments in the new tests to realize the
extent of the damage.
Clean cherry-pick of ag/
4083952
Bug:
79748782
Test: new tests written, old tests pass
Change-Id: Iafe074126132a82af37f4bf056c4a7b8d56bdc83
Merged-In: Ia5bebf8a233775367bbf1b788870528934ecbcfb
Merged-In: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1
Chalard Jean [Thu, 26 Apr 2018 07:16:10 +0000 (16:16 +0900)]
Fix SSID not being logged by the validation logs
Also add it in the logs of the notification manager.
Clean cherry-pick of ag/
4022397
Bug:
78547904
Test: manual
Change-Id: I0afc18c94adf97154c61af2a5bdf933fb5f0e622
Merged-In: Iad5388a31a1502bc1944346276bb9600ac1386bd
Merged-In: I8bdd4a020e9d04f46847ef3c7e80ccf5c5cd19ea
Chalard Jean [Wed, 18 Apr 2018 11:18:38 +0000 (20:18 +0900)]
Make sure getActiveNetwork is consistent with default callbacks
Almost clean cherry-pick of ag/
3889538.
Bug:
77737389
Test: runtest framework-net
new test don't pass without the main code change, but they
do with it
Change-Id: I0cd83a935ab0b349aa47e065b830e5a43ab9a091
Merged-In: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
Merged-In: Ia8f985b448251f911484e6bd63fa562bffc1b0e4
Chalard Jean [Wed, 18 Apr 2018 10:18:58 +0000 (19:18 +0900)]
Add tests for getActiveNetwork.
Clean cherry-pick of ag/
3918295
One-line adjustment for ag/
3638326 which has not been put in AOSP.
Bug:
77737389
Test: runtest frameworks-net
Change-Id: I03ae2bbb08559f2cd44979e291c1f5d50eb215da
Merged-In: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
Merged-In: Ia8f985b448251f911484e6bd63fa562bffc1b0e4