TreeHugger Robot
8ec2ed538b
[automerger skipped] Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." into sc-v2-dev am: 50ad58a1b9 -s ours am: 2f2ef8bd46 -s ours
...
am skip reason: Merged-In If3a4bd6677ab3173c5c1a7c921ba567b7981662b with SHA-1 4ff6274fa7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16226572
Change-Id: I72a94acc658fe5b20a8d0a15637bfa62b43a44a7
2021-11-19 20:59:22 +00:00
Alex Chau
e22af04f22
Merge "Use only current density to check isTablet" into sc-v2-dev am: 1f72543ac4 am: 46ee1bfb65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306280
Change-Id: Ic07143ff7e3401dce76a24fdbb9fb22adfc15d69
2021-11-19 20:58:15 +00:00
TreeHugger Robot
2f2ef8bd46
[automerger skipped] Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." into sc-v2-dev am: 50ad58a1b9 -s ours
...
am skip reason: Merged-In If3a4bd6677ab3173c5c1a7c921ba567b7981662b with SHA-1 4ff6274fa7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16226572
Change-Id: I5577f11a50b7e98e0f198e734aeef8568c2daedd
2021-11-19 20:42:04 +00:00
Alex Chau
46ee1bfb65
Merge "Use only current density to check isTablet" into sc-v2-dev am: 1f72543ac4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306280
Change-Id: Iba1a861c1338eec285a732f8c8c3114258a6fdee
2021-11-19 20:41:00 +00:00
TreeHugger Robot
50ad58a1b9
Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." into sc-v2-dev
2021-11-19 20:34:45 +00:00
TreeHugger Robot
3e84fae4e7
Merge "Allow protected or sticky broadcsts without flags."
2021-11-19 20:27:28 +00:00
TreeHugger Robot
2d168f57ae
Merge "Unset DEBUG = true in TvPipController"
2021-11-19 20:26:28 +00:00
Alex Chau
1f72543ac4
Merge "Use only current density to check isTablet" into sc-v2-dev
2021-11-19 20:24:57 +00:00
Janis Danisevskis
ff7d24a7ea
[automerger skipped] Test for contract between AndroidKeyStoreKey hash and equals. am: 486adb9aa8 -s ours am: 4554566725 -s ours
...
am skip reason: Merged-In Ic6e60752faa986debe3d325f54242cffaa03b336 with SHA-1 5fe5f2def0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306879
Change-Id: Iea6fb350c2ac7e20529ca4780c5df914a3884ac1
2021-11-19 20:17:09 +00:00
Janis Danisevskis
b70591461c
[automerger skipped] Keystore 2.0 SPI: Fix contract between equals and hashCode am: 3a37085ede -s ours am: 0bd32bf31e -s ours
...
am skip reason: Merged-In I3f7e6d72d53c7051c13daeb5aa6ce1abf4eb0cc5 with SHA-1 7bdc12d5f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306878
Change-Id: I3701687d2f7e187451fc8744d435503cb1db5116
2021-11-19 20:16:43 +00:00
Janis Danisevskis
4554566725
[automerger skipped] Test for contract between AndroidKeyStoreKey hash and equals. am: 486adb9aa8 -s ours
...
am skip reason: Merged-In Ic6e60752faa986debe3d325f54242cffaa03b336 with SHA-1 5fe5f2def0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306879
Change-Id: I07de0c0c5bf8be3f8fcc5722d2d4f9c0ccfb8fbc
2021-11-19 19:59:08 +00:00
Janis Danisevskis
0bd32bf31e
[automerger skipped] Keystore 2.0 SPI: Fix contract between equals and hashCode am: 3a37085ede -s ours
...
am skip reason: Merged-In I3f7e6d72d53c7051c13daeb5aa6ce1abf4eb0cc5 with SHA-1 7bdc12d5f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306878
Change-Id: I18dfbe5113d59a121efa6e96b6c7d3cca8b7804f
2021-11-19 19:58:47 +00:00
Joshua Trask
be7e4f4d85
Merge "Privapp IntentResolver += PACKAGE_USAGE_STATS"
2021-11-19 19:26:40 +00:00
Vasiliy Telezhnikov
88a9efd0ec
Merge "Enable WebView overlays for Vulkan"
2021-11-19 19:08:46 +00:00
TreeHugger Robot
647c04eb4a
Merge "[pm] revert mLock changes for compat seinfo"
2021-11-19 18:43:13 +00:00
Janis Danisevskis
486adb9aa8
Test for contract between AndroidKeyStoreKey hash and equals.
...
Test: atest KeystoreTests
Bug: 196118021
Merged-In: Ic6e60752faa986debe3d325f54242cffaa03b336
Change-Id: Ic6e60752faa986debe3d325f54242cffaa03b336
2021-11-19 18:29:02 +00:00
Bryce Lee
212b44d096
Merge changes from topic "202398773"
...
* changes:
CommunalSourcePrimer Introduction.
Marshal CommunalCoordinator callbacks to main thread.
2021-11-19 18:28:20 +00:00
Janis Danisevskis
3a37085ede
Keystore 2.0 SPI: Fix contract between equals and hashCode
...
This fixes the contract between equals and hashCode in
AndroidKeystoreKey and AndroidKeystorePublicKey.
Bug: 196118021
Test: See next CL.
Merged-In: I3f7e6d72d53c7051c13daeb5aa6ce1abf4eb0cc5
Change-Id: I3f7e6d72d53c7051c13daeb5aa6ce1abf4eb0cc5
2021-11-19 18:27:02 +00:00
Hongguang Chen
d7c142e153
Merge "Fix the problem that volume 100 was showed as 10 on TV."
2021-11-19 16:40:08 +00:00
Beth Thibodeau
b5bd3acb42
Merge "Sort remote cast notifications to the end" into sc-v2-dev am: ed5ced3fdd am: 0b3359da97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16274070
Change-Id: I1013e71937c74260069294b7ebf274cfe3573097
2021-11-19 16:34:30 +00:00
Beth Thibodeau
0b3359da97
Merge "Sort remote cast notifications to the end" into sc-v2-dev am: ed5ced3fdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16274070
Change-Id: I3fa04797eb93d00922220fb9832e24408501ece3
2021-11-19 16:23:33 +00:00
Ayush Sharma
dc571656c2
Merge "Require QUERY_ALL_PACKAGES getDeviceOwnerComponent"
2021-11-19 16:13:25 +00:00
Joshua Trask
42fb76f068
Privapp IntentResolver += PACKAGE_USAGE_STATS
...
This permission is required to query AppPredictionService.
When the unbundled Chooser doesn't request this permission,
we get a SecurityException attempting to invoke
createPredictionSession(). When we request the permission
but don't add it to this allow-list, the device boot-loops.
With the permission added in both places (and some other
local changes), the unbundled Chooser is able to show the
full set of app predictions.
Test: Manual, as described above.
Bug: 206831012
Change-Id: I154d0555471f7f8820ac151b77a61cb8d9bf7603
2021-11-19 11:09:16 -05:00
TreeHugger Robot
d33ee742d8
Merge "Move interaction with vibrator HAL outside VibratorController lock"
2021-11-19 16:09:09 +00:00
Beth Thibodeau
ed5ced3fdd
Merge "Sort remote cast notifications to the end" into sc-v2-dev
2021-11-19 16:07:25 +00:00
Alex Chau
48ac598601
Use only current density to check isTablet
...
Fix: 203817448
Test: manual
Change-Id: Icc339dd7a87284af31abe70fff9ede2868f5add9
2021-11-19 15:30:03 +00:00
Lais Andrade
3b8711b331
Move interaction with vibrator HAL outside VibratorController lock
...
The vibrator HAL is getting stuck to a call to IVibrator.on, which is
done inside the VibratorController.mLock. This causes any read call,
including toString, to be blocked on the vibrator HAL.
Also introduding more debug logs to the service and thread.
Bug: 205323128
Test: manual
Change-Id: I2783bc17782c19defe04d4298a165d84751ddde9
2021-11-19 14:24:01 +00:00
Anubhav Kakkar
a1749585d3
Merge "Shift execution of Intent.ACTION_LOCALE_CHANGED broadcast to a new broadcast queue dedicated to offload foreground broadcast queue"
2021-11-19 14:01:11 +00:00
Nikolas Havrikov
451fd9a68c
Merge changes I6aaf56f0,I11641791,I92c43548,I1afed9f5,If31a2ed7, ...
...
* changes:
Remove unused method isKeyguardLocked
Move clearing current method to controller
Rename method clearing sessions appropriately
Extract hiding status bar icon
Reduce binding controller coupling to IMMS
Factor out redundant getter calls
Avoid unwarranted local variable
Move setting curId and bindTime for symmetry
Move and split removing window token
Move adding fresh window token to controller
Remove unwarranted local variable
Move binding current method into the controller
Extract binding current method logic
Extract unbinding main IME connection
Extract unbinding visible IME connection
Move connectedness booleans into controller
Split binding main and visible connection
Move binding current method to controller
Remove parameter from current input binding
Move unbinding current method logic to controller
Extract removing current window token
Extract setting current method uid
Inline getters and setters in binding controller
Move IMMS service connection to the binding controller
Add accessors for client-related members of IMMS
Change IMMS not to implement ServiceConnection
Move more encapsulated IMMS members
Encapsulate more IMMS members
Move visible connection state to ImeBindingController
Encapsulate mVisibleBound in IMMS
Encapsulate mVisibleConnection in IMMS
Move encapsulated members to binding controller
Introduce InputMethodBindingController
Avoid calculating the same time span twice
Extract isSelectedMethodBound method
Extract reusing current connection logic
Extract part of the client switch logic
Extract adding new window token in own method
Extract updating binding intent
Encapsulate IMMS members
Make members final in IMMS where appropriate
Use method references where available
Remove unused member mIsLowRam
2021-11-19 12:51:43 +00:00
Ayush Sharma
11b08fc14b
Require QUERY_ALL_PACKAGES getDeviceOwnerComponent
...
Add permission check QUERY_ALL_PACKAGES in API
getDeviceOwnerComponent.
Bug: 185896465
Test: atest DevicePolicyManagerTest#testDeviceOwnerMigration
atest DevicePolicyManagerTest#testGetDeviceOwnerAdminLocked
Change-Id: Ibd611bfe2b96227a09df81a60c6e2109851c1938
2021-11-19 12:29:55 +00:00
Prabir Pradhan
ef292d27a0
Merge "SpriteController: Reparent SurfaceControls to null before disposing"
2021-11-19 12:13:12 +00:00
Robin Lee
2fded9ac62
Unset DEBUG = true in TvPipController
...
Change-Id: I11f4b4019d13feec32c9798907bc6fa26b594eb8
Test: adb logcat | grep TvPipController
2021-11-19 11:58:15 +00:00
Yi Kong
d2a10ca132
Merge "profcollect: check hardware capability on a background thread" am: c1e9c53fc3 am: 2d2bd5fcf8 am: 55cdedff3f am: c27fcd36bc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894823
Change-Id: I66c15736396600cd296cb2c0d2d0fb4dce2dfc76
2021-11-19 10:58:09 +00:00
Yi Kong
c27fcd36bc
Merge "profcollect: check hardware capability on a background thread" am: c1e9c53fc3 am: 2d2bd5fcf8 am: 55cdedff3f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894823
Change-Id: I5c1962e2fab36269fa1cfe70725754313f215159
2021-11-19 10:46:00 +00:00
Wu Ahan
825ef9f3ac
Merge "Fix NPE while running UserSwitcherController" into sc-v2-dev am: 69cd4caaa8 am: b2f4c0a186
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16262375
Change-Id: I6c35614eb9cfac5013a856e12769df4a6f8c84f2
2021-11-19 10:40:03 +00:00
Yi Kong
55cdedff3f
Merge "profcollect: check hardware capability on a background thread" am: c1e9c53fc3 am: 2d2bd5fcf8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894823
Change-Id: I80db8be5a19d465f96ba55f35226ea8d468dac59
2021-11-19 10:35:29 +00:00
Wu Ahan
b2f4c0a186
Merge "Fix NPE while running UserSwitcherController" into sc-v2-dev am: 69cd4caaa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16262375
Change-Id: I84c96cafe2333d4adf3b735bcdc20d7f9ac56755
2021-11-19 10:22:57 +00:00
Yi Kong
2d2bd5fcf8
Merge "profcollect: check hardware capability on a background thread" am: c1e9c53fc3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894823
Change-Id: I9ed7068ff02c4314058a7a7ffb97edae3e7b5d43
2021-11-19 10:11:11 +00:00
Wu Ahan
69cd4caaa8
Merge "Fix NPE while running UserSwitcherController" into sc-v2-dev
2021-11-19 10:08:13 +00:00
TreeHugger Robot
115f6abe6f
Merge "Javadoc changes for additional DPC-settable extras" into sc-v2-dev am: 34a0dd0d91 am: 3e7d377cf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16197801
Change-Id: I945a962df2d69fe73dfcf9ed248f6748b053792d
2021-11-19 10:05:22 +00:00
Arc Wang
a8cc837ef5
[automerger skipped] Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" into sc-v2-dev am: 5fc0e28f2e -s ours am: dc4c0fbbfa -s ours
...
am skip reason: Merged-In I8bedd571a4d3385042533fe7dd5ded250894d14a with SHA-1 0d7cc7a8a6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16262368
Change-Id: Iaac68a061427ae5f67b0cccf74cd9f051c11f760
2021-11-19 10:04:39 +00:00
TreeHugger Robot
3e7d377cf7
Merge "Javadoc changes for additional DPC-settable extras" into sc-v2-dev am: 34a0dd0d91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16197801
Change-Id: I3f896a4d5988510b72b1e3b6566ccff0f85e44f6
2021-11-19 09:55:25 +00:00
Yi Kong
c1e9c53fc3
Merge "profcollect: check hardware capability on a background thread"
2021-11-19 09:54:48 +00:00
TreeHugger Robot
d708f3f010
Merge "Fix ACTION_ONE_HANDED_SETTINGS breaks CTS IntentTest"
2021-11-19 09:53:15 +00:00
Arc Wang
dc4c0fbbfa
[automerger skipped] Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" into sc-v2-dev am: 5fc0e28f2e -s ours
...
am skip reason: Merged-In I8bedd571a4d3385042533fe7dd5ded250894d14a with SHA-1 0d7cc7a8a6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16262368
Change-Id: I407fe90ce938254d382eeef18b49308d61119d4c
2021-11-19 09:52:59 +00:00
Yi Kong
da9d0e669b
profcollect: check hardware capability on a background thread
...
This is a blocking event, needs to be moved off from the main thread.
Also, don't schedule background processing service if the hardware
has no tracing support.
Test: manual
Bug: 79161490
Bug: 206986559
Change-Id: I039211b26f25ead66cf125f152e794b0c08057ee
2021-11-19 09:40:12 +00:00
TreeHugger Robot
34a0dd0d91
Merge "Javadoc changes for additional DPC-settable extras" into sc-v2-dev
2021-11-19 09:38:28 +00:00
Arc Wang
5fc0e28f2e
Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" into sc-v2-dev
2021-11-19 09:37:58 +00:00
Treehugger Robot
a1aa3f16e9
Merge "Bluetooth: make it possible to advertise Transport Discovery Data" am: e7adf14ea3 am: 4e43b68f20 am: 4e5703d57e am: 4742e2b201
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454977
Change-Id: Ib4d656dfe4bd3c946a41734162b4cd6ec3346224
2021-11-19 09:34:48 +00:00
Treehugger Robot
4742e2b201
Merge "Bluetooth: make it possible to advertise Transport Discovery Data" am: e7adf14ea3 am: 4e43b68f20 am: 4e5703d57e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454977
Change-Id: Ief6cba30fec71f08c9999475321811fdc902d832
2021-11-19 09:22:15 +00:00