OSDN Git Service
Colin Cross [Thu, 14 Jun 2018 22:23:21 +0000 (15:23 -0700)]
Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in aapt2 integration test libraries 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: If5d4f97bb2d8a503bd3c20f2ea8aea2519c51e85
Sundong Ahn [Fri, 15 Jun 2018 04:59:40 +0000 (21:59 -0700)]
Merge "Build com.android.location.provider with java_sdk_library"
am:
aa5d8dfeb0
Change-Id: I53720ed4fcbe9f00f2f1f607d07efa9adaaf7bb4
Bernie Innocenti [Fri, 15 Jun 2018 04:55:53 +0000 (21:55 -0700)]
Merge "Make dumpHexString() tolerate null arrays."
am:
a917c1db32
Change-Id: Ib0160e232cab0a713853a65eef26f7a02d65c1f1
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."
Neil Fuller [Thu, 14 Jun 2018 21:15:04 +0000 (14:15 -0700)]
Merge "Clear calling identity before doing any work"
am:
31686e954a
Change-Id: I144fd2b5f46ce7d7a06195a2dd5207d44cd951f0
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
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 09:40:17 +0000 (02:40 -0700)]
Merge "Add TimestampedValue.toString()"
am:
bfa58946f7
Change-Id: I38760ef47ba04f20882a467857e7c57c088d4391
Neil Fuller [Thu, 14 Jun 2018 08:21:27 +0000 (08:21 +0000)]
Merge "Add TimestampedValue.toString()"
Pengquan Meng [Wed, 13 Jun 2018 22:33:08 +0000 (15:33 -0700)]
Merge changes from topic "clean"
am:
9f2362bb82
Change-Id: I9a0554d7cacd8c02d78ad08b7d05b074720dfe2a
Benjamin Miller [Wed, 13 Jun 2018 22:26:20 +0000 (15:26 -0700)]
[automerger skipped] Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
am:
ce3d429832 -s ours
Change-Id: If38c9f39b28e39f26481671bfc7f293e321a26d9
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.
Evan Laird [Wed, 13 Jun 2018 15:56:41 +0000 (08:56 -0700)]
Merge "Use disableForUser in StatusBarManager"
am:
5392d799ab
Change-Id: I346f8a17d43e65c6e9ed362942345146ad6cac1d
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
Andreas Gampe [Tue, 12 Jun 2018 21:58:00 +0000 (14:58 -0700)]
[automerger skipped] Merge "Frameworks: Remove complex boolean"
am:
16eef1aad8 -s ours
Change-Id: I407b42d45738599955bca210b5f9896753e51224
Mark Salyzyn [Tue, 12 Jun 2018 21:14:03 +0000 (14:14 -0700)]
Merge "persist.sys.boot.reason is cleared once read by bootstat"
am:
8ec0c6ba48
Change-Id: Ib52e362e07a81086e142ff1f120a266862f0a073
Treehugger Robot [Tue, 12 Jun 2018 19:24:19 +0000 (19:24 +0000)]
Merge "Frameworks: Remove complex boolean"
Neil Fuller [Tue, 12 Jun 2018 19:10:22 +0000 (20:10 +0100)]
Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/
4324946.
Bug:
110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
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
Neil Fuller [Tue, 12 Jun 2018 18:17:51 +0000 (11:17 -0700)]
Merge "Simple pass-through TimeDetectorService"
am:
cb749e2e50
Change-Id: Ic2e3d3c3f9181ef4054f599baf4ac086ec21d8bd
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 13:57:33 +0000 (06:57 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
am:
6c0106b57f
Change-Id: I86bc83e2bd859b48017f12832e9ff0080ec162b8
Neil Fuller [Tue, 12 Jun 2018 13:14:13 +0000 (14:14 +0100)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
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 [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: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 22:24:19 +0000 (15:24 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC"
am:
0be0692691 -s ours
Change-Id: I1d3887c7d4a868a1f1b56c0d2e4f824eef29fb3a
Brad Ebinger [Mon, 11 Jun 2018 19:56:07 +0000 (19:56 +0000)]
Merge "Update Docs to clarify using a Message across IPC"
Andreas Gampe [Mon, 11 Jun 2018 16:11:28 +0000 (09:11 -0700)]
Merge "Framework: Disable native-bridge for non-zygote"
am:
05c09faad2
Change-Id: I2aea1bd9c520ca6bb42bf80bd445da0e86db8136
Jakub Pawlowski [Mon, 11 Jun 2018 16:07:31 +0000 (09:07 -0700)]
Merge "ScanRecord.getServiceData NPE fix"
am:
d62f74e806
Change-Id: I11a254cf633dc5cf9a7c53c992bf49b00f3d274e
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)
Chalard Jean [Mon, 11 Jun 2018 13:12:34 +0000 (06:12 -0700)]
Merge changes Ifd7d73ad,Id79096fa
am:
bfe3b1a691
Change-Id: I263f51ba2aafdf8e19e020b2a4f6ff1b8238fa3c
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
Ryo Hashimoto [Mon, 11 Jun 2018 08:25:46 +0000 (01:25 -0700)]
Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"
am:
20e243d627
Change-Id: I0bc6158d1c37ee8a02450dee55ca6732d878fde3
Treehugger Robot [Mon, 11 Jun 2018 07:27:41 +0000 (07:27 +0000)]
Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"
Chalard Jean [Mon, 11 Jun 2018 05:09:18 +0000 (22:09 -0700)]
Merge "No-op cleanup of ConnectivityService."
am:
a190a41b51
Change-Id: I9ec9633a85b8b2298f90419da2a73c540b6e6805
Treehugger Robot [Mon, 11 Jun 2018 04:57:31 +0000 (04:57 +0000)]
Merge "No-op cleanup of ConnectivityService."
junyulai [Mon, 11 Jun 2018 04:44:16 +0000 (21:44 -0700)]
Merge "Copy clat modified linkProperties into new one."
am:
33b5abb6f8
Change-Id: Ia1f9ab3d5c3b889beddb4dda56ad3389c4967275
Treehugger Robot [Mon, 11 Jun 2018 03:26:26 +0000 (03:26 +0000)]
Merge "Copy clat modified linkProperties into new one."
TreeHugger Robot [Sat, 9 Jun 2018 02:06:38 +0000 (02:06 +0000)]
Merge "Disable the AppOp Restriction for IpSec Tunnels" into stage-aosp-master
Beverly [Sat, 9 Jun 2018 00:11:41 +0000 (17:11 -0700)]
Merge changes from topic "audio-package-update"
am:
2d5156733c
Change-Id: I051fc7af9663a90ff5b7e080dd44001646d35089
Jerry Zhang [Fri, 8 Jun 2018 23:55:43 +0000 (16:55 -0700)]
Merge "Check for null path in getInternalPathForUser"
am:
0559afdbcc
Change-Id: I0669f429a389655e04f26ab4cd19fbf69f3dbef1
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.
Manually merging this due to skipping a merge
conflict at
ef9f2740a790feceaa47a24b1a179e93c4ffb5e6
Bug: none
Test: compilation
Change-Id: Ic06c193f85f6bcdd0ead4238825c1add78703cde
Xin Li [Fri, 8 Jun 2018 21:36:39 +0000 (14:36 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: I2ec319e9fc92e959580a4a3cfe955ae91996dc96
Xin Li [Fri, 8 Jun 2018 21:36:00 +0000 (14:36 -0700)]
Skip
ef9f2740a7 in proposed pi-dev-plus-aosp-without-vendor merge.
Bug:
79597307
Change-Id: I8ac04fdd94b069434e2f00b0bfab63eb916f6129
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"
Fredrik Roubert [Fri, 8 Jun 2018 19:38:06 +0000 (12:38 -0700)]
Merge "API updated for ICU4J 61.1"
am:
c2791389a5
Change-Id: I15f620499d0cc69dae06e6d986f8e2d9bcde26a6
nharold [Fri, 8 Jun 2018 19:34:09 +0000 (12:34 -0700)]
Merge changes from topic "ipsec-sync-with-pi"
am:
b2749539c0
Change-Id: Ic91ed8f496163c560c6f1fd306bc74e5fecb61c2
Brad Ebinger [Fri, 8 Jun 2018 19:27:22 +0000 (12:27 -0700)]
Merge "Adds a private field to parceled data."
am:
7db23752ab
Change-Id: I9d0bde31a8aeb67b62e202b3b8946b066b81d186
Brad Ebinger [Fri, 8 Jun 2018 19:21:11 +0000 (12:21 -0700)]
Merge "Unhide @SystemApi Constructor"
am:
442b546e2a
Change-Id: Ie6281283f6605b7125882698333644843838e2ef
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 16:10:52 +0000 (09:10 -0700)]
Merge "Build dark greylist from public + light grey API"
am:
60229832de
Change-Id: I7a0077ed63f17e4a60482fad3f39ee1ab2d89461
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
Chalard Jean [Fri, 8 Jun 2018 13:01:27 +0000 (06:01 -0700)]
Merge "Opportunistic typo fix"
am:
6b03498a54
Change-Id: Id6dc12172a9fb1980a598ba070af1b10b1738849
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
Chris Forbes [Fri, 8 Jun 2018 05:23:29 +0000 (22:23 -0700)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
am:
551328eaaa
Change-Id: I4f9a420dcefb53e767a745f595787b71fcacd228
Chris Forbes [Fri, 8 Jun 2018 05:14:12 +0000 (05:14 +0000)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
Svet Ganov [Fri, 8 Jun 2018 05:12:45 +0000 (22:12 -0700)]
Merge "Don't access keyguard from instant apps." into pi-dev
am:
e7bd4e7e8f
Change-Id: I5d5d8ea0c7b5756143b5140e4cf16ae584147345
TreeHugger Robot [Fri, 8 Jun 2018 04:49:39 +0000 (04:49 +0000)]
Merge "Don't access keyguard from instant apps." into pi-dev
Eric Laurent [Fri, 8 Jun 2018 04:43:53 +0000 (21:43 -0700)]
[automerger skipped] Merge "Add field to set A2DP device volume on connect (1/2)" am:
1b9de57f38
am:
fe96bd9c72 -s ours
Change-Id: Ife1a1762bba30d0a24919498c8b5c06b5639ac92
Android Build Merger (Role) [Fri, 8 Jun 2018 04:19:01 +0000 (04:19 +0000)]
Merge "Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev am:
eaf3590eda" into pi-dev-plus-aosp
Adam Powell [Fri, 8 Jun 2018 04:18:10 +0000 (21:18 -0700)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
am:
eaf3590eda
Change-Id: I569a2caf105c4b6cf60b81026567ef4af7ca31c9
Android Build Merger (Role) [Fri, 8 Jun 2018 04:15:24 +0000 (04:15 +0000)]
Merge "Merge "Add filter for NoPreloadHolders" am:
88ee5c93bb am:
202e61f127" into pi-dev-plus-aosp
Mathieu Chartier [Fri, 8 Jun 2018 04:14:59 +0000 (21:14 -0700)]
Merge "Add filter for NoPreloadHolders" am:
88ee5c93bb
am:
202e61f127
Change-Id: Id4967cc4eb918ef81be118d6c03707b4e4e1983e
Lucas Dupin [Fri, 8 Jun 2018 04:10:12 +0000 (21:10 -0700)]
Merge "Animate owner info during wake-up transition" into pi-dev
am:
c28e772042
Change-Id: I24a01e8e9ea9d82275a7434fc8dfdc5d1f4a30ad
TreeHugger Robot [Fri, 8 Jun 2018 03:48:21 +0000 (03:48 +0000)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 03:38:01 +0000 (03:38 +0000)]
Merge "Animate owner info during wake-up transition" into pi-dev
Svet Ganov [Fri, 8 Jun 2018 03:20:34 +0000 (20:20 -0700)]
Don't access keyguard from instant apps.
Test: cts-instant-tradefed run cts-instant -m CtsViewTestCases
bug:
109652548
Change-Id: I6f8bb714bd98fd53068b2662633a9155d64b274c
Svetoslav Ganov [Fri, 8 Jun 2018 03:15:54 +0000 (20:15 -0700)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
am:
97995da6e1
Change-Id: I014e8de99a78a489f1f32738429d1cb0cebc4076
Eric Laurent [Fri, 8 Jun 2018 03:10:14 +0000 (20:10 -0700)]
Merge "Add field to set A2DP device volume on connect (1/2)"
am:
1b9de57f38
Change-Id: I128bf69bfdd9efaaf186ed3b9278d7ef1479b19e
TreeHugger Robot [Fri, 8 Jun 2018 03:00:26 +0000 (03:00 +0000)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev