Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
813,479 Commits 3 Branches 0 Tags
33a8ba28dfb47cd605c192547d2cb334e61e89cd
Commit Graph

813479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shen Lin
ccaeb5a470 Fix potential crash in ImageTransformState 
android.graphics.drawable.Icon#sameAs() requires a non-null icon object
to do compare.

Bug: 264608650
Test: Manual
Change-Id: I0625ebce8c368d621e40be0162a023427a911083
 2023-01-06 23:09:59 +08:00
Mariia Sandrikova
b8a0696c35 Merge "Adjust smallestScreenWidthDp for letterbox" into tm-qpr-dev am: ac2768ae43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19416406

Change-Id: I6712a5164c94cd16a437b785fee16309d9b2915b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 14:19:41 +00:00
Mariia Sandrikova
ac2768ae43 Merge "Adjust smallestScreenWidthDp for letterbox" into tm-qpr-dev 2023-01-06 13:54:40 +00:00
András Kurucz
a3f2a7b27f Merge "Enhance BubbleController dumps" into tm-qpr-dev am: f30746816a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20875478

Change-Id: I4720752c6769a03bd714a12f3ac8dbea669408ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 13:30:35 +00:00
András Kurucz
f30746816a Merge "Enhance BubbleController dumps" into tm-qpr-dev 2023-01-06 13:14:09 +00:00
Riddle Hsu
4d9d3883fa Merge "Finish sync for unchanged drawn window" into tm-qpr-dev am: 719029c87c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20783091

Change-Id: I71725c74e5e9d1e685ad0cae7f3d3e0094cfa7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 13:13:25 +00:00
Riddle Hsu
719029c87c Merge "Finish sync for unchanged drawn window" into tm-qpr-dev 2023-01-06 12:47:06 +00:00
Ricky Niu
2617fd6686 usb: Implement the AIDL in framework 
Implement the AIDL and HIDL coexist in framework

Note: This is a cherry-pick of ag/17905026
Bug: 218791946
Test: USB function switch success and AIDL service is running.
      atest VtsHalUsbGadgetV2_0HostTest
Signed-off-by: Ricky Niu <rickyniu@google.com>

Merged-In: I6d9bc861a4aceb753bf6f816daccd039e423994d
Change-Id: I6d9bc861a4aceb753bf6f816daccd039e423994d
(cherry picked from commit 74272e2422)
 2023-01-06 11:11:13 +00:00
Josh Tsuji
09770ff815 Fix lockscreen jump-cutting in during screen off. 
isKeyguardShowDelayed() only returns true if the screen off
animation is currently playing, but since wakefulness events
are dispatched async, it's possible that we try to handle the
pending lock in onFinishedGoingToSleep() before the screen off
animator actually starts running.

We can instead check whether we're intending to delay the
keyguard show, even if we haven't quite started the animation
yet.

Fixes: 256803842
Test: atest KeyguardViewMediatorTest
Test: atest UnlockedScreenOffAnimationControllerTest
Change-Id: I4fbac5c995d535d1fb962e5663e3d47d8f3bf00f
 2023-01-06 05:51:16 -05:00
Sudheer Shanka
9968013be3 Add owners file for broadcasts related code. 
Test: n/a
Change-Id: Ie3db52a00e393418edb59af3544a80c1b9492a9f
Merged-In: Ie3db52a00e393418edb59af3544a80c1b9492a9f
 2023-01-06 08:29:04 +00:00
Shen Lin
155c848878 Remove deprecated call of EventLog 
EventLog is deprecated so we simply need to update permissions without
logging anything.

Test: manual
Change-Id: I760d9714946c57245fe22c6ffa8625dbcb9e8eb9
 2023-01-06 08:23:10 +00:00
Bill Yi
900382cbba [automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 89046cb92b -s ours 
am skip reason: Merged-In I7ff9d493a3cd74eac667ff2d7dbbf10fec2f56cb with SHA-1 29583132c9 is already in history

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

Change-Id: I4d2aff54bbff7743b4890c38bd5d71c2fb04e236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 07:33:36 +00:00
Bill Yi
284dcfba8e [automerger skipped] Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE am: 490a4209cd -s ours 
am skip reason: Merged-In I7ff9d493a3cd74eac667ff2d7dbbf10fec2f56cb with SHA-1 29583132c9 is already in history

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

Change-Id: Ib3208765d9b88d3b343496d22185d83ac060b679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 07:32:50 +00:00
Bill Yi
89046cb92b Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2023-01-06 07:00:48 +00:00
Louis Chang
79ad7b624a [automerger skipped] Merge "Revert "Trim the activity info of another uid if no privilege"" into tm-dev am: 3d96cd6e6d -s ours am: 0fb3ef55b8 -s ours am: 12f428cb7c -s ours 
am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change.

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

Change-Id: If3c3110031ae04df59ed4e488714d187638d801a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:40:42 +00:00
Louis Chang
59cec2d3b5 [automerger skipped] Revert "Trim the activity info of another uid if no privilege" am: 10c5e2a6b0 -s ours am: ab9ae86bd2 -s ours am: 64a1950a6f -s ours 
am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change.

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

Change-Id: Ib7be73fdeb5b6c5e3a59ec130e0fb91b4166c05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:40:25 +00:00
Louis Chang
12f428cb7c [automerger skipped] Merge "Revert "Trim the activity info of another uid if no privilege"" into tm-dev am: 3d96cd6e6d -s ours am: 0fb3ef55b8 -s ours 
am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change.

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

Change-Id: Ifc340abf7cd60a7074215c789b6a3253ad4281b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:24:57 +00:00
Louis Chang
64a1950a6f [automerger skipped] Revert "Trim the activity info of another uid if no privilege" am: 10c5e2a6b0 -s ours am: ab9ae86bd2 -s ours 
am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change.

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

Change-Id: I9ca1c72525417a7f51ea86f0ab1c18b489f5ad24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:24:53 +00:00
Louis Chang
dab3926679 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into qt-dev am: 1d1446d53b am: 438e63bcac -s ours am: a7dce649b5 -s ours am: 3abf3b4e63 -s ours am: e96853e79c -s ours am: 5c6e0c3fe5 -s ours am: a637f18876 -s ours am: abd233fd88 -s ours am: 2c14ef2871 -s ours am: c43faf12a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id69ac711bf325e697a5f49a9ce6da062ffdcf145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:22:46 +00:00
Louis Chang
3e5cdcbda7 [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 53a76608e5 am: f83968c4c5 -s ours am: 166a094ebf -s ours am: 6379ab13ed -s ours am: e0fdb37928 -s ours am: 0011edcc2a -s ours am: 56be1fc3c4 -s ours am: e77c3acf60 -s ours am: 923487178f -s ours am: b296e4523f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I752340f47d516c128f6c7a62773b9c57e106175e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:22:19 +00:00
Louis Chang
0fb3ef55b8 [automerger skipped] Merge "Revert "Trim the activity info of another uid if no privilege"" into tm-dev am: 3d96cd6e6d -s ours 
am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I15e82f2a20bd38f8a4de00786ff9a9364f2c0a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:08:49 +00:00
Louis Chang
ab9ae86bd2 [automerger skipped] Revert "Trim the activity info of another uid if no privilege" am: 10c5e2a6b0 -s ours 
am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I04f610fa4b9aba9fe31275a76814a3b8f0afafd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:08:24 +00:00
Louis Chang
c43faf12a8 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into qt-dev am: 1d1446d53b am: 438e63bcac -s ours am: a7dce649b5 -s ours am: 3abf3b4e63 -s ours am: e96853e79c -s ours am: 5c6e0c3fe5 -s ours am: a637f18876 -s ours am: abd233fd88 -s ours am: 2c14ef2871 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34e7b887a237c423d20e736b8c43cee55025480c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:07:57 +00:00
Louis Chang
b296e4523f [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 53a76608e5 am: f83968c4c5 -s ours am: 166a094ebf -s ours am: 6379ab13ed -s ours am: e0fdb37928 -s ours am: 0011edcc2a -s ours am: 56be1fc3c4 -s ours am: e77c3acf60 -s ours am: 923487178f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I564743ede82940478ecd36995eaacba057c0a3d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 05:07:47 +00:00
Louis Chang
3d96cd6e6d Merge "Revert "Trim the activity info of another uid if no privilege"" into tm-dev 2023-01-06 04:59:24 +00:00
Louis Chang
2c14ef2871 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into qt-dev am: 1d1446d53b am: 438e63bcac -s ours am: a7dce649b5 -s ours am: 3abf3b4e63 -s ours am: e96853e79c -s ours am: 5c6e0c3fe5 -s ours am: a637f18876 -s ours am: abd233fd88 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9484aae249fb31244af6b7553f1c091281a08637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 04:37:02 +00:00
Louis Chang
923487178f [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 53a76608e5 am: f83968c4c5 -s ours am: 166a094ebf -s ours am: 6379ab13ed -s ours am: e0fdb37928 -s ours am: 0011edcc2a -s ours am: 56be1fc3c4 -s ours am: e77c3acf60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I040f7b67b8c94d39a4a85439072bae8f5cb2e67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 04:36:59 +00:00
Louis Chang
95a9562d47 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 6790434470 am: 5a38197914 -s ours am: cd7985e8f8 -s ours am: 9426948b40 -s ours am: 97dfc3afdc -s ours am: 18effe5537 -s ours am: f0761639fe -s ours am: 0c6699d7e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5272d3e966dbf54cc9239cb81c8c2d9a6b08392b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 04:02:20 +00:00
Louis Chang
ef07b78ba0 [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 5caf2dde3d am: 0523c5c16f -s ours am: f8bec9f6b4 -s ours am: 11dfc762ea -s ours am: 1de91bc1da -s ours am: b9ec748759 -s ours am: cd7514f9a9 -s ours am: 323d42b2bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I907b507ed5f25c25b86f7323957ab17b6021aedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 04:01:39 +00:00
Louis Chang
0c6699d7e5 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 6790434470 am: 5a38197914 -s ours am: cd7985e8f8 -s ours am: 9426948b40 -s ours am: 97dfc3afdc -s ours am: 18effe5537 -s ours am: f0761639fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb85af792dcba405ebbebc257e2feec905c02fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 04:01:08 +00:00
Louis Chang
323d42b2bc [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 5caf2dde3d am: 0523c5c16f -s ours am: f8bec9f6b4 -s ours am: 11dfc762ea -s ours am: 1de91bc1da -s ours am: b9ec748759 -s ours am: cd7514f9a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21ce6d5c985cb635e240833c284a67b4561e4a8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 04:01:02 +00:00
Mariia Sandrikova
01c75559d1 Merge "Add a way to disable auto rotation for immersive apps" into tm-qpr-dev am: 53cf7e47f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403231

Change-Id: Idef12c6df48b520e4cd2004c2ed84ac718c206b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 04:00:58 +00:00
Louis Chang
abd233fd88 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into qt-dev am: 1d1446d53b am: 438e63bcac -s ours am: a7dce649b5 -s ours am: 3abf3b4e63 -s ours am: e96853e79c -s ours am: 5c6e0c3fe5 -s ours am: a637f18876 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1231cd383bb0884b7c0d12304826c2c413148c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 03:57:44 +00:00
Louis Chang
e77c3acf60 [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 53a76608e5 am: f83968c4c5 -s ours am: 166a094ebf -s ours am: 6379ab13ed -s ours am: e0fdb37928 -s ours am: 0011edcc2a -s ours am: 56be1fc3c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4bf814e38a2c0ef7a30d88bc1ee009b6b8acc09b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 03:57:25 +00:00
Louis Chang
f0761639fe [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 6790434470 am: 5a38197914 -s ours am: cd7985e8f8 -s ours am: 9426948b40 -s ours am: 97dfc3afdc -s ours am: 18effe5537 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9064dea92a1f291e3458b0ea404fe02293c6f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 03:28:51 +00:00
Louis Chang
a637f18876 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into qt-dev am: 1d1446d53b am: 438e63bcac -s ours am: a7dce649b5 -s ours am: 3abf3b4e63 -s ours am: e96853e79c -s ours am: 5c6e0c3fe5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd896fc979beb503ab8bc2affdfd4360ae195a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 03:28:50 +00:00
Louis Chang
cd7514f9a9 [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 5caf2dde3d am: 0523c5c16f -s ours am: f8bec9f6b4 -s ours am: 11dfc762ea -s ours am: 1de91bc1da -s ours am: b9ec748759 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd2fb55d078af6455bf49a873664fd9965c6c890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 03:28:49 +00:00
Louis Chang
56be1fc3c4 [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 53a76608e5 am: f83968c4c5 -s ours am: 166a094ebf -s ours am: 6379ab13ed -s ours am: e0fdb37928 -s ours am: 0011edcc2a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I170db53437d6a1dd9152ee206e5eb9cf71c40ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 03:28:45 +00:00
Mariia Sandrikova
53cf7e47f0 Merge "Add a way to disable auto rotation for immersive apps" into tm-qpr-dev 2023-01-06 03:20:55 +00:00
Louis Chang
18effe5537 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 6790434470 am: 5a38197914 -s ours am: cd7985e8f8 -s ours am: 9426948b40 -s ours am: 97dfc3afdc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I035d7e529b1790ba9f08928fa7521648959a1abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:54:33 +00:00
Louis Chang
b9ec748759 [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 5caf2dde3d am: 0523c5c16f -s ours am: f8bec9f6b4 -s ours am: 11dfc762ea -s ours am: 1de91bc1da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc7b10ca3ddf829ec70d25e59a4f6cd289806966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:54:12 +00:00
Louis Chang
5c6e0c3fe5 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into qt-dev am: 1d1446d53b am: 438e63bcac -s ours am: a7dce649b5 -s ours am: 3abf3b4e63 -s ours am: e96853e79c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16abdfb45eef3abf69097bf918eedb531794d674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:54:09 +00:00
Louis Chang
0011edcc2a [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 53a76608e5 am: f83968c4c5 -s ours am: 166a094ebf -s ours am: 6379ab13ed -s ours am: e0fdb37928 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie96b9fd2393ee79325c820d22133006706d723a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:53:53 +00:00
Yein Jo
19d9e34060 Merge "Refactor Turbulence noise" into tm-qpr-dev am: ee663e2cd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20788971

Change-Id: If8969d4549546823390fd8cc44da88584a4af7f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:40:05 +00:00
Louis Chang
8c9be20e56 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into sc-dev am: b9319ef760 -s ours am: 49b1b5e175 -s ours am: 00495e8dcd -s ours am: a6074b72b6 -s ours am: eb31534637 -s ours am: ba1ee78ab7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64924392a14251c66552171aefabcf8da07b026a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:39:38 +00:00
Louis Chang
4600511027 [automerger skipped] Merge changes from topic "presubmit-am-711e8625e1514f8785791e865e5a4d7d" into sc-qpr1-dev am: 53e52704b6 -s ours am: 5e7f43a14d -s ours am: 1a2e48eba1 -s ours am: 9e4a5f21c3 -s ours am: 26a8abcfba -s ours 
am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change.

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

Change-Id: Ica540469024505eceb4b0e23127921cd9a2cbe55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:39:04 +00:00
Presubmit Automerger Backend
aaa21efbcf [automerger skipped] [automerged blank] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" 2p: b37e4e7e6f am: 2e5d7cf628 -s ours am: a190a955c8 -s ours am: 95e655dcdd -s ours am: 2c7f306721 -s ours am: 1c79e91ef8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9af3b7f2c9e5f05cd49dbd11f4336843a333b470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:38:38 +00:00
Louis Chang
6798024245 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into sc-v2-dev am: 27b3d9fc3b -s ours am: 92393e347e -s ours am: d138361680 -s ours am: 4019346c80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12d31c5764a5ecc268d4627f83b142d943c68aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:38:02 +00:00
Louis Chang
4367817ea7 [automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: e3247fd5d3 -s ours am: cbc99ef73a -s ours am: a91415069b -s ours am: 124e90be8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I335af457905820e154cf0f592c969288281b9ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:37:28 +00:00
Louis Chang
97dfc3afdc [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 6790434470 am: 5a38197914 -s ours am: cd7985e8f8 -s ours am: 9426948b40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a41255153ed0f949cb8bd77a949fc97df3ac3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-06 02:22:35 +00:00