TreeHugger Robot
0781091e34
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 53c12d0ac9 -s ours am: 212e2d5687 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16984273
Change-Id: Ibe43c57fb5dc6a5f1d9ac2ee60cb7b28ea3bddd7
2022-02-25 19:03:19 +00:00
Bill Yi
77b0773ed2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90759a397c -s ours am: 75ef7f359c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16984273
Change-Id: I7f7178a1c6f9474637fef6ed46c54dc710dc30c1
2022-02-25 19:03:00 +00:00
Automerger Merge Worker
2ed3177121
Merge changes from topic "am-566d6ff6b93c4b6a964e0d6bedc96292"
...
* changes:
Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp am: 3079759c9a am: 8f6baf51ff am: 154d402e2e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 06353761e6 am: cba75616c7 -s ours am: 7a8bb04766 -s ours am: 3523790e56 -s ours
2022-02-25 19:02:25 +00:00
Automerger Merge Worker
8a7d902cf2
Merge changes from topic "am-712f677e217f4d428b70d08e23d554a5"
...
* changes:
Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp am: 3079759c9a am: 8f6baf51ff
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 06353761e6 am: cba75616c7 -s ours am: 7a8bb04766 -s ours
2022-02-25 19:02:21 +00:00
TreeHugger Robot
0376edc6b6
Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp am: 3079759c9a am: 8f6baf51ff am: 154d402e2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16985361
Change-Id: Ic1fe4a2437e04a06960c04c5991ddcebdcc0c848
2022-02-25 19:01:59 +00:00
TreeHugger Robot
eb7f1508aa
Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp am: 3079759c9a am: 8f6baf51ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16985361
Change-Id: If6845908200b2af70e6925ec5c7aa0a1dfca315a
2022-02-25 19:01:47 +00:00
Bill Yi
ea2c75ea6a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 06353761e6 am: cba75616c7 -s ours am: 7a8bb04766 -s ours am: 3523790e56 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16985361
Change-Id: I2ddc08b5893d4f2b0bbd6eda5fafc3499c71fcb6
2022-02-25 19:01:42 +00:00
Bill Yi
43ab86498a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 06353761e6 am: cba75616c7 -s ours am: 7a8bb04766 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16985361
Change-Id: Ia56db4648a4abbcf6a3187db0b681043eaa6c3d3
2022-02-25 19:01:18 +00:00
Automerger Merge Worker
d589ada587
Merge "Merge "Use getExactRotation for UPSIDE_DOWN rotation" into tm-dev am: 9b4c7a9f57 am: 678ff35813"
2022-02-25 19:01:17 +00:00
TreeHugger Robot
14522ac18d
Merge "Use getExactRotation for UPSIDE_DOWN rotation" into tm-dev am: 9b4c7a9f57 am: 678ff35813
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988923
Change-Id: I5f8ac2a34ef007b256a244b6270885791117efd2
2022-02-25 19:00:51 +00:00
TreeHugger Robot
354d854da9
Merge "Use getExactRotation for UPSIDE_DOWN rotation" into tm-dev am: 9b4c7a9f57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988923
Change-Id: I6d6f59aa2c830d18d4ae5c40bec6c32318834bc2
2022-02-25 19:00:19 +00:00
Bill Yi
a1671533e4
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-02-25 18:52:56 +00:00
Nate Myren
66022d5680
Merge "Add permissions team to sensorprivacy.proto OWNERS"
2022-02-25 16:56:09 +00:00
Andy Hung
52fcf95576
Merge "Use device set for getDevicesForStream"
2022-02-25 16:44:57 +00:00
Robert Horvath
07761ee59e
Merge "Set DreamsActivateOnSleepSetting and handle Sandman in tests"
2022-02-25 15:56:59 +00:00
Ruslan Tkhakokhov
f939386334
Merge "Skip restore of read-only directories"
2022-02-25 13:38:02 +00:00
TreeHugger Robot
416a7b83ee
Merge "Add Ayush and Elis to OWNERS"
2022-02-25 12:21:49 +00:00
Shashwat Razdan
152168a5b9
Merge "Fixing index issue in AbstractMasterSystemService"
2022-02-25 07:19:07 +00:00
Nikolas Havrikov
3a1df35b29
Merge "Replace LinkedList by a more performant collection"
2022-02-25 07:18:58 +00:00
Nikolas Havrikov
93ca67e74f
Merge "Replace LinkedList by a more performant collection"
2022-02-25 07:16:09 +00:00
Shashwat Razdan
db737653fc
Fixing index issue in AbstractMasterSystemService
...
Bug: 221368794
Test: CTS tests
Change-Id: I2e1e0295a3b02c6a79a5637492cf16f232afc947
2022-02-24 23:11:52 -08:00
Yinglei Wang
bb8f7f2f7b
Merge "handle dynamically set AccessibilityServiceInfo.FLAG_INPUT_METHOD_EDITOR"
2022-02-25 06:00:26 +00:00
TreeHugger Robot
97f524ebba
Merge "Add resetUsbPort in svc usb command"
2022-02-25 05:14:50 +00:00
Kathy Chen
4607806a5e
Merge "Address API review feedback for AmbientContext. Add shell method for more test coverage. Do not unregister request from the same client and delegate to AiAi to handle it."
2022-02-25 04:12:13 +00:00
Shashwat Razdan
988a1d7945
Merge "Adding multiple provider support in AbstractMasterSystemService"
2022-02-25 03:46:59 +00:00
Shaowei Shen
1a0bacc6b0
Merge "[Output Switcher] Upadte text string"
2022-02-25 03:33:47 +00:00
Shaowei Shen
fc64a7dcb1
Merge "[Output Switcher] Fix recyclerview flickering"
2022-02-25 03:15:11 +00:00
Ricky Niu
519062eabd
Add resetUsbPort in svc usb command
...
Implement resetUsbPort to support manual testing on
real device to verify feature functionality from App layer
and VTS test.
Bug: 216387845
Test: Manual test with "svc usb reset UsbPort" correctly
Signed-off-by: Ricky Niu <rickyniu@google.com >
Change-Id: Ieb29de3dd398859607490548a1f3a16f8359ae8f
2022-02-25 11:14:59 +08:00
TreeHugger Robot
65d7ab9df4
Merge "Replace LinkedList by a more performant collection"
2022-02-25 02:02:21 +00:00
Ruslan Tkhakokhov
62c0cec8eb
Skip restore of read-only directories
...
Currently trying to restore a read-only directory results in only the
directory being restored but not its contents. This causes problems for
some apps (see the associated bug). Skip restore of read-only directories
while we evaluate the priority of proper suport for this use case.
Bug: 194894879
Test: Manual:
1. Populate a read-only directory in an app's folder
(/data/user/0/<package-name>)
2. Run backup for the app
3. Clear app data (adb shell pm clear <package-name>
4. Run restore for the app
5. Inspect app folder to ensure all writable content is
restored.
Change-Id: I644a5784fb42352ba28ac944d3aa3564b0215a78
2022-02-25 01:14:17 +00:00
TreeHugger Robot
77d467429e
Merge "Replace LinkedList by a more performant collection"
2022-02-25 01:08:26 +00:00
TreeHugger Robot
0eaa57c5fa
Merge "Allow apps with MANAGE_USB_STATE permission access to all USB accessories."
2022-02-25 01:03:45 +00:00
Nate Myren
0f412f7570
Add permissions team to sensorprivacy.proto OWNERS
...
Bug: 215301946
Change-Id: I7e01ed68ddeb7ce9aa062192526607c8d6e66e24
Test: build
2022-02-25 00:57:39 +00:00
Oscar Azucena
4577d5ad77
Merge "Fixed API review comments on primitive types on assistant APIs"
2022-02-24 22:19:13 +00:00
Aaron Liu
59569f78af
Merge "User Switcher: Fix corner case for large names" into tm-dev am: d28f0a8547 am: 56f6f2d3ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988753
Change-Id: Id55dfbb3de90a45edd49069458b46f8998bba86f
2022-02-24 22:06:34 +00:00
TreeHugger Robot
b5cfd00295
Merge "Remove the current input focused window when ANR" into tm-dev am: d0dfaa7c45 am: 2d82160ae9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16970763
Change-Id: I4f50b8a3ad563f6bdfd0d3a4a2f36e526636eb86
2022-02-24 22:05:56 +00:00
TreeHugger Robot
e27e4f1da8
Merge "Fix bug in checking getLastLocation identities" into tm-dev am: 05b801bd46 am: 924ccf9dfe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16997763
Change-Id: I77dbe0c85a3c41afec6cb94d40297373b8799adf
2022-02-24 22:05:27 +00:00
Matt Pietal
c1a076cc80
Merge "User switcher - Create user dialog fixes" into tm-dev am: 9667c0817d am: 8135710c84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16985647
Change-Id: Ia58cc55cb72291098e02e22c691c4166109189d2
2022-02-24 22:04:36 +00:00
TreeHugger Robot
ff814d6ca9
Merge changes from topic "cherrypick-fix-anr-input-6mcjse09o2" into tm-mainline-prod am: eaacd90226
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16970763
Change-Id: I3c3234b0dfe8b973c1820b3d6901b3d530cdb142
2022-02-24 22:03:06 +00:00
Shashwat Razdan
ea77f04ade
Adding multiple provider support in AbstractMasterSystemService
...
Bug: 216509090
Test: CTS tests, tested on physical device
Change-Id: I1da7f54bc8aaba15980aa90babaddc0b699c64e7
2022-02-24 13:51:00 -08:00
TreeHugger Robot
cf7c5eef65
Merge "Fix includes of SkRRect and other Skia headers"
2022-02-24 21:27:15 +00:00
Kathy Chen
542fc25dff
Address API review feedback for AmbientContext. Add shell method for more test coverage. Do not unregister request from the same client and delegate to AiAi to handle it.
...
Test: CTS test
Bug: 219740201
Change-Id: I8fa9df9cab9965d84d301760f4f7fba08dc44f54
2022-02-24 21:10:04 +00:00
Andy Hung
a6d046b07c
Merge "AudioService: update getDevicesForAttributes"
2022-02-24 21:05:47 +00:00
Eric Biggers
106d59a32d
Merge changes from topic "remove-fde"
...
* changes:
Remove unused FDE methods from StorageManager
Stub out some FDE methods in StorageManager
Stop trying to update FDE password from LockSettingsService
Remove clearEncryptionPassword() from LockPatternUtils
Stop trying to get/set fields in FDE footer
Stop checking FDE password cache
Remove checks for FDE in 'adb backup'
2022-02-24 21:01:50 +00:00
Nate Myren
081fef3d5e
Merge "Automatically show Safety Tile" into tm-dev am: 2606f9c4ed am: 04be0f16a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16981753
Change-Id: Id0ca8284a412a8c954957ae0e6c09445dec7ffb6
2022-02-24 19:57:02 +00:00
Kholoud Mohamed
a6f571b2a7
Merge "Change Callable to Supplier in the dpm resource apis" into tm-dev am: 7e76fddc52 am: ee6ccadc8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988746
Change-Id: Ie3edf275c59976ef7d6290b57bfa9b96d599f7ca
2022-02-24 19:56:18 +00:00
TreeHugger Robot
3d3ba7c403
[automerger skipped] Merge "Adding a timeout for active-unlock" into tm-dev am: 4207fcf360 am: fae22f0bba -s ours
...
am skip reason: Merged-In Ia0ccf7ecc9dacf9f4a7a913c7fce8532e6a1ece1 with SHA-1 57e6944277 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16981650
Change-Id: I37ca2f3429802a23414963fcf829b293bf754c65
2022-02-24 19:55:06 +00:00
TreeHugger Robot
caec4a84bb
Merge "Add traces to aid onScreenTurnedOn latency debugging" into tm-dev am: b63a699489 am: c13477b139
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002644
Change-Id: I8f0775c82b4d2d28d93c7fccbc1bb00b2ed1f017
2022-02-24 19:54:15 +00:00
TreeHugger Robot
1a183ebc65
Merge "DM: use the right terminology for divisor" into tm-dev am: 7baf6d7ce8 am: ebbbcb254c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16989012
Change-Id: I954ed80e7bcd8d00be300b7430f071c72fa07fe6
2022-02-24 19:53:42 +00:00
Kholoud Mohamed
a339637da5
Merge "rename callingPackageResourceId to resourceIdInCallingPackage" into tm-dev am: 8084c8c036 am: 8b4cd4b86a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16976028
Change-Id: Ie555aa612949e3635010dacb5284bc152cc2ea6f
2022-02-24 19:52:54 +00:00