Cecilia Hong
|
bd147ff206
|
Merge "Add the logging logic to distinguish the SS-reactivated resume media and user-activated one when there is no recommendation card." into tm-dev am: c921168aa3 am: 559feab6c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17369738
Change-Id: Ic9ad10c25f7f6af4e7ad7c65058446f0c82f1875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-04 02:46:17 +00:00 |
|
Cecilia Hong
|
559feab6c5
|
Merge "Add the logging logic to distinguish the SS-reactivated resume media and user-activated one when there is no recommendation card." into tm-dev am: c921168aa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17369738
Change-Id: I6d03ec61bb63f0572a52a6991bc15a35bba76f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-04 02:24:34 +00:00 |
|
Cecilia Hong
|
c921168aa3
|
Merge "Add the logging logic to distinguish the SS-reactivated resume media and user-activated one when there is no recommendation card." into tm-dev
|
2022-04-04 02:05:36 +00:00 |
|
Santiago Seifert
|
d7c84de988
|
[automerger skipped] Merge "Reorganize exoplayer target names" into sc-mainline-prod am: cf608908b3 -s ours am: 491e17f146 -s ours am: 67ca30e2a6 -s ours am: c97d3559bd -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I64d866e51cf3f6758a65a203f5d0172db3c43b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 23:24:27 +00:00 |
|
Santiago Seifert
|
dac96285fe
|
[automerger skipped] Reorganize exoplayer target names am: d56acd1a57 -s ours am: 96e21df70a -s ours am: 90790a26b4 -s ours am: 6c4f12327c -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: Ic92169e8b87bd5865aa9d063f0f01809cda9be95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 23:24:10 +00:00 |
|
Josh Tsuji
|
b94b05087b
|
Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into tm-dev am: d35b3ee16a am: 50721a1578 am: 8b20c013e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542272
Change-Id: Idf4e3bb84a58c3e4d429e0beb4219232b3ffa34c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 23:23:20 +00:00 |
|
Santiago Seifert
|
c97d3559bd
|
[automerger skipped] Merge "Reorganize exoplayer target names" into sc-mainline-prod am: cf608908b3 -s ours am: 491e17f146 -s ours am: 67ca30e2a6 -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I7d75d15a1bc8ded3d1b4e7c2d0a99ba69c7e7bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 23:05:31 +00:00 |
|
Santiago Seifert
|
5a8a50e5aa
|
[automerger skipped] Merge "Reorganize exoplayer target names" into sc-mainline-prod am: cf608908b3 -s ours am: 491e17f146 -s ours am: 2ef5f64400 -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I8e11fedf8bbbcb5ecbeca1b37d005e40ae533574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 23:05:26 +00:00 |
|
Santiago Seifert
|
6c4f12327c
|
[automerger skipped] Reorganize exoplayer target names am: d56acd1a57 -s ours am: 96e21df70a -s ours am: 90790a26b4 -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I9df1ce28354aa46adf2920a21eccc36413ee1b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 23:05:14 +00:00 |
|
Santiago Seifert
|
f9853bc078
|
[automerger skipped] Reorganize exoplayer target names am: d56acd1a57 -s ours am: 96e21df70a -s ours am: 2494ed3caf -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I09887ebfec146455dda97f72a4b7debf74160f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 23:04:45 +00:00 |
|
Josh Tsuji
|
8b20c013e3
|
Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into tm-dev am: d35b3ee16a am: 50721a1578
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542272
Change-Id: I9df23983626585ae1357e954ed4f969cf8cd1c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 23:04:42 +00:00 |
|
Josh Tsuji
|
1f5cb8aa46
|
Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into tm-dev am: d35b3ee16a am: 3acd509078
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542272
Change-Id: I66b7fb37fcd3835fc7e316c0815e1335156084a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 23:03:56 +00:00 |
|
Santiago Seifert
|
67ca30e2a6
|
[automerger skipped] Merge "Reorganize exoplayer target names" into sc-mainline-prod am: cf608908b3 -s ours am: 491e17f146 -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I476072a90d65e81b46a4b98ba3c9099d5c306b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 22:40:44 +00:00 |
|
Santiago Seifert
|
90790a26b4
|
[automerger skipped] Reorganize exoplayer target names am: d56acd1a57 -s ours am: 96e21df70a -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I700db58904c486f291a7040c4e42ed36467521a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 22:40:37 +00:00 |
|
Josh Tsuji
|
50721a1578
|
Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into tm-dev am: d35b3ee16a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542272
Change-Id: Ia5c060e2dedd2519a6edee9b0c0664f0bbce0f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 22:40:24 +00:00 |
|
Santiago Seifert
|
2ef5f64400
|
[automerger skipped] Merge "Reorganize exoplayer target names" into sc-mainline-prod am: cf608908b3 -s ours am: 491e17f146 -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I324136c8b1929607a5888e647ee9638004d51445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 22:39:55 +00:00 |
|
Santiago Seifert
|
2494ed3caf
|
[automerger skipped] Reorganize exoplayer target names am: d56acd1a57 -s ours am: 96e21df70a -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: Icdaeac8b94b8bfbf449d7655121b8b3a58f840b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 22:39:45 +00:00 |
|
Josh Tsuji
|
3acd509078
|
Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into tm-dev am: d35b3ee16a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542272
Change-Id: I2698f65752f0eca1d08c3238c45a69af2ead5444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 22:39:32 +00:00 |
|
Santiago Seifert
|
491e17f146
|
[automerger skipped] Merge "Reorganize exoplayer target names" into sc-mainline-prod am: cf608908b3 -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I3883bec42dfa0d60d6f8affdf6a03fedf638eb04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 22:24:46 +00:00 |
|
Santiago Seifert
|
96e21df70a
|
[automerger skipped] Reorganize exoplayer target names am: d56acd1a57 -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: Ia859b61c29f58d7446685c9c011869decdd3d2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 22:24:24 +00:00 |
|
Josh Tsuji
|
d35b3ee16a
|
Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into tm-dev
|
2022-04-03 22:20:23 +00:00 |
|
Santiago Seifert
|
cf608908b3
|
Merge "Reorganize exoplayer target names" into sc-mainline-prod
|
2022-04-03 22:04:29 +00:00 |
|
Xin Li
|
7c881eab51
|
Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132 am: 4624b52801 am: 102cf242f3 am: 26339fcbf3 am: 2af7144faa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892
Change-Id: I55eed35c261cdbc90b8c32cd486f01f8b45b6700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 09:42:02 +00:00 |
|
Xin Li
|
9d25fe6948
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours am: 2a747fd030 -s ours am: ce51bea876 -s ours am: cacfd5ba56 -s ours am: c4e00df14c -s ours
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544891
Change-Id: Ice697d78a07b2cea2529a005e26c6d4c18010e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 09:39:10 +00:00 |
|
Xin Li
|
2af7144faa
|
Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132 am: 4624b52801 am: 102cf242f3 am: 26339fcbf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892
Change-Id: I0de03e37206fa5d9ca258a23f4e8ed9eb4a0dffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 09:11:17 +00:00 |
|
Xin Li
|
c4e00df14c
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours am: 2a747fd030 -s ours am: ce51bea876 -s ours am: cacfd5ba56 -s ours
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544891
Change-Id: If1ee53d7768c5e1193eec750b34af583d6c284f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 09:09:01 +00:00 |
|
Xin Li
|
ae5032bbdc
|
Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132 am: 4624b52801 am: 102cf242f3 am: b63fdbc275
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892
Change-Id: Ia1c37abfe58428ad70788d85b983b6e01412bcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 09:03:25 +00:00 |
|
Xin Li
|
b16d0b79f5
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours am: 2a747fd030 -s ours am: ce51bea876 -s ours am: 3a5cf70774 -s ours
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544891
Change-Id: I8ab2042ae7e97918fe082338690518aee6e40366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 09:00:47 +00:00 |
|
Xin Li
|
26339fcbf3
|
Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132 am: 4624b52801 am: 102cf242f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892
Change-Id: I61bf4b740560853932f156076f840258e8f08d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 08:33:28 +00:00 |
|
Xin Li
|
b63fdbc275
|
Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132 am: 4624b52801 am: 102cf242f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892
Change-Id: I32e6c60dd93706ccbcc61529e2f2a52ab8b1298d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 08:32:16 +00:00 |
|
Xin Li
|
cacfd5ba56
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours am: 2a747fd030 -s ours am: ce51bea876 -s ours
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544891
Change-Id: I0e4b529a9a5bff35a915cf04934728c5023e24b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 08:31:07 +00:00 |
|
Xin Li
|
3a5cf70774
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours am: 2a747fd030 -s ours am: ce51bea876 -s ours
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544891
Change-Id: I21c4759bcd282a840bcae481ea600b52bb93dc8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 08:29:52 +00:00 |
|
Xin Li
|
102cf242f3
|
Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132 am: 4624b52801
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892
Change-Id: I11133c04efb98697b2eae596884c3fbcad68d300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 07:46:34 +00:00 |
|
Xin Li
|
ce51bea876
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours am: 2a747fd030 -s ours
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544891
Change-Id: Ib43ddd7c36e0c6bc4fc616471d10561898486e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 07:43:57 +00:00 |
|
Xin Li
|
4624b52801
|
Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544892
Change-Id: I5c9d2124fff45b80d4c0c701f589b7fbd685ac59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 07:14:20 +00:00 |
|
Xin Li
|
2a747fd030
|
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544891
Change-Id: I7cd17f0442bec0ea54aacfdf8bceac655ce39a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-03 07:11:57 +00:00 |
|
Xin Li
|
be28e53132
|
Merge changes from topic "merge_8391262" into stage-aosp-master
* changes:
Fixup OWNERS file merge conflicts.
Merge Android 12 QPR3 ab/8391262
|
2022-04-03 06:41:20 +00:00 |
|
Jing Ji
|
d3a79efdc6
|
Merge changes I08df6527,I16a5537e into tm-dev am: 26f54bd162 am: 9a9dbe5457 am: 74fb6e3c32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544923
Change-Id: I606ec8612f7b3850bb3e22f885251e8e9e3a75f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:48:58 +00:00 |
|
Aaron Liu
|
3afb35a2f9
|
Merge "Bouncer: Add style in sim pin view." into tm-dev am: 706e0c7148 am: e786b33be8 am: 3e8dd8499f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17413003
Change-Id: I77785bbb6744e79de43b29d27f787e55d52554b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:48:18 +00:00 |
|
Automerger Merge Worker
|
08d7353a13
|
Merge "Merge "User Switcher: Prevent flickering for user switch." into tm-dev am: f139385025 am: 5f446b2d1b am: 75554a8809"
|
2022-04-02 18:47:57 +00:00 |
|
Jing Ji
|
74fb6e3c32
|
Merge changes I08df6527,I16a5537e into tm-dev am: 26f54bd162 am: 9a9dbe5457
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544923
Change-Id: I4f4eefc689b2b7e6d67df412348a315469f19ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:47:50 +00:00 |
|
Aaron Liu
|
6ff70981f4
|
Merge "User Switcher: Prevent flickering for user switch." into tm-dev am: f139385025 am: 5f446b2d1b am: 75554a8809
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260686
Change-Id: I5852dc73afe591fc56194705d53e5a3752806045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:47:29 +00:00 |
|
Jing Ji
|
f05ef8d5fb
|
Merge changes I08df6527,I16a5537e into tm-dev am: 26f54bd162 am: 740a58a380
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544923
Change-Id: Ic3d2ab035a3a6c6b10949589f6002caeb08f0738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:47:26 +00:00 |
|
Jing Ji
|
9a9dbe5457
|
Merge changes I08df6527,I16a5537e into tm-dev am: 26f54bd162
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544923
Change-Id: I88f3e96351c414dc92c6ce35880c517f9733f158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:27:13 +00:00 |
|
Jing Ji
|
740a58a380
|
Merge changes I08df6527,I16a5537e into tm-dev am: 26f54bd162
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17544923
Change-Id: I84364d4c497dc40b3655db9cc2499d67982e9641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:26:22 +00:00 |
|
Aaron Liu
|
3e8dd8499f
|
Merge "Bouncer: Add style in sim pin view." into tm-dev am: 706e0c7148 am: e786b33be8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17413003
Change-Id: I62fe539818d1159e8d0b5f7bca5d11bc60003462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:20:43 +00:00 |
|
Aaron Liu
|
91dcadf445
|
Merge "Bouncer: Add style in sim pin view." into tm-dev am: 706e0c7148 am: fed1a79055
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17413003
Change-Id: I7881564b4bda1fbbcbf6956c385c1615673a6950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:20:24 +00:00 |
|
Aaron Liu
|
75554a8809
|
Merge "User Switcher: Prevent flickering for user switch." into tm-dev am: f139385025 am: 5f446b2d1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260686
Change-Id: I183a4cf1152bc758a8584fccb6ed693d2fdbcfc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:20:03 +00:00 |
|
Aaron Liu
|
90063d8272
|
Merge "User Switcher: Prevent flickering for user switch." into tm-dev am: f139385025 am: 80890e2ea3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260686
Change-Id: I8289af3cb4a2352af681a8e9e4247dad5970ba1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-02 18:19:07 +00:00 |
|
Jing Ji
|
26f54bd162
|
Merge changes I08df6527,I16a5537e into tm-dev
* changes:
Improve the dumpsys output of the app battery tracker
Coalesce the shared GID battery usage into its real UID
|
2022-04-02 18:05:56 +00:00 |
|