Josh Tsuji
58295346d8
Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev am: 831ac87a9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047870
Change-Id: Ia5b2114578755bed05ca0d5be7c7c2d36a114968
2020-07-01 15:26:00 +00:00
Josh Tsuji
831ac87a9b
Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev
2020-07-01 15:09:30 +00:00
Glenn Kasten
644015b732
Merge "Include what you use: <cutils/bitops.h> for popcount"
2020-07-01 15:04:50 +00:00
Patrick Baumann
71e8a27bc0
Merge "Add installerSource to packageSetting earlier" into rvc-dev am: 93b7187b08 am: 3ae8ff41c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12050369
Change-Id: Id9bdbefa67779254a77c7980cb6e60139e7e9eae
2020-07-01 14:58:18 +00:00
TreeHugger Robot
65916328fc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64ab1a4fb2 -s ours am: 0c8eb66a7d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038945
Change-Id: I5124847dc123a75eb6c27e6343a86ba28b1e033e
2020-07-01 14:58:09 +00:00
Automerger Merge Worker
451e2b10e1
Merge "Merge "Add installerSource to packageSetting earlier" into rvc-dev am: 93b7187b08 am: 28648e140e" into rvc-d1-dev-plus-aosp
2020-07-01 14:58:04 +00:00
TreeHugger Robot
1a096d5c9a
Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: c73cddc46e am: 6b0b4d3a97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034162
Change-Id: I0745dda803d683529d1c2566a58d9e74515b9a76
2020-07-01 14:57:55 +00:00
Patrick Baumann
efe262fecd
Merge "Add installerSource to packageSetting earlier" into rvc-dev am: 93b7187b08 am: 28648e140e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12050369
Change-Id: I8c5b2b17ac08f16129a12a513e9efaf3ca2ac11c
2020-07-01 14:57:49 +00:00
TreeHugger Robot
14502613fe
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64ab1a4fb2 -s ours am: 68f5622b33 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038945
Change-Id: I3278656d7c2332bdf3f4e6119d5115c6b02e4005
2020-07-01 14:57:33 +00:00
Patrick Baumann
3ae8ff41c5
Merge "Add installerSource to packageSetting earlier" into rvc-dev am: 93b7187b08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12050369
Change-Id: I4dda052a1346b4af76992a8c7d59aa0fa07a8562
2020-07-01 14:57:26 +00:00
Patrick Baumann
28648e140e
Merge "Add installerSource to packageSetting earlier" into rvc-dev am: 93b7187b08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12050369
Change-Id: Ia6615355f3fa181f026656cd2a437c1c45ef06a5
2020-07-01 14:57:18 +00:00
TreeHugger Robot
4a91d42071
Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: c73cddc46e am: cdfffdd421
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034162
Change-Id: If434c0dbe57c959646e3d13bae0d5554e0c9062f
2020-07-01 14:57:17 +00:00
Patrick Baumann
93b7187b08
Merge "Add installerSource to packageSetting earlier" into rvc-dev
2020-07-01 14:53:10 +00:00
TreeHugger Robot
0c8eb66a7d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64ab1a4fb2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038945
Change-Id: Ib3d09db996b020c0fc6fd95aaa80813e50955e3d
2020-07-01 14:34:00 +00:00
TreeHugger Robot
68f5622b33
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64ab1a4fb2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038945
Change-Id: I466f66d8cb4931388f3d7dfa6b045294c5d2d769
2020-07-01 14:33:51 +00:00
TreeHugger Robot
64ab1a4fb2
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-07-01 14:32:14 +00:00
TreeHugger Robot
6b0b4d3a97
Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: c73cddc46e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034162
Change-Id: I6cc68ccd2db71c8fdd810eea356b7d773a67fb7d
2020-07-01 14:28:50 +00:00
TreeHugger Robot
cdfffdd421
Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: c73cddc46e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034162
Change-Id: Idfded15b199fc3199be2d1b9ea3c8a1f7b893e9e
2020-07-01 14:28:46 +00:00
TreeHugger Robot
bb92f610ad
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 90297740f4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12053601
Change-Id: Ie613ef30e30b52a911bd06ce7383d0835a0a926c
2020-07-01 14:23:16 +00:00
TreeHugger Robot
c73cddc46e
Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev
2020-07-01 14:13:55 +00:00
TreeHugger Robot
90297740f4
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-07-01 14:09:03 +00:00
TreeHugger Robot
4db8b93372
Merge "Register package broadcast receivers for all users." into rvc-dev am: 616f0731c5 am: ae3cd80037
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040339
Change-Id: I5da11368bdcb3ca6fb594b0528ad9ea6fbcedbfb
2020-07-01 13:25:18 +00:00
TreeHugger Robot
192ff97db3
Merge "Register package broadcast receivers for all users." into rvc-dev am: 616f0731c5 am: f44592eadb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040339
Change-Id: I9a937dd55b4b5edcfb0db769cc23bb2df9e4978f
2020-07-01 13:24:53 +00:00
TreeHugger Robot
ae3cd80037
Merge "Register package broadcast receivers for all users." into rvc-dev am: 616f0731c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040339
Change-Id: I2b83e466a7b9800eacc65299635411cbf9b789db
2020-07-01 13:11:05 +00:00
TreeHugger Robot
f44592eadb
Merge "Register package broadcast receivers for all users." into rvc-dev am: 616f0731c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040339
Change-Id: Ib4ea9f7e54a4985fe7978eb64156a3f8a795f95d
2020-07-01 13:10:48 +00:00
TreeHugger Robot
616f0731c5
Merge "Register package broadcast receivers for all users." into rvc-dev
2020-07-01 12:55:36 +00:00
Mark Chien
c20caa573b
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: f64be2d725 am: f089dd736e -s ours am: 010a53c408 -s ours
...
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 8b8e72a00d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: I746c6a4282f3ff0d32bf6db654bc3b75cfb14669
2020-07-01 10:11:30 +00:00
Mark Chien
010a53c408
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: f64be2d725 am: f089dd736e -s ours
...
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 8b8e72a00d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: I8940d70a097ca954ceec622ba42663a7fbf11c9c
2020-07-01 09:59:28 +00:00
Mark Chien
f089dd736e
Merge "Fix tethering jarjar rule for LocalLog" am: f64be2d725
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: Ia21b091951f7e5dd3f879d68414653a6c9ff8b25
2020-07-01 09:46:24 +00:00
Mark Chien
f64be2d725
Merge "Fix tethering jarjar rule for LocalLog"
2020-07-01 09:30:24 +00:00
TreeHugger Robot
943b22a1a5
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: c1017f07e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I0a6c2b29c04aa8105c8d1cf9075491d950912d29
2020-07-01 08:14:33 +00:00
TreeHugger Robot
18391c5eed
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: ac7a897a82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I72bf0a2d89f2c9818ecc4bfd7fdada389fa81f1a
2020-07-01 08:14:03 +00:00
TreeHugger Robot
c1017f07e9
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I8eec902878e34cb6a4ee7989d45cc0c7149c791c
2020-07-01 07:58:32 +00:00
TreeHugger Robot
ac7a897a82
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I9db426581ba148b3743ac04a45af9bf4ea3089e4
2020-07-01 07:58:07 +00:00
TreeHugger Robot
6127ca43d6
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev
2020-07-01 07:41:39 +00:00
Jaewan Kim
9661a45db0
Exclude MediaSession2 from the media button session
...
This prevents unexpected Session2Token change notification when
the MediaSession2 token is selected as media button session.
Bug: 160136629
Test: Run CTS
Change-Id: I68650564fbbdaf3f3e85d41f3989cc8b08c36322
2020-07-01 15:43:42 +09:00
Charles Chen
ef2e08ce44
Merge "Try to fix IndexOutBoundsException in Task#removeChild" into rvc-dev am: e938c572b7 am: 57f60c236d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836345
Change-Id: I48f7ea35f3514c2748fb9ea7a6713c2baf8e550f
2020-07-01 06:31:08 +00:00
Charles Chen
71ef79b25a
Merge "Try to fix IndexOutBoundsException in Task#removeChild" into rvc-dev am: e938c572b7 am: f6bc5e256e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836345
Change-Id: I73074f3e33fc71820012b95fe3f89b87bc486b8f
2020-07-01 06:30:43 +00:00
Charles Chen
57f60c236d
Merge "Try to fix IndexOutBoundsException in Task#removeChild" into rvc-dev am: e938c572b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836345
Change-Id: I4c170e2e1aa5bd2f4ce333a34a38835b91a4c880
2020-07-01 06:14:28 +00:00
Charles Chen
f6bc5e256e
Merge "Try to fix IndexOutBoundsException in Task#removeChild" into rvc-dev am: e938c572b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836345
Change-Id: Ie83e275e23d979805e75ca8e4fb3b5cb6208cde4
2020-07-01 06:14:11 +00:00
TreeHugger Robot
db81290280
Merge "Fixes for null WifiManager." into rvc-dev-plus-aosp am: 7e2e20538e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11336055
Change-Id: If1392627b8ba0a6051e5f5e83d8087dff57c0406
2020-07-01 06:08:38 +00:00
Kyunglyul Hyun
e44b5a2641
Add FEATURE_REMOTE_GROUP_PLAYBACK
...
Can be used to distinguish a group route from single device routes
Bug: 160113560
Test: N/A
Change-Id: Id65aded4ce396bbfaec7040fc2227b769f8c5794
2020-07-01 14:07:39 +08:00
Charles Chen
e938c572b7
Merge "Try to fix IndexOutBoundsException in Task#removeChild" into rvc-dev
2020-07-01 06:00:27 +00:00
TreeHugger Robot
7e2e20538e
Merge "Fixes for null WifiManager." into rvc-dev-plus-aosp
2020-07-01 05:54:12 +00:00
Chalard Jean
9b4373b519
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 1c108ffb25 am: f806795991 am: 23ce57f73e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: I5e7c7d0d6dd93d6b2203a9a8caa7acc38fae75e0
2020-07-01 05:47:13 +00:00
arthurhung
10b6c531e2
Fix "Allow/Deny" popup window no respond when enable pointer location
...
Currently, all buffered layers are included in input occlusion
calculations, the overlay window which can't receive input event
should also need to explicitly opt out by setting window type.
Bug: 158717144
Test: enable pointer location, launch app which would popup grant
permission dialog
Test: atest WindowInputTests
Change-Id: Ic5cc5495d38fe88ee2bee46625bf7d4d4a00a044
2020-07-01 13:36:57 +08:00
Chalard Jean
23ce57f73e
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 1c108ffb25 am: f806795991
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: Ibc8d633a6e04f7cd0f4c1a0d02ae586232cc0c6a
2020-07-01 05:33:41 +00:00
Chalard Jean
f806795991
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 1c108ffb25
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: I837da6368ab0492c5c65afba4e6cb388d526199d
2020-07-01 05:21:03 +00:00
Chalard Jean
1c108ffb25
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib...""
2020-07-01 05:12:40 +00:00
Beth Thibodeau
99a275ead6
Merge "Filter media controls by user" into rvc-dev am: c781b2e4b0 am: bd9761b1a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037671
Change-Id: Ibed4f47c55f3251052fe85170d9a633e35ffeb55
2020-07-01 04:33:20 +00:00