Shan Huang
|
4e612ce971
|
Merge "Remove the occasionally crashy MotionEvent logging." into tm-dev
|
2022-04-26 15:20:53 +00:00 |
|
Tiger Huang
|
c15af2cb87
|
Merge "Don't set animation pending when gaining fake control" into tm-dev
|
2022-04-26 12:47:42 +00:00 |
|
Michael Wright
|
1cc6eceb1d
|
Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev
|
2022-04-26 10:17:34 +00:00 |
|
Charles Chen
|
57edb1f789
|
Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev
|
2022-04-26 08:33:59 +00:00 |
|
Robert Horvath
|
943ffdb6c1
|
Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev
|
2022-04-26 08:28:52 +00:00 |
|
Christian Göllner
|
9cbaca7306
|
Merge "Split-shade: prevent new shade expansion when shade already expanded" into tm-dev
|
2022-04-26 08:03:04 +00:00 |
|
Charles Chen
|
6ed3a87798
|
Merge "Promote isFloating to TestApi" into tm-dev
|
2022-04-26 06:20:14 +00:00 |
|
Wei Sheng Shih
|
02e7e43950
|
Merge "Ensure the splash screen launched from system ui must be solid color." into tm-dev
|
2022-04-26 02:45:41 +00:00 |
|
Sooraj Sasindran
|
6d8f27328f
|
Merge "Store preferential network service config in xml" into tm-dev
|
2022-04-26 00:41:48 +00:00 |
|
TreeHugger Robot
|
75fb4d3021
|
Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev
|
2022-04-25 22:43:34 +00:00 |
|
Weilin Xu
|
de500a118a
|
Merge "Test empty programInfo update for BroadcastRadio" into tm-dev
|
2022-04-25 21:22:57 +00:00 |
|
Kathy Chen
|
889d4894d9
|
Merge "Stabalize AmbientContext detection by restoring client requests." into tm-dev
|
2022-04-25 20:49:28 +00:00 |
|
Eric Biggers
|
a9fad69c80
|
[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours am: 5589682f84 -s ours am: 382e2b6a55 -s ours am: 9e7d057d63 -s ours
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: I0f559d235643d6a64acfd54b85331f7763c05bb8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:43:09 +00:00 |
|
Eric Biggers
|
9b8453bca8
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours am: 3a4170de4b -s ours am: 873280e588 -s ours am: 32cee82670 -s ours am: 716c9b3d84 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: I731ee6f568dbf4556c03faa9ff322413cda8078d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:42:51 +00:00 |
|
Eric Biggers
|
1f7af138ac
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours am: 04ef13bd8e -s ours am: 1607beeb83 -s ours am: c2726df714 -s ours am: 45d6a8a9e6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: I0da9867921613a79c037c87bd99077a4ff690706
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:42:40 +00:00 |
|
Eric Biggers
|
dd977d092d
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours am: 3d81f75d82 -s ours am: 702169ebe7 -s ours am: b29063c035 -s ours am: fc37c36c41 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: I71677cb5a07e6cf2f684b44d8ea51d76aec19b3f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:42:25 +00:00 |
|
Eric Biggers
|
f601af78e9
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours am: 00f6398e69 -s ours am: 9ebbc45594 -s ours am: 97df5e8b63 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: I8d0a6720f3879d281decbe40d6a7dfa240e13df2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:41:59 +00:00 |
|
Eric Biggers
|
9346eb8414
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours am: 9c2aaf60a0 -s ours am: bc8f7869a2 -s ours am: 68f347d215 -s ours am: 144ab7db52 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: I1c69477f94336dadd8fecb8c2ac2bd2b3311c791
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:41:31 +00:00 |
|
Guo Li
|
2c90b00ed0
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours am: 34842572ca -s ours am: aa7e540eff -s ours am: 5afbc7f257 -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I3608868cacabe6b92cb2a606e16fb2971c23347b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:41:16 +00:00 |
|
Songchun Fan
|
c49dfd94b9
|
Merge "[AppsFilter] skip recompute mQueriesViaComponent for snapshot" into tm-dev
|
2022-04-25 20:36:22 +00:00 |
|
Eric Biggers
|
df092b720b
|
[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours am: 5589682f84 -s ours am: d6bfc716ec -s ours
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: Id2192504691532ca72dbe2fa0b146816eb2eeb52
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:21:28 +00:00 |
|
Eric Biggers
|
b87de79cdd
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours am: 3a4170de4b -s ours am: 873280e588 -s ours am: bfcb7f53de -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: Ia20bc5bc3863c0484b23e1ac9edb57f62e43dcc7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:21:19 +00:00 |
|
Eric Biggers
|
e071fa6574
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours am: 04ef13bd8e -s ours am: 1607beeb83 -s ours am: 798e6d78c6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: I038082f3a87407952dea7ccea2888e096547537e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:21:08 +00:00 |
|
Eric Biggers
|
9e7d057d63
|
[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours am: 5589682f84 -s ours am: 382e2b6a55 -s ours
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: I2db52fc2a3e504cf19e961aefe48e40125083b04
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:21:02 +00:00 |
|
Eric Biggers
|
716c9b3d84
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours am: 3a4170de4b -s ours am: 873280e588 -s ours am: 32cee82670 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: Ibb907e8462c68e79d25eaf0b71be89fcfe29c4b4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:21:00 +00:00 |
|
Eric Biggers
|
20664186b9
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours am: 3d81f75d82 -s ours am: 702169ebe7 -s ours am: 0fc8902874 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: I16dde899645c2f5f8e88023a7d287bf041b06343
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:58 +00:00 |
|
Eric Biggers
|
45d6a8a9e6
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours am: 04ef13bd8e -s ours am: 1607beeb83 -s ours am: c2726df714 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: I333fd1e3afe015e8ba158903e465b8b07027ba73
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:56 +00:00 |
|
Eric Biggers
|
fc37c36c41
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours am: 3d81f75d82 -s ours am: 702169ebe7 -s ours am: b29063c035 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: Ia9bfd00849caa2bd2b434c0c0f95f746c1c3c137
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:54 +00:00 |
|
Eric Biggers
|
00a0d7595a
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours am: 00f6398e69 -s ours am: e523e5de72 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: Ic614e690ed06139c8fbfecab2adbcf6bfc53af75
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:50 +00:00 |
|
Eric Biggers
|
97df5e8b63
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours am: 00f6398e69 -s ours am: 9ebbc45594 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: Id7c0df05bcfc6ea5f0e8624ea5632bd89335610a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:41 +00:00 |
|
Eric Biggers
|
aa4f6435a0
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours am: 9c2aaf60a0 -s ours am: bc8f7869a2 -s ours am: 1c53dec76a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: I6c02c32504ea8e825425b488df8bb91ac0509464
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:39 +00:00 |
|
Eric Biggers
|
144ab7db52
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours am: 9c2aaf60a0 -s ours am: bc8f7869a2 -s ours am: 68f347d215 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: I3d83f89358c323db1cd5d324d81df7c0d321451b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:29 +00:00 |
|
Guo Li
|
5afbc7f257
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours am: 34842572ca -s ours am: aa7e540eff -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I26a5c6e17a2361458cf0f158c7d4bac57e4efcc4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:19 +00:00 |
|
Guo Li
|
f26b98e73e
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours am: 34842572ca -s ours am: 1314db8f3e -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: Id0eb8b55edd9d3afee6302d21a7f4e1b83c791c6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 20:20:14 +00:00 |
|
Eric Biggers
|
382e2b6a55
|
[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours am: 5589682f84 -s ours
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: I6682298241e3414f89403cc2d058b90821ee8aca
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:56:29 +00:00 |
|
Eric Biggers
|
32cee82670
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours am: 3a4170de4b -s ours am: 873280e588 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: I04c931871233dbc4f3092c94e133fe9ff62a5f67
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:56:26 +00:00 |
|
Eric Biggers
|
c2726df714
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours am: 04ef13bd8e -s ours am: 1607beeb83 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: I839215a2484ed5270da6c611298ee4888ae6a943
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:56:23 +00:00 |
|
Eric Biggers
|
b29063c035
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours am: 3d81f75d82 -s ours am: 702169ebe7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: I04ff8ff28ca5c7e5588aab81cc120e399890eb5d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:56:21 +00:00 |
|
Eric Biggers
|
9ebbc45594
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours am: 00f6398e69 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: I588ddcfe0fac3757357d223a50b08e8da98ad023
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:56:17 +00:00 |
|
Eric Biggers
|
68f347d215
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours am: 9c2aaf60a0 -s ours am: bc8f7869a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: I51cffda70988d6b9a1d0e198eb7e65ff9a004536
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:56:11 +00:00 |
|
Guo Li
|
aa7e540eff
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours am: 34842572ca -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I35c2f8c528168f7f92fb9cd140796798b2a6e31e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:56:07 +00:00 |
|
Eric Biggers
|
d6bfc716ec
|
[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours am: 5589682f84 -s ours
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: I7beaa54c3c28c7bf3d9be37b41adefc8e476c5f6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:57 +00:00 |
|
Eric Biggers
|
bfcb7f53de
|
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours am: 3a4170de4b -s ours am: 873280e588 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: I3cc149d3b27b7e2ce6553dabef3ba936ba8d379e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:51 +00:00 |
|
Eric Biggers
|
798e6d78c6
|
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours am: 04ef13bd8e -s ours am: 1607beeb83 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381
Change-Id: If2441420fb73350dfe1852eb74b193405cd698cf
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:36 +00:00 |
|
Eric Biggers
|
0fc8902874
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours am: 3d81f75d82 -s ours am: 702169ebe7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416380
Change-Id: I33512e74cfb082f2baf99ab10101f605c1635d44
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:34 +00:00 |
|
Eric Biggers
|
e523e5de72
|
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours am: 00f6398e69 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379
Change-Id: Iaaf1988e324331a925689c527c4400c6302f4701
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:31 +00:00 |
|
Eric Biggers
|
1c53dec76a
|
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours am: 9c2aaf60a0 -s ours am: bc8f7869a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416378
Change-Id: I5b6dc0b6cd366362ddaabf7adb106857b6d97fab
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:20 +00:00 |
|
Guo Li
|
1314db8f3e
|
[automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours am: 34842572ca -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I948cd2c48b2be844ffaf96fe88ea066ce5cfbd09
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-25 19:55:08 +00:00 |
|
Siim Sammul
|
48ecaf9d88
|
Merge "Count the number of dropped events due to rate limiting and attach that number to the header of the dropbox entry." into tm-dev
|
2022-04-25 19:42:18 +00:00 |
|
Antoan Angelov
|
6327cfe89b
|
Merge "Update javadocs for EXTRA_ROLE_HOLDER_UPDATE_RESULT_CODE" into tm-dev
|
2022-04-25 19:32:44 +00:00 |
|