OSDN Git Service
Lorenzo Colitti [Wed, 6 Jun 2018 14:15:56 +0000 (07:15 -0700)]
Merge "Support seamless handover between VPN fds." into pi-dev am:
f35fd8653c
am:
eacc81f7bb
Change-Id: I26a69940636e362a3ff5d76ba2eecc012faf39d0
Julia Reynolds [Wed, 6 Jun 2018 14:07:19 +0000 (07:07 -0700)]
Merge "Further interruptiveness changes" into pi-dev am:
fe1d9dc1af
am:
bbaf6a4a6f
Change-Id: Ic6ac2a1ad921250fc751a643cd1b5ad58f8166e0
Lorenzo Colitti [Wed, 6 Jun 2018 14:05:13 +0000 (07:05 -0700)]
Merge "Support seamless handover between VPN fds." into pi-dev
am:
f35fd8653c
Change-Id: Ia94a34a1f4763d12b6d5ca702640933bc5c84499
Julia Reynolds [Wed, 6 Jun 2018 13:58:54 +0000 (06:58 -0700)]
Merge "Further interruptiveness changes" into pi-dev
am:
fe1d9dc1af
Change-Id: Ic258eaf306dc05850015808c9b67b07398575770
Jake Wharton [Wed, 6 Jun 2018 13:56:41 +0000 (13:56 +0000)]
Merge "Annotate Rect/RectF with nullability annotations"
TreeHugger Robot [Wed, 6 Jun 2018 13:51:23 +0000 (13:51 +0000)]
Merge "Support seamless handover between VPN fds." into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 13:46:42 +0000 (13:46 +0000)]
Merge "Further interruptiveness changes" into pi-dev
chaviw [Wed, 6 Jun 2018 13:19:59 +0000 (06:19 -0700)]
Merge "Notify WM that app is delayed closing due to the possibility of PIP." into pi-dev am:
47d9d9801b
am:
a514c9aa7c
Change-Id: I409440178472859660a3fbe6ffbb07998b0eb90e
chaviw [Wed, 6 Jun 2018 13:11:06 +0000 (06:11 -0700)]
Merge "Notify WM that app is delayed closing due to the possibility of PIP." into pi-dev
am:
47d9d9801b
Change-Id: I6b9e3426f35e66596e96068601e4166887586487
TreeHugger Robot [Wed, 6 Jun 2018 12:57:55 +0000 (12:57 +0000)]
Merge "Notify WM that app is delayed closing due to the possibility of PIP." into pi-dev
Nicolas Geoffray [Wed, 6 Jun 2018 11:50:49 +0000 (04:50 -0700)]
Add 3 more APIs to light grey. am:
1bb35c2a21
am:
28476b0a28
Change-Id: I312b2333b2af692f36f34d9873928857ae849080
Nicolas Geoffray [Wed, 6 Jun 2018 11:44:19 +0000 (04:44 -0700)]
Add 3 more APIs to light grey.
am:
1bb35c2a21
Change-Id: Ibbadb5be4ffed11aa7135aa215a9263c9c1b6ca1
Annie Meng [Wed, 6 Jun 2018 10:30:33 +0000 (10:30 +0000)]
Merge "Disable bmgr if BMS is not running"
Chalard Jean [Wed, 6 Jun 2018 10:18:28 +0000 (03:18 -0700)]
[automerger skipped] Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ... am:
b044b885cf am:
ac11946404 -s ours
am:
1ee97508f0 -s ours
Change-Id: Ic58754fa0a10f4242bcb6a80e69f7685048c6b3f
Chalard Jean [Wed, 6 Jun 2018 10:08:03 +0000 (03:08 -0700)]
[automerger skipped] Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ... am:
b044b885cf
am:
ac11946404 -s ours
Change-Id: I8c4838e96c77b58cbc7069c41c3c83a01b93ce7a
Chalard Jean [Wed, 6 Jun 2018 10:00:49 +0000 (03:00 -0700)]
Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ...
am:
b044b885cf
Change-Id: Ib54b132dae9e6ab4e01ee46a8afdcb2f50df2709
TreeHugger Robot [Wed, 6 Jun 2018 09:46:22 +0000 (09:46 +0000)]
Merge "Remove adb shell bmgr restore <package>"
TreeHugger Robot [Wed, 6 Jun 2018 09:19:30 +0000 (09:19 +0000)]
Merge "Check manifest if runtime state of app is DEFAULT"
Nan Zhang [Wed, 6 Jun 2018 08:34:47 +0000 (01:34 -0700)]
Merge "Add metalava based api-stubs modules in Android.bp" am:
f907578564 am:
25d4494793
am:
18543da456
Change-Id: I90124871fc88448c74439f9f4a8a66bda38a324a
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
Bernardo Rufino [Wed, 30 May 2018 09:09:25 +0000 (10:09 +0100)]
Remove adb shell bmgr restore <package>
Also put comment on RestoreSession saying that it doesn't kill the app
in the end.
Bug:
29255593
Test: Builds
adb shell bmgr help, verify usage
adb shell bmgr restore android, verify no-op
Change-Id: I89304149ea6c03a80937e321cf3a46fd173308e2
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
Chalard Jean [Mon, 16 Apr 2018 03:25:22 +0000 (12:25 +0900)]
Guard the SSID with NETWORK_SETTINGS
Clean cherry-pick of ag/
3904260
Bug:
77865258
Test: manual
Change-Id: I2a2e236041797df495759dd4e07648545cad6c7c
Merged-In: Iba59e93875c28b8e30db0c013575bc2f117cb16c
Merged-In: I6cf364f0815a2eaab60f5de5e1d5ccc4908e9eca
Chalard Jean [Wed, 11 Apr 2018 12:09:10 +0000 (21:09 +0900)]
Add a new ssid field in NetworkCapabilities.
Clean cherry-pick of ag/
3887737
Bug:
77891227
Test: frameworks-net
Change-Id: Icefe1657bca52b913a72b56705342a7285769658
Merged-In: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda
Merged-In: I6dd1aba6fde5a502b4a9145cf16393d8ce623c89
Chalard Jean [Thu, 12 Apr 2018 02:52:37 +0000 (11:52 +0900)]
Notif manager and captive portal app to read SSID again
Cherry-picked from ag/
3887738 ; almost clean CP, only had
to add an import.
Bug:
77114259
Test: frameworks-net pass
manual test shows the SSID is now displayed again
Change-Id: I5cb2b4777ad78d972031e8f2ff22e2155f4ab894
Merged-In: I588fedba49ea5d08e40bd2b3ea8ba2c2383958ec
Merged-In: I663a59ff2847a9f44ea1395326f6cb00e97237b6
Pavel Maltsev [Mon, 9 Apr 2018 20:10:11 +0000 (13:10 -0700)]
Remove unwanted capability from the java-doc
Per API council feedback remove unwanted capaibility from public API
java docs
Clean cherry-pick from ag/
3868438
Bug:
77601789
Test: make docs
Test: build and flash
Change-Id: I4f3b8b558e8dab2bcc9ef4cc6cfc3135c264c291
Merged-In: I7fef43cce3cfe17dae6a5e4f564ad8857371502a
Merged-In: Ib02988daf44dabfaef7a0b788385b7f7c655b8b2
Pavel Maltsev [Mon, 2 Apr 2018 18:10:13 +0000 (11:10 -0700)]
Actually @hide unwanted capability methods.
Cherry-pick of ag/
3943779
Bug:
77601789
Test: builds, boots
Test: make doc-comment-check-docs
Merged-In: I80a88123b16c54734306da7e5dc0670972041648
Merged-In: I923e5377a1abe761217612452cbfdba752e53de2
Jeff Sharkey [Wed, 28 Mar 2018 20:01:55 +0000 (14:01 -0600)]
API council requested tweaks to NetworkRequest.
If you put values into the Builder, you should be able to observe
those values on the built object.
Clean cherry-pick of ag/
3813257
Test: atest android.net.cts.NetworkRequestTest
Bug:
74945408
Change-Id: Ib28de279efb8b33ab46aa64f580e10fe5f8720e3
Merged-In: I0d090ebb7d57689a061badcf593ae9a37d88f7ce
Merged-In: I539184f7385c1f288cfb77be8307e4463e07e9e6
Pavel Maltsev [Thu, 22 Mar 2018 18:41:32 +0000 (11:41 -0700)]
Add OEM_PAID capability to system api
Some system apps should be able to request OEM_PAID networks. This
makes a lot of sense when Android is used as in-vehicle infotainment
systems.
Clean cherry-pick of ag/
3782591
Bug:
68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I306f060c5a386ff4b82cd99a03dc037ce60ded6a
Merged-In: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa
Merged-In: I6e9c4130db23a4f1c89ce7e9071ae519a2b0b7ec
mswest46 [Mon, 12 Mar 2018 17:34:34 +0000 (10:34 -0700)]
add airplane mode shell commands to connectivity
Clean cherry-pick of ag/
3718273
Change-Id: I302802afc952b9df7a5544b12d9015091997bd67
Fixes:
74410990
Test: Manually checked that commands enable/disable airplane mode.
Merged-In: I8787d642594e6852bff5b902e8d0fa380ce7c37f
Adam Newman [Fri, 16 Mar 2018 17:36:35 +0000 (10:36 -0700)]
Enable cleartext for captive portal apps
When a user attempts to visit a captive portal the Activity will attempt
to load http://connectivitycheck.gstatic.com/generate_204 and a
walled-garden will typically intercept this and respond with a 302
redirect to a sign-in flow.
The new default of disabling cleartext unless explicitly enabled breaks
captive portal operation. This change enables cleartext for the two
applications that contain a CaptivePortalLoginActivity.
Clean cherry-pick of ag/
3750960
Bug:
75279991
Test: Manually associated with captive portals.
Exempt-From-Owner-Approval: Already approved by owner on pi-dev.
Change-Id: Ib9ea7a8a2aa72b8305fa7044df0e369a57d33953
Merged-In: Ie38d6ce6f54336db2f4672746dc7385e0a7979fb
Merged-In: I742bf6be74a9e6953d0a779bdab0c25cf32aa740
Nan Zhang [Wed, 6 Jun 2018 08:20:55 +0000 (01:20 -0700)]
Merge "Add metalava based api-stubs modules in Android.bp" am:
f907578564
am:
25d4494793
Change-Id: I61a4f39fdef76aa49dea1b007b805cac5e55526f
Bernardo Rufino [Mon, 4 Jun 2018 10:23:00 +0000 (11:23 +0100)]
Check manifest if runtime state of app is DEFAULT
Before we were considering that the app was enabled in this case, which
might not be always true.
Bug:
80227098
Test: atest AppBackupUtilsTest
Test: Check app w/ manifest enabled="true" is backed-up, but
enabled="false" is not.
Change-Id: I4625aa39ba0de45ce6689f2375245081a5d4d722
Nicolas Geoffray [Wed, 6 Jun 2018 08:17:22 +0000 (09:17 +0100)]
Add 3 more APIs to light grey.
bug:
109746802
Test: m
Change-Id: I9b9fbed705adc59c5266378b576fc437c5078184
TreeHugger Robot [Wed, 6 Jun 2018 07:42:26 +0000 (07:42 +0000)]
Merge "Fix broken links in @see tags in framework docs."
Junyu Lai [Wed, 6 Jun 2018 06:55:07 +0000 (23:55 -0700)]
Merge "Copy clat modified linkProperties into new one." into pi-dev am:
183ec8ee35
am:
dc8059eea6
Change-Id: Id266fcd674f67e841a3a79a414ae04d80e3a2943
Junyu Lai [Wed, 6 Jun 2018 06:46:27 +0000 (23:46 -0700)]
Merge "Copy clat modified linkProperties into new one." into pi-dev
am:
183ec8ee35
Change-Id: Icbaa50cde14a3d00e151c1175d214cbf186fa74a
Junyu Lai [Wed, 6 Jun 2018 06:36:39 +0000 (06:36 +0000)]
Merge "Copy clat modified linkProperties into new one." into pi-dev
Martijn Coenen [Wed, 6 Jun 2018 05:51:58 +0000 (22:51 -0700)]
Merge "Serialize calls into BinderProxy." into pi-dev am:
051b63d4b3
am:
e374ec2355
Change-Id: I28c17f46798f95eb1072b9cd9c14560de07fd9aa
Nan Zhang [Wed, 6 Jun 2018 05:49:06 +0000 (22:49 -0700)]
Merge "Add metalava based api-stubs modules in Android.bp"
am:
f907578564
Change-Id: Id02938835849e346edb409bc77b1cb3d887ab0ff
Martijn Coenen [Wed, 6 Jun 2018 05:44:06 +0000 (22:44 -0700)]
Merge "Serialize calls into BinderProxy." into pi-dev
am:
051b63d4b3
Change-Id: I9d725b05bc4b00eec7c6421e1a3313d6730ad042
Martijn Coenen [Wed, 6 Jun 2018 05:33:14 +0000 (05:33 +0000)]
Merge "Serialize calls into BinderProxy." into pi-dev
Treehugger Robot [Wed, 6 Jun 2018 04:36:53 +0000 (04:36 +0000)]
Merge "Add metalava based api-stubs modules in Android.bp"
Erik Kline [Wed, 6 Jun 2018 04:32:26 +0000 (21:32 -0700)]
[automerger skipped] Merge "Randomize the local Wifi IPv4 address" into pi-dev am:
046bb433c7 -s ours
am:
5de5c77efb -s ours
Change-Id: I2d5a3002ec36e68b32a160006315660348b460c7
Erik Kline [Wed, 6 Jun 2018 04:23:13 +0000 (21:23 -0700)]
[automerger skipped] Merge "Randomize the local Wifi IPv4 address" into pi-dev
am:
046bb433c7 -s ours
Change-Id: I065a097c028e1ff366ffb201879b8124183dd781
TreeHugger Robot [Wed, 6 Jun 2018 04:12:31 +0000 (04:12 +0000)]
Merge "Randomize the local Wifi IPv4 address" into pi-dev
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.
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
Todd Kennedy [Wed, 6 Jun 2018 03:34:54 +0000 (20:34 -0700)]
Merge "Allow instant apps to launch instant apps" into pi-dev am:
a4155c751f
am:
e9cbe91603
Change-Id: I90bcb89fa73cd8df6e2194794812baecbe8799fb
Eugene Susla [Wed, 6 Jun 2018 03:28:33 +0000 (20:28 -0700)]
Merge "Fix DefaultPermissionGrantPolicyTest" into pi-dev am:
536cb9c426
am:
bb966bd945
Change-Id: I01f2f94adcd2c4e968cd3fb82b5dd32a06eddaf2
George Burgess IV [Wed, 6 Jun 2018 03:23:59 +0000 (20:23 -0700)]
Merge "Fix a 'memory leak'" am:
38e7338d92 am:
bc49cb8460
am:
02bf04ac01
Change-Id: I9113510f9fb0b46bf481a08009bd0c8a4080bc65
Todd Kennedy [Wed, 6 Jun 2018 03:20:03 +0000 (20:20 -0700)]
Merge "Allow instant apps to launch instant apps" into pi-dev
am:
a4155c751f
Change-Id: I42451b9d0b8e8dc788289a2dd5f75cde1b353309
Erik Kline [Tue, 29 May 2018 10:24:43 +0000 (19:24 +0900)]
Randomize the local Wifi IPv4 address
Also: address a few "error prone" warnings, adding @Override where missing
Test: as follows
- built, flashed, booted
- wifi tethering uses a randomized address, DHCPv4 and DNS works
Bug:
32163131
Bug:
70673901
Merged-In: I47d75c32ccd4bcbbb2f05637fcbae216d7e15015
Merged-In: I8f8397978a13c8b2303dfcd950700b447ea61d3c
Change-Id: Icfabc48f2cf97b362ce292747f47021e84b900da
TreeHugger Robot [Wed, 6 Jun 2018 03:09:48 +0000 (03:09 +0000)]
Merge "Allow instant apps to launch instant apps" into pi-dev
Eugene Susla [Wed, 6 Jun 2018 03:01:26 +0000 (20:01 -0700)]
Merge "Fix DefaultPermissionGrantPolicyTest" into pi-dev
am:
536cb9c426
Change-Id: I209b829cb62da4da9968eac3c5f92e52672a4b82
George Burgess IV [Wed, 6 Jun 2018 02:56:22 +0000 (19:56 -0700)]
Merge "Fix a 'memory leak'" am:
38e7338d92
am:
bc49cb8460
Change-Id: I3ecf0ecdf20bb61bda76fff547f920040ded47d6
Henry Liu [Wed, 6 Jun 2018 02:39:42 +0000 (02:39 +0000)]
Merge "Fix default browser is reset after restoring"
TreeHugger Robot [Wed, 6 Jun 2018 02:20:42 +0000 (02:20 +0000)]
Merge "Fix DefaultPermissionGrantPolicyTest" into pi-dev
George Burgess IV [Wed, 6 Jun 2018 02:17:16 +0000 (19:17 -0700)]
Merge "Fix a 'memory leak'"
am:
38e7338d92
Change-Id: Ie6670cd3f6fe1405859d75d2454ec6894f5c5913
Akinobu Nakashima [Wed, 6 Jun 2018 01:32:09 +0000 (18:32 -0700)]
Merge "Suppress AID log on adb logcat" into pi-dev am:
96e843bbcc
am:
3b09f97552
Change-Id: I72b0c0bff1dc8925c9687c1b2c39ab27e9c2d428
Atanas Kirilov [Wed, 6 Jun 2018 01:22:06 +0000 (18:22 -0700)]
[automerger skipped] Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5 am:
4f74605d11 am:
94fbd36ef8 -s ours am:
7e4faf89ec -s ours
am:
efabc7bb29 -s ours
Change-Id: Ia02c2ead33f7de57bf45bb56b5becd7dfd1cc804
Felipe Leme [Wed, 6 Jun 2018 01:09:50 +0000 (18:09 -0700)]
Merge "Log FIELD_AUTOFILL_SESSION_ID as string." into pi-dev am:
efa585d96a
am:
efc5e5a971
Change-Id: I0770d7c5e091051391529a51a8ef41cb9209d5a4
Dianne Hackborn [Wed, 6 Jun 2018 01:03:40 +0000 (18:03 -0700)]
Merge "Fix issue #
109746350: startWatchingMode fails on P" into pi-dev am:
e6fde14579
am:
ea796ab0f2
Change-Id: I7c51ca67c5e0b4418a0752768a60cabc210a6432
Akinobu Nakashima [Wed, 6 Jun 2018 01:01:23 +0000 (18:01 -0700)]
Merge "Suppress AID log on adb logcat" into pi-dev
am:
96e843bbcc
Change-Id: I7c99d56eccc07b9c3ceec7e2da05132a7d4727c5
Atanas Kirilov [Wed, 6 Jun 2018 00:54:10 +0000 (17:54 -0700)]
[automerger skipped] Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5 am:
4f74605d11 am:
94fbd36ef8 -s ours
am:
7e4faf89ec -s ours
Change-Id: Idddfb01b117e806ab49a3b4e9e128a11912cfb02
Ruchi Kandoi [Wed, 6 Jun 2018 00:52:22 +0000 (17:52 -0700)]
Merge "Merge "Suppress AID log on adb logcat" am:
e72aecb655 am:
3acdcfda75" into pi-dev-plus-aosp
am:
2a25678037
Change-Id: I38379b60afbc0c75ecd4126ab3a4ae2c2bec6093
TreeHugger Robot [Wed, 6 Jun 2018 00:44:46 +0000 (00:44 +0000)]
Merge "Suppress AID log on adb logcat" into pi-dev
Felipe Leme [Wed, 6 Jun 2018 00:42:10 +0000 (17:42 -0700)]
Merge "Log FIELD_AUTOFILL_SESSION_ID as string." into pi-dev
am:
efa585d96a
Change-Id: Iab4f5cc70bd11241b83572c243c7a66c50fd04a7
Ying Zheng [Wed, 6 Jun 2018 00:40:54 +0000 (17:40 -0700)]
Merge "Fix a calling loop for getAllUsers." into pi-dev am:
e02f32b921
am:
abb6aad8e5
Change-Id: Ic7cf84ebb2d054b73641fa98117da356d254ee67
Atanas Kirilov [Wed, 6 Jun 2018 00:39:01 +0000 (17:39 -0700)]
[automerger skipped] Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5 am:
4f74605d11
am:
94fbd36ef8 -s ours
Change-Id: I6ebb4b10741f702572574076cebe711605c01a2e
Dianne Hackborn [Wed, 6 Jun 2018 00:37:16 +0000 (17:37 -0700)]
Merge "Fix issue #
109746350: startWatchingMode fails on P" into pi-dev
am:
e6fde14579
Change-Id: Ifd929e3f72272ae0f4f451e9aa046ca49ff73ebb
Dan Sandler [Wed, 6 Jun 2018 00:35:49 +0000 (17:35 -0700)]
Merge "Delay pruning direct share targets." into pi-dev am:
22385d9d4e
am:
396330a584
Change-Id: I9fe64d0896db76b06c2dbeca706795f280b058f3
Android Build Merger (Role) [Wed, 6 Jun 2018 00:26:40 +0000 (00:26 +0000)]
Merge "Merge "Suppress AID log on adb logcat" am:
e72aecb655 am:
3acdcfda75" into pi-dev-plus-aosp
Ruchi Kandoi [Wed, 6 Jun 2018 00:26:19 +0000 (17:26 -0700)]
Merge "Suppress AID log on adb logcat" am:
e72aecb655
am:
3acdcfda75
Change-Id: I3fb09ecad76a932bbbbcb25a04b59376a629f723
Ying Zheng [Wed, 6 Jun 2018 00:25:13 +0000 (17:25 -0700)]
Merge "Fix a calling loop for getAllUsers." into pi-dev
am:
e02f32b921
Change-Id: I86015d504c1a893b8b77d41c804fac4c1ef22c5f
TreeHugger Robot [Wed, 6 Jun 2018 00:24:40 +0000 (00:24 +0000)]
Merge "Log FIELD_AUTOFILL_SESSION_ID as string." into pi-dev
Wale Ogunwale [Wed, 6 Jun 2018 00:13:55 +0000 (17:13 -0700)]
Merge "Revert "Enable WM.DEBUG_WALLPAPER_LIGHT logs"" into pi-dev am:
0b9a87c661
am:
22d951ef38
Change-Id: Id7d4317d44e6f86fbdeaf622a06ac7075d4ff014
Eugene Susla [Wed, 6 Jun 2018 00:06:02 +0000 (17:06 -0700)]
Fix DefaultPermissionGrantPolicyTest
Fixes:
109665265
Test: check afterwards that the failure no longer occurs
Change-Id: I8ddb3052fa505ea4cd0a799a9225ca7991657141
Nan Zhang [Thu, 26 Apr 2018 00:23:33 +0000 (17:23 -0700)]
Add metalava based api-stubs modules in Android.bp
Test: m clean && m metalava-api-stubs-docs
Bug: b/
78245848
Change-Id: Ie0943d306af4176d965425ec85236cd173c1e870
Todd Kennedy [Mon, 4 Jun 2018 21:26:24 +0000 (14:26 -0700)]
Allow instant apps to launch instant apps
Instant apps should be able to launch other instant apps indirectly
using a web URI or with the MATCH_EXTERNAL flag set..
Change-Id: I2566937dd5d47076701c49435365dedd8593067a
Fixes:
92742631
Test: atest CtsAppSecurityHostTestCases:EphemeralTest
Dan Sandler [Tue, 5 Jun 2018 23:55:06 +0000 (16:55 -0700)]
Merge "Delay pruning direct share targets." into pi-dev
am:
22385d9d4e
Change-Id: Ic94163018248073c54416a2196591af98e22e944
Wale Ogunwale [Tue, 5 Jun 2018 23:49:26 +0000 (16:49 -0700)]
Merge "Revert "Enable WM.DEBUG_WALLPAPER_LIGHT logs"" into pi-dev
am:
0b9a87c661
Change-Id: I84760c33a418179cf4a98d9b963af7906820d936
Treehugger Robot [Tue, 5 Jun 2018 23:29:10 +0000 (23:29 +0000)]
Merge "Fix a 'memory leak'"
Lucas Dupin [Tue, 5 Jun 2018 23:15:00 +0000 (23:15 +0000)]
Merge "Whitelist always-on setting"
Ruchi Kandoi [Tue, 5 Jun 2018 23:14:32 +0000 (16:14 -0700)]
Merge "Suppress AID log on adb logcat"
am:
e72aecb655
Change-Id: Ib2acf51fbaf4d1c23d0629a0b8538f3fdb6d313a
Dianne Hackborn [Tue, 5 Jun 2018 23:14:13 +0000 (23:14 +0000)]
Merge "Fix issue #
109746350: startWatchingMode fails on P" into pi-dev
Jake Wharton [Tue, 5 Jun 2018 16:44:36 +0000 (12:44 -0400)]
Annotate Rect/RectF with nullability annotations
And a missing override or eight.
Bug:
78245676
Test: none
Change-Id: I4476646f03f88753db358d01a6ad65a0982a160f
Ying Zheng [Tue, 5 Jun 2018 22:58:31 +0000 (22:58 +0000)]
Merge "Fix a calling loop for getAllUsers." into pi-dev
TreeHugger Robot [Tue, 5 Jun 2018 22:55:44 +0000 (22:55 +0000)]
Merge "Delay pruning direct share targets." into pi-dev
Atanas Kirilov [Tue, 5 Jun 2018 22:38:16 +0000 (15:38 -0700)]
Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5
am:
4f74605d11
Change-Id: Id25fb236775c0055f6d9d32b9c67aab5c9acf570
Wale Ogunwale [Tue, 5 Jun 2018 22:28:03 +0000 (22:28 +0000)]
Merge "Revert "Enable WM.DEBUG_WALLPAPER_LIGHT logs"" into pi-dev
Felipe Leme [Tue, 5 Jun 2018 22:14:21 +0000 (15:14 -0700)]
Log FIELD_AUTOFILL_SESSION_ID as string.
Test: adb shell logcat -b events | grep 1456 # Example:
06-05 22:20:19.760 15733 16200 I sysui_multi_action: [757,906,758,4,806,com.example.android.autofill.app,871,com.example.android.autofill.app.commoncases.StandardSignInActivity,908,com.example.android.autofill.service,1452,0,1456,
2033624394]
Fixes:
80093094
Change-Id: I784fa5549193e0bae0ed453b21d3d2c8fb01035c
OSDN Git Service
