Jing Ji
5edec9d67e
Merge "Consolidate the bg exemption state changes from the pkgs with same UID" into tm-dev
2022-03-18 18:58:44 +00:00
Weng Su
a608128250
Merge "Restrict WiFi network connection (Internet Panel)" into tm-dev
2022-03-18 18:35:16 +00:00
Gaurav Bhola
b99eca0d67
Merge "Make nav bar affected by IME insets" into tm-dev
2022-03-18 18:30:52 +00:00
TreeHugger Robot
c7af3f3088
Merge "Remove DisplayHashingService constructor" into tm-dev
2022-03-18 18:21:11 +00:00
Ray Essick
5bb3da076d
Merge "Define MediaFormat crop-related constants" into tm-dev
2022-03-18 18:02:08 +00:00
TreeHugger Robot
5462556c37
Merge changes from topics "presubmit-am-c4b3e098a67f4aae8d09beafad040d77", "presubmit-am-c919318fbc2d413296f77381098694db" into tm-dev
...
* changes:
Guest icon color
Fix logcat view layout warnings
2022-03-18 17:58:03 +00:00
Joe Bolinger
afde3e325a
Merge "Invoke lifecycle callbacks while waiting for cookies." into tm-dev
2022-03-18 17:54:39 +00:00
Yinglei Wang
da6d14b9e9
Merge "resolve possible Imf lock and a11y mLock deadlock" into tm-dev
2022-03-18 17:54:30 +00:00
TreeHugger Robot
da78c9e278
Merge "Remove isAnimating check in assignRelativeLayerForIme" into tm-dev
2022-03-18 17:52:55 +00:00
Songchun Fan
313009c2df
Merge "[pm] restrict max number of components at parsing" into tm-dev
2022-03-18 17:52:40 +00:00
Jonathan Scott
9bc9a8bdd1
Merge "Add setProfileOwnerOnOrganizationOwnedDevice COPE API." into tm-dev
2022-03-18 17:50:42 +00:00
TreeHugger Robot
36a37259e0
[automerger skipped] Merge "SystemUI: res array for statusbar blocked icons" into sc-v2-dev-plus-aosp am: 30410deeaf -s ours
...
am skip reason: Merged-In I9a04a67a9c0914989d34c8c53ceee97788e7ba6c with SHA-1 1ae9c8d8dd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17256543
Change-Id: I0f52af40a08773140cbcd8788ce69081abb394f8
2022-03-18 17:49:43 +00:00
Timi Rautamäki
ad22d029af
[automerger skipped] SystemUI: res array for statusbar blocked icons am: d62853c979 -s ours
...
am skip reason: Merged-In I9a04a67a9c0914989d34c8c53ceee97788e7ba6c with SHA-1 1ae9c8d8dd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17256543
Change-Id: I034819f46155667a37df12f16c8292890e0ed5c0
2022-03-18 17:49:33 +00:00
Sergey Nikolaienkov
c20e008284
Merge "Clean up mayAssociateWithoutPrompt()" into tm-dev
2022-03-18 17:47:26 +00:00
Sergey Nikolaienkov
2d3584caeb
Merge "Fix NPE in CompanionDeviceServiceConnector" into tm-dev
2022-03-18 17:45:43 +00:00
Sudheer Shanka
0de55a3459
Merge "Add a hidden API to query appstandby constants." into tm-dev
2022-03-18 17:43:26 +00:00
Nikita Dubrovsky
06ddc1fcc8
Merge "Update READ_CLIPBOARD_IN_BACKGROUND to be grantable via roles" into tm-dev
2022-03-18 17:34:14 +00:00
TreeHugger Robot
30410deeaf
Merge "SystemUI: res array for statusbar blocked icons" into sc-v2-dev-plus-aosp
2022-03-18 17:31:07 +00:00
TreeHugger Robot
dbfe88eed4
Merge "Fix the Settings crash when resetting network" into tm-dev
2022-03-18 17:30:44 +00:00
David Anderson
652c4bade6
Merge "Add PackageManager feature strings for EROFS." into tm-dev
2022-03-18 17:29:26 +00:00
TreeHugger Robot
64aa33f8b8
Merge "SystemUI: res array for statusbar blocked icons" into tm-dev
2022-03-18 17:19:33 +00:00
TreeHugger Robot
34fba3edc7
Merge "Send SDK sandbox UID instead of app UID in battery stats push metrics" into tm-dev
2022-03-18 17:04:25 +00:00
TreeHugger Robot
1b58550351
Merge changes from topics "presubmit-am-859dd3744ae243f9a8cb2f6234a9ef1e", "register_api" into tm-dev
...
* changes:
Change parameter order to make it SAM compatible
Fix a problem that Dialog does not close in new dispatch.
2022-03-18 17:04:05 +00:00
Joe Bolinger
a90ee32654
Merge "Update documentation for EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY." into tm-dev
2022-03-18 17:01:35 +00:00
Oliver Woodman
f48450217c
Merge "Hide new route discovery preferences in T" into tm-dev
2022-03-18 16:55:14 +00:00
TreeHugger Robot
12404db03b
Merge "Update hotword detection metrics." into tm-dev
2022-03-18 16:52:02 +00:00
TreeHugger Robot
ff5b1369dd
Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" into tm-dev
2022-03-18 16:43:43 +00:00
Pinyao Ting
7f35502d83
Merge "Update capability related api in Shortcut" into tm-dev
2022-03-18 16:39:51 +00:00
TreeHugger Robot
11d05992e7
Merge "Fix NotificationStack size calculation" into tm-dev
2022-03-18 16:31:33 +00:00
TreeHugger Robot
7940baa703
Merge "Fix bug where GameService#onDisconnected isn't called" into tm-dev
2022-03-18 16:08:46 +00:00
Kholoud Mohamed
3d31e0b93b
Merge changes from topic "resetAPIs" into tm-dev
...
* changes:
RESTRICT AUTOMERGE add requiresAPI annotation for DPM#getString
RESTRICT AUTOMERGE Expose getString APIs as public
2022-03-18 16:07:22 +00:00
Raymond Tiong
6bdc667d3b
Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder." am: 23398e75a3 am: 2f04f34eb3 am: d44a439edf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025024
Change-Id: I75901c3f89cbad5a4279d54a868947cf84a7446e
2022-03-18 16:04:04 +00:00
Raymond Tiong
d44a439edf
Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder." am: 23398e75a3 am: 2f04f34eb3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025024
Change-Id: I442624d1391a7f45d2508145cd9c32c42605f445
2022-03-18 15:50:23 +00:00
TreeHugger Robot
ad2aa52507
Merge "expand test API for DSP kephrase trigger" into tm-dev
2022-03-18 15:46:05 +00:00
Raymond Tiong
2f04f34eb3
Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder." am: 23398e75a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025024
Change-Id: I3d560d996fba6d50f55959797b20c4a8a0599fb0
2022-03-18 15:30:54 +00:00
Shubang Lu
bc3aaf19ba
Merge "TIAF API review: multiple components" into tm-dev
2022-03-18 15:27:27 +00:00
Raymond Tiong
23398e75a3
Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder."
2022-03-18 15:13:06 +00:00
Jonathan Scott
95826d61fb
Merge "Add finalizeWorkProfileProvisioning." into tm-dev
2022-03-18 14:50:07 +00:00
Pratyush More
7da1954f69
Merge "Move LocaleManagerTests to postsubmit suite." into tm-dev
2022-03-18 14:48:43 +00:00
Jiakai Zhang
f2984242fb
Merge "Use speed-profile with the cloud profile for apks loaded by other apps." into tm-dev
2022-03-18 14:45:37 +00:00
TreeHugger Robot
7c7f54ec01
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 739e6935dc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17221588
Change-Id: I56e46cde0f384a1c7a3cbbd448b190a9933a998e
2022-03-18 14:44:57 +00:00
TreeHugger Robot
16bdec814c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 25689aa15c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17222387
Change-Id: Ib0d444df731927091991bc67812b4b1a0d6fc95b
2022-03-18 14:44:13 +00:00
Antoan Angelov
b7b3316789
Merge "Add extra to inform the role holder of the update attempt result" into tm-dev
2022-03-18 14:29:48 +00:00
TreeHugger Robot
739e6935dc
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-03-18 14:29:09 +00:00
TreeHugger Robot
b9dde3b08c
Merge changes from topic "presubmit-am-41aad955e1764b2ebacc14f02041d841" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3989d0403c
Import translations. DO NOT MERGE ANYWHERE
2022-03-18 14:29:09 +00:00
TreeHugger Robot
25689aa15c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-03-18 14:29:02 +00:00
TreeHugger Robot
c6b7a1b816
Merge changes from topic "presubmit-am-9b906fb0c78f4fc1a24e6a750c849577" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dd489e6d0e
Import translations. DO NOT MERGE ANYWHERE
2022-03-18 14:29:02 +00:00
Corina Grigoras
2907ec82ab
Merge "Move UiEventLogger interface to modules-utils." into tm-dev
2022-03-18 14:19:43 +00:00
Sergey Nikolaienkov
6253682e66
Fix NPE in CompanionDeviceServiceConnector
...
Null-check mListener CompanionDeviceServiceConnector.onBindingDied()
before invoking mListener.onBindingDied().
Bug: 225202799
Test: force-stop test companion app that declares multiple &
CompanionDeviceServices while it "self-reports" companion device &
as present.
Change-Id: I1ab3cc6d3d8c4f27997012e08b04e28475c9cfe0
2022-03-18 14:48:09 +01:00
Timi Rautamäki
d62853c979
SystemUI: res array for statusbar blocked icons
...
Create an array in packages/SystemUI/res/values/config.xml for statusbar
blocked icons to make it easier to overlay wanted options instead of
having to change them in code.
Test: m, verify vibrate-icon is not visible in collapsed statusbar
on keyguard or launcher.
Signed-off-by: Timi Rautamäki <timi.rautamaki@gmail.com >
Change-Id: I9a04a67a9c0914989d34c8c53ceee97788e7ba6c
Merged-In: I9a04a67a9c0914989d34c8c53ceee97788e7ba6c
2022-03-18 13:37:21 +00:00