Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
762,630 Commits 3 Branches 0 Tags
c7004720912a0df34ae993e4df20c98e7c7eeef2
Commit Graph

762630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tony Huang
c700472091 Remove stagesplit backup package 
Bug: 199236198
Test: build pass
Test: pass existing tests
Ignore-AOSP-First: remove whole folder
Change-Id: I8747f314c5e7fa50812d220fdf527874fc654b85
 2022-05-04 17:36:18 +08:00
TreeHugger Robot
1d92b42d8a Merge "Deprecate and remove ProcessStateRecord.mAllowStartFgsState field." into tm-dev am: a683c1ba94 am: cd3eca73f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18124902

Change-Id: I464a88757f02d724246087e8fcf0b83d99e4bd20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:25:57 +00:00
TreeHugger Robot
d67b47cf73 Merge "ColorSchemeTransition now updates the ripple color" into tm-dev am: a776c95416 am: d13590e665 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17954103

Change-Id: Ic0dbe98ca82c988d59be50f56722f5e93b838e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:25:51 +00:00
TreeHugger Robot
5310bc6a55 Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev am: ae7d1beb80 am: fb1ee89cef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956048

Change-Id: Ibf0b2087092c451b2438349f125afde878fa306a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:25:23 +00:00
Lucas Dupin
13150f550b Merge "Avoid Spell Checker initialization during anim" into tm-dev am: ae0a72f3c7 am: edd34250c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18128982

Change-Id: I8182ef7dffc82a091198c16467550b8b84370d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:25:03 +00:00
TreeHugger Robot
c239354bbf Merge "Add some extra exception catching/logging to readxml" into tm-dev am: 2ca31b10ab am: f6f74e0e82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18094505

Change-Id: I3a7d8a2b95c485d86d1b85462da23bfc8a380cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:24:14 +00:00
Rhed Jao
9e98853f04 Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev am: a22156f40d am: 59f972ae6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988068

Change-Id: If71fbaf57df3fcb60bce366e8f010ff0239d5bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:22:56 +00:00
TreeHugger Robot
cd3eca73f7 Merge "Deprecate and remove ProcessStateRecord.mAllowStartFgsState field." into tm-dev am: a683c1ba94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18124902

Change-Id: I96a9985b7547c58105a03eb8e860307c73b68ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:10:05 +00:00
TreeHugger Robot
d13590e665 Merge "ColorSchemeTransition now updates the ripple color" into tm-dev am: a776c95416 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17954103

Change-Id: If1d975cf6c0f67bde91230cc0d6d75cfd4c3a53e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:09:34 +00:00
TreeHugger Robot
fb1ee89cef Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev am: ae7d1beb80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956048

Change-Id: Id08c96f889a14cc6f6f712091340b41abb56dea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:09:15 +00:00
Lucas Dupin
edd34250c5 Merge "Avoid Spell Checker initialization during anim" into tm-dev am: ae0a72f3c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18128982

Change-Id: I8b06908805a48f6f55ff3b254aeaf053dbc94d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:08:34 +00:00
TreeHugger Robot
f6f74e0e82 Merge "Add some extra exception catching/logging to readxml" into tm-dev am: 2ca31b10ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18094505

Change-Id: I865d3af0d3a42e0eff4c8b7cd825b7b564ea5c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:08:18 +00:00
Rhed Jao
59f972ae6e Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev am: a22156f40d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988068

Change-Id: I8316a3f9a18564c5c0ee9ccf4656cf9214f30d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:06:20 +00:00
TreeHugger Robot
a683c1ba94 Merge "Deprecate and remove ProcessStateRecord.mAllowStartFgsState field." into tm-dev 2022-05-03 04:00:56 +00:00
TreeHugger Robot
a776c95416 Merge "ColorSchemeTransition now updates the ripple color" into tm-dev 2022-05-03 03:46:07 +00:00
TreeHugger Robot
ae7d1beb80 Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev 2022-05-03 03:28:30 +00:00
Lucas Dupin
ae0a72f3c7 Merge "Avoid Spell Checker initialization during anim" into tm-dev 2022-05-03 03:10:10 +00:00
TreeHugger Robot
2ca31b10ab Merge "Add some extra exception catching/logging to readxml" into tm-dev 2022-05-03 02:50:17 +00:00
Rhed Jao
a22156f40d Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev 2022-05-03 02:45:20 +00:00
TreeHugger Robot
b3dfec5c5f Merge "Fix ManualBenchmarkState iteration unit" into tm-dev am: 1c51fb46b1 am: 28149c351f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097689

Change-Id: I74f51f27ae3984bd1dfb4bfe8ca22af1d67db516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:30:28 +00:00
TreeHugger Robot
9385fc4b95 Merge "Notify organizer about TaskFragment parent windowing mode change" into tm-dev am: 6725f73a88 am: 963dc4e957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18032087

Change-Id: I7bfbadc99a86f164c5d5a017af2f891b9ad73147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:30:17 +00:00
TreeHugger Robot
28149c351f Merge "Fix ManualBenchmarkState iteration unit" into tm-dev am: 1c51fb46b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097689

Change-Id: I827d9247d83dc7de6c80a31d9d9bbfd45ee3d105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:23:43 +00:00
TreeHugger Robot
963dc4e957 Merge "Notify organizer about TaskFragment parent windowing mode change" into tm-dev am: 6725f73a88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18032087

Change-Id: Ic004a0cc8ed861e591934a68dc90759dd6433198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:23:27 +00:00
Victor Berchet
dba5d3302e [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: aeecad4897 -s ours am: bcf1533d30 -s ours am: c410410d1c -s ours am: 36db8e0497 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I2231820ca0ac4e228fe0f00579a46cf98d883977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:22:56 +00:00
Victor Berchet
f314a7708d [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 56f74b2e6e -s ours am: abc0fd6965 -s ours am: 91ee254850 -s ours am: 03c479974d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I3eb9a7b6b1177eb69ef5788467cfeecd3f806ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:22:54 +00:00
Victor Berchet
e019ae61a8 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: 46897fa1e5 -s ours am: c7e7366bca -s ours am: a94a956069 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I6816d57b860f3dd7c33294a2e44d54422b790cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:22:32 +00:00
Victor Berchet
3760358c7b [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 62a0230994 -s ours am: 6728cfa75f -s ours am: 7f53a79ac3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: Iaaa3b9e5040d342c0f1e09914316c5b7c9b65a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:22:31 +00:00
Shaowei Shen
e060e7d02a Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea" into tm-qpr-dev 2022-05-03 02:15:50 +00:00
TreeHugger Robot
1c51fb46b1 Merge "Fix ManualBenchmarkState iteration unit" into tm-dev 2022-05-03 01:57:07 +00:00
TreeHugger Robot
6725f73a88 Merge "Notify organizer about TaskFragment parent windowing mode change" into tm-dev 2022-05-03 01:32:14 +00:00
Victor Berchet
36db8e0497 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: aeecad4897 -s ours am: bcf1533d30 -s ours am: c410410d1c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: Ibcd8080eb59a7fe568a0bec4204b16cdd5b71688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:33:36 +00:00
Victor Berchet
03c479974d [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 56f74b2e6e -s ours am: abc0fd6965 -s ours am: 91ee254850 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I7ca1ba0adf73daeb2fdedf81640d6c83092c2d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:33:33 +00:00
Victor Berchet
a94a956069 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: 46897fa1e5 -s ours am: c7e7366bca -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: Ifdc532835553d22a5be50b8e18f60c4293c439a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:33:14 +00:00
Victor Berchet
7f53a79ac3 [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 62a0230994 -s ours am: 6728cfa75f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I86834313764e3f2796c4d90f0bd46ad5a518beb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:33:12 +00:00
Victor Berchet
c410410d1c [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: aeecad4897 -s ours am: bcf1533d30 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I0351da37a4897a693335f9ab6a2878ce370c7b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:32:29 +00:00
Victor Berchet
91ee254850 [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 56f74b2e6e -s ours am: abc0fd6965 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: Ib990fb87512c297f11a5bf4f04e8b6e5a82ad633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:32:01 +00:00
Victor Berchet
c7e7366bca [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: 46897fa1e5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I4bed9042556e3a58d379d03b2e443d0d2235f992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:01:20 +00:00
Victor Berchet
bcf1533d30 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: aeecad4897 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I43415d5d125e59e0085ff5b8638970eff7e717c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:01:01 +00:00
Victor Berchet
abc0fd6965 [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 56f74b2e6e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: Id1c455a1c9f5109318455e8f8ed0868e5d9bf6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:58 +00:00
Victor Berchet
6728cfa75f [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 62a0230994 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I3b3569ac2adb2896b57ae1943b2a0b8ff1f0266e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:55 +00:00
Lucas Dupin
4a092d43c4 Avoid Spell Checker initialization during anim 
TextView initializes the spell checker when the view is attached to a
window, making a couple of IPCs.
These IPCs can contribute to jank, so we should avoid them if we can.

This CL delays the initialization until the edit text actually becomes
visible.

Test: perfetto trace
Test: atest RemoteInputViewTest
Fixes: 191953960
Change-Id: I27820986ec925f5edbf7e26f6b8f7311f6d2f467
 2022-05-02 16:52:49 -07:00
Ahaan Ugale
f51a7392ec Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into tm-qpr-dev 2022-05-02 23:37:44 +00:00
Ahaan Ugale
2fd599b2bb RESTRICT AUTOMERGE Disable the Trusted Hotword requirement 
The requirement to use a sandboxed HotwordDetectionService to avoid
incurring the mic indicator will be added back in a future release.
With this change, SoundTrigger events and hotword-source audio do not
incur the mic indicator for any process.

This change adds back the permissions logic from
I3275647d0f9a6e3ce8b97a556f56723b49170c8e, adjusted to account for the
changes from I4fc3b3e8defed59a900fd156273e9e695a322b0c (preflight
permission checks were made to accept soft denials, so simply reusing
enforcePermissionForPreflight does not work anymore - it would pop up a
dialog if the mic sensor is muted).

We preserve the behavior of showing the indicator when the detected
event is delivered from the Trusted Hotword process (no false-positives
here, so we can accurately show it).

Fix: 228092460
Test: manual - dsp and non-dsp; true and false positives; mute mic
 sensor - events aren't delivered and no dialog is shown, hotword still
 works after unmuting; mute mic and restart, unmute after starting reco;
 Trusted and non-Trusted hotwording
Test: atest CameraMicIndicatorsPermissionTest
Test: atest HotwordDetectionServiceBasicTest
Test: atest android.cts.statsdatom.appops.AppOpsTests#testAppOps
Change-Id: I68f2f37b5ce835e7fd8649b382eaee9fc299ec79
(cherry picked from commit 3f961f24f4)
 2022-05-02 23:36:58 +00:00
Victor Berchet
aeecad4897 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: Ia6d052abd376f352d59fd77d7210f68a2a7e8555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:29:33 +00:00
Victor Berchet
56f74b2e6e [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I5b2dc3b08f41fcc64196de6e94d1d921da0cb8dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:29:32 +00:00
Victor Berchet
46897fa1e5 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I59118f2c52abc27a75a25ab9e0306cac396a7606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:28:43 +00:00
Victor Berchet
62a0230994 [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I8b8c1d10e686d41b4d35fdd5024dea9dc57c425a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:28:39 +00:00
Nikita Ioffe
c85762e847 Merge "Add CtsShimPrivUpgrade to shim.v2_apk_in_apex_upgrades" into tm-dev am: d6359a85af am: 89b8598db4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090725

Change-Id: Ide5f64759c5461fff5d7e2b1a05e6149b6533963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:20:33 +00:00
Jeff Sharkey
b759da5e55 Merge "logcat test: add OWNERS file" into tm-dev am: c3fc843b63 am: fc6aaf801b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18126283

Change-Id: I19d122fec075c0f00a1c0e71a5ee263b2c887b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:13:08 +00:00
Matt Casey
c11ab5595e Merge "Convert Personal/Work tabs to rounded bubbles" into tm-dev am: 5e35dcd369 am: 5850ed9a6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090806

Change-Id: Ib764fdd7f2f962a1cddafb43dc537920510be535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:12:58 +00:00