Songchun Fan
8a482a1bca
Merge "[pm] ignore old value of abiOverride in pkgSetting when installing"
2020-08-13 22:44:33 +00:00
Florian Mayer
f5375c52ea
[automerger skipped] Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: e0d071525b am: 6fc6a67ec3 am: 9841667f52 -s ours
...
am skip reason: Change-Id I9c1737647d762f478c0e452e5b72f98ec3d43c28 with SHA-1 6e1b4a4202 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: I80c7a95e3ba8e371861292da262ec8319d1e5715
2020-08-13 22:29:49 +00:00
Florian Mayer
d20898d7ce
[automerger skipped] Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: ba354cf97c am: ddb152733c am: 25f54f1d77 -s ours
...
am skip reason: Change-Id I9c1737647d762f478c0e452e5b72f98ec3d43c28 with SHA-1 6e1b4a4202 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: I0b08889ffb5fad2a92c58855a2f6474428abc475
2020-08-13 22:29:30 +00:00
Florian Mayer
9841667f52
Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: e0d071525b am: 6fc6a67ec3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: I6f6e82e125c71777c127b532ffbbb63696b0afa7
2020-08-13 22:29:23 +00:00
Florian Mayer
b5c1c243b7
[automerger skipped] Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: ba354cf97c am: 4d56d309b0 am: 772110eb6f -s ours
...
am skip reason: Change-Id I9c1737647d762f478c0e452e5b72f98ec3d43c28 with SHA-1 6e1b4a4202 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: I2b76a13149a6ae819d6025ed3df56dd5b116df32
2020-08-13 22:29:11 +00:00
TreeHugger Robot
37f33f4aa8
Merge "Dismiss bubbles if shouldBubbleUp returns false (e.g. DND is enabled and configured to hide that bubble)." into rvc-qpr-dev am: 1944361150 am: 052f3861ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12371908
Change-Id: I80b2628005e02f381c2ff8b8055f1d6b91d39e46
2020-08-13 22:28:29 +00:00
Florian Mayer
25f54f1d77
Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: ba354cf97c am: ddb152733c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: I59bdb8e449dd994d9b742a52ad512424abe195c7
2020-08-13 22:28:12 +00:00
Alex Johnston
ae5e71786e
Merge "Add precondition checks"
2020-08-13 22:21:27 +00:00
Florian Mayer
6fc6a67ec3
Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: e0d071525b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: If18870b493379666879316947b2f1664c1a4845f
2020-08-13 22:05:36 +00:00
Florian Mayer
772110eb6f
Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: ba354cf97c am: 4d56d309b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: Ie50492995c3f189706dc08c4f37c2f1616408268
2020-08-13 22:04:58 +00:00
TreeHugger Robot
052f3861ef
Merge "Dismiss bubbles if shouldBubbleUp returns false (e.g. DND is enabled and configured to hide that bubble)." into rvc-qpr-dev am: 1944361150
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12371908
Change-Id: Ie0bdec628a191735d992bce3a6948cb4cb9cef7f
2020-08-13 22:04:34 +00:00
Florian Mayer
ddb152733c
Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: ba354cf97c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: I1b32adc87fbf770997fd6e10d44f8dce11b3e512
2020-08-13 22:03:42 +00:00
Florian Mayer
4d56d309b0
Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: ba354cf97c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: I6e90354a0b2b74639e1fe80f391c69e9b7756b15
2020-08-13 22:03:38 +00:00
Songchun Fan
1476c298d5
[pm] ignore old value of abiOverride in pkgSetting when installing
...
This reverts a change introduced in ag/10220453, and the correct behavior here should be to use the abiOverride value passed from args.
Test: manual (will add CTS tests)
BUG: 163888243
BUG: 162298405
Change-Id: I93c85b5b8fe94726e450dc467f2cd5aecaa376f9
2020-08-13 21:51:30 +00:00
TreeHugger Robot
1944361150
Merge "Dismiss bubbles if shouldBubbleUp returns false (e.g. DND is enabled and configured to hide that bubble)." into rvc-qpr-dev
2020-08-13 21:50:06 +00:00
Florian Mayer
e0d071525b
Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: I7ee33c05511b22c1a3f22fb5864b7d1ffd38098e
2020-08-13 21:43:47 +00:00
Florian Mayer
ba354cf97c
Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627
Change-Id: I58105c1a21eb5c6468e0c08a1237fbf0c84633f9
2020-08-13 21:43:37 +00:00
TreeHugger Robot
7fc13e85b4
Merge "Launch intents from notifications from main thread"
2020-08-13 21:35:08 +00:00
Sudheer Shanka
e68dedb5e0
[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours am: a47e1f9a24 -s ours am: ee63631f2f -s ours am: b018ff78b1 -s ours
...
am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1394342
Change-Id: I0d4ebd00643e3de6f39b36ba3d8c826ce0dbb914
2020-08-13 21:11:52 +00:00
Ned Burns
e72ac94865
Merge "Revamp view manager logic to support any kind of view"
2020-08-13 21:05:47 +00:00
Florian Mayer
406dd94dd5
Merge "Do not leak dump objects." into rvc-dev
2020-08-13 21:02:33 +00:00
Sudheer Shanka
b018ff78b1
[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours am: a47e1f9a24 -s ours am: ee63631f2f -s ours
...
am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1394342
Change-Id: I3c44412644af1a0bbe2783a75a86d19ca4763f59
2020-08-13 20:48:10 +00:00
Sudheer Shanka
ee63631f2f
[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours am: a47e1f9a24 -s ours
...
am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1394342
Change-Id: Ie4182d1002133522f7f08bfe1da1b33070bbcd0c
2020-08-13 20:33:45 +00:00
TreeHugger Robot
3bec8f1a14
Merge "Reduce ServiceWatcher thrashing"
2020-08-13 20:17:46 +00:00
Sudheer Shanka
a47e1f9a24
[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours
...
am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1394342
Change-Id: I47ccfab7dd61ebd29360ed5bf012942f2547c0d0
2020-08-13 20:17:25 +00:00
Jeff DeCew
5af3df5d26
Merge changes from topic "b162233630_uri_permissions"
...
* changes:
Revoke Uri access after a NotificationListener is removed.
Grant URI permissions to NotificationListenerServices when added.
2020-08-13 20:03:40 +00:00
Sudheer Shanka
7f45a6fcc0
Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1394342
Change-Id: I234af0318651866983f9089e50e1edcd3e99b547
2020-08-13 20:00:49 +00:00
Sudheer Shanka
ddd3077555
Merge "Move logic for handling uid observers outside AMS."
2020-08-13 19:51:26 +00:00
Sudheer Shanka
bdfb45d841
Merge "Update language to comply with Android’s inclusive language guidance."
2020-08-13 19:46:49 +00:00
Grace Jia
1c997e4ead
Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de am: 6a55cd1644 am: 300b3cce72 am: f98b0c5eb1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908
Change-Id: I3fc6ba1492996d41530461452e83759a490adc6d
2020-08-13 19:30:59 +00:00
Hai Shalom
a9b79ba27a
[automerger skipped] Merge "[Passpoint] Changes to Unique ID" into rvc-qpr-dev am: c6cf6ba1ab am: 1955b7d33b -s ours
...
am skip reason: Change-Id Ice11158078b5b86c721747b0d67ecfb09731a3c5 with SHA-1 c9e233df34 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12364462
Change-Id: Ief90571030046f34cd5e84f64f74a350c556ea7b
2020-08-13 19:30:10 +00:00
Grace Jia
f98b0c5eb1
Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de am: 6a55cd1644 am: 300b3cce72
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908
Change-Id: I26980870eb16299663f7553314d1f68ee90067f0
2020-08-13 19:22:10 +00:00
Hai Shalom
1955b7d33b
Merge "[Passpoint] Changes to Unique ID" into rvc-qpr-dev am: c6cf6ba1ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12364462
Change-Id: I6c4faa008c4926d5f5668d23a36686d66daaa9b1
2020-08-13 19:15:59 +00:00
Beverly
6d9f593863
Launch intents from notifications from main thread
...
Test: manual (turn on new pipeline rendering, tap on notif)
Change-Id: Iefcb1420d8363bdbc5eefe5064a54899e7045d69
2020-08-13 19:09:48 +00:00
Grace Jia
300b3cce72
Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de am: 6a55cd1644
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908
Change-Id: Ifc88640d6fb38e14a58ad802f520b0c0ee0b35b8
2020-08-13 19:06:43 +00:00
Hai Shalom
c6cf6ba1ab
Merge "[Passpoint] Changes to Unique ID" into rvc-qpr-dev
2020-08-13 19:00:06 +00:00
Grace Jia
6a55cd1644
Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908
Change-Id: I49034d851b111792fa54b3d2f236d56513bb00f9
2020-08-13 18:46:06 +00:00
Grace Jia
e40cfa60de
Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908
Change-Id: I051c16bcaca7f30db5c62772a3d3f39c23f18304
2020-08-13 18:21:29 +00:00
Grace Jia
329c6ff777
Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService."
2020-08-13 18:06:19 +00:00
Josh Tsuji
d240baf682
Dismiss bubbles if shouldBubbleUp returns false (e.g. DND is enabled and configured to hide that bubble).
...
Bug: 159413312
Test: post a bubble, enable dnd, bubble goes away, disable DND, bubble is back!
Test: change DND settings from 'no sound' to 'no visual', bubble remains if 'no sound' is selected
Test: dismiss bubble, enable DND, disable DND, observe bubble does not re-appear since it was manually disabled
Change-Id: I8cb4b62d2cf272e9ac46f4088112a6dad381d40c
(cherry picked from commit 160d1eb4ac )
2020-08-13 18:02:29 +00:00
TreeHugger Robot
f2c039bb19
Merge "Register ChildLocationsChangedListener on NSSL"
2020-08-13 17:52:18 +00:00
Amy Zhang
7a75ae88dc
Merge "Use a randomly generated UUID as the TvInputSessionId"
2020-08-13 17:42:25 +00:00
Ilya Matyukhin
6fbee883eb
Merge changes I4a87c587,If43c21bd
...
* changes:
Implement brightness-aware scrim
Clean up UdfpsController intitialization logic
2020-08-13 17:37:07 +00:00
TreeHugger Robot
177492451c
[automerger skipped] Merge "SystemUI: Reset PUK StateMachine after PUK is unlocked" into rvc-qpr-dev am: 4862909516 am: e80a1e2239 -s ours
...
am skip reason: Change-Id I0261d8be913a878e65c5240d4d39b248c2e3a5d5 with SHA-1 8e9417e873 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12360817
Change-Id: Ifc98898d67a9519b5b1134fc4ed39ebfdb69ab84
2020-08-13 17:23:33 +00:00
Brad Ebinger
f3b26353c0
Merge "Remove IMS call logs that may leak PII" into rvc-qpr-dev am: e000df714d am: bbd2d67e87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12366057
Change-Id: I06c580266cb550367b85ed07c3d48152af8543c4
2020-08-13 17:21:56 +00:00
TreeHugger Robot
e80a1e2239
Merge "SystemUI: Reset PUK StateMachine after PUK is unlocked" into rvc-qpr-dev am: 4862909516
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12360817
Change-Id: I0d50b525ec3cee381dee89f4cd15f17d53129a4d
2020-08-13 17:06:04 +00:00
Brad Ebinger
bbd2d67e87
Merge "Remove IMS call logs that may leak PII" into rvc-qpr-dev am: e000df714d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12366057
Change-Id: I04c9f9cbf81ec87cea268bd2c6eb6af7254ec25f
2020-08-13 17:05:33 +00:00
Beth Thibodeau
9e4876983e
Merge "Allow user to block individual apps from resuming"
2020-08-13 17:00:45 +00:00
TreeHugger Robot
4862909516
Merge "SystemUI: Reset PUK StateMachine after PUK is unlocked" into rvc-qpr-dev
2020-08-13 16:59:21 +00:00
Brad Ebinger
e000df714d
Merge "Remove IMS call logs that may leak PII" into rvc-qpr-dev
2020-08-13 16:51:17 +00:00