Commit Graph

822720 Commits

Author SHA1 Message Date
Siim Sammul
92e2e6bdfb Merge "Initialize binder latency histograms collection via BinderCallsStats for the Wifi process. The same collection is already active for system_server, Bluetooth, and Telephony." 2022-08-08 13:06:28 +00:00
Oli Lan
3abebb1ce9 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours am: 82ed04734c -s ours am: edaf693fac -s ours am: f4ca6ce38d -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: Ifb49bac2cbe14a4b13cdf9fdfa145bdaf90ed6e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:06:06 +00:00
Automerger Merge Worker
2b2c4ed4b2 Merge changes from topic "am-e402221c42f24b0da9d37b43dbe8ecc8"
* changes:
  [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: f98feec2dd -s ours am: d4f2435bbf -s ours am: cd0f876344 -s ours am: cae947a62a -s ours
  [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours am: 4dbfb21419 -s ours am: ba0245e71e -s ours am: df638c5b23 -s ours
2022-08-08 13:05:52 +00:00
Oli Lan
73ad4f0e68 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: f98feec2dd -s ours am: d4f2435bbf -s ours am: cd0f876344 -s ours am: cae947a62a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I545973f1832028cb9635761fb68ccabb67c0aab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:05:40 +00:00
Oli Lan
b7b6ac7ca5 [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours am: 4dbfb21419 -s ours am: ba0245e71e -s ours am: df638c5b23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife9e644b39273f6f6687a6f0327160f77cf3e87a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:05:32 +00:00
Oli Lan
3a6e4eb996 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a am: a21b2b7e93 -s ours am: 724ac8fd55 -s ours am: 0a47699e0e -s ours am: 3173a26f2e -s ours am: 8cacc2bae4 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: Ie75954c184bf5413fe475671530836347bf5dfca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:05:29 +00:00
Automerger Merge Worker
78c97472b8 Merge changes from topic "am-1faa1feea9c64f5b8724eccdfb41573d"
* changes:
  [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: 7be25392e1 -s ours am: 8e2363d124 -s ours am: e0fa32db9d -s ours
  [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 2c33c03230 -s ours am: 3d82e8cb1d -s ours am: 843bece1ad -s ours
2022-08-08 13:05:20 +00:00
Oli Lan
def677a8c6 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: 7be25392e1 -s ours am: 8e2363d124 -s ours am: e0fa32db9d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0db33abb3d2dfef54c9f4292e50c75c322ab276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:05:04 +00:00
Oli Lan
ba335dfeb9 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours am: f2fa50a059 -s ours am: e332eadd1f -s ours am: 10cfccee80 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: I2c71c21635cfb6675830f163bd6167b27a5ebc40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:04:51 +00:00
Oli Lan
3c7cea6be6 [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 2c33c03230 -s ours am: 3d82e8cb1d -s ours am: 843bece1ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieca15f01ced58a28d69b9c744a1ab3447a96e072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:04:36 +00:00
Oli Lan
cae947a62a [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: f98feec2dd -s ours am: d4f2435bbf -s ours am: cd0f876344 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ce47c5cca1712ac8b3b7a51e34fcdf8de0d7816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:40:03 +00:00
Oli Lan
df638c5b23 [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours am: 4dbfb21419 -s ours am: ba0245e71e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8620503769510468a1d03c31435fad4bedba1cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:40:01 +00:00
Oli Lan
f4ca6ce38d [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours am: 82ed04734c -s ours am: edaf693fac -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic22b32afb962a7f8e7fc2542a32ec1a307c41416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:39:59 +00:00
Oli Lan
e0fa32db9d [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: 7be25392e1 -s ours am: 8e2363d124 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb495e2d87473ea4dd837e55defa516a3fa26871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:39:34 +00:00
Oli Lan
843bece1ad [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 2c33c03230 -s ours am: 3d82e8cb1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74a7b4f64ef97476a335fa476c0cb5ba7b6859d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:39:32 +00:00
Oli Lan
8cacc2bae4 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a am: a21b2b7e93 -s ours am: 724ac8fd55 -s ours am: 0a47699e0e -s ours am: 3173a26f2e -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: I5335b6744fdf371d87ca8238b2cbdc3aaf04d007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:39:30 +00:00
Oli Lan
cd0f876344 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: f98feec2dd -s ours am: d4f2435bbf -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2bf8fb0965b5cd20b6a5643ceafc6ae1d744c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:39:18 +00:00
Oli Lan
10cfccee80 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours am: f2fa50a059 -s ours am: e332eadd1f -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id0199eae39affe7c770ed569ca08b232b18d3064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:39:11 +00:00
Oli Lan
ba0245e71e [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours am: 4dbfb21419 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4a8dedd5ee805979b6d3c818afac395c9dba70c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:39:07 +00:00
Oli Lan
8e2363d124 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: 7be25392e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia12a0fed84dbf3ccef070910458272ab676088c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:17:19 +00:00
Oli Lan
993c224367 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a am: a21b2b7e93 -s ours am: 724ac8fd55 -s ours am: 02804b6396 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: If26db50c47d70a3bcaaa728556daf297a1f7ec7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:17:16 +00:00
Oli Lan
3173a26f2e [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a am: a21b2b7e93 -s ours am: 724ac8fd55 -s ours am: 0a47699e0e -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: I3589956fb038d925ed6a90798554fecedc39b064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:17:14 +00:00
Oli Lan
d4f2435bbf [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: f98feec2dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d61f55bee4a044305f5c62bf5edb3bfb898d287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:17:08 +00:00
Oli Lan
edaf693fac [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours am: 82ed04734c -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: I59d490534c6cc5a9955bd29f005fb91b5e3227e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:17:05 +00:00
Oli Lan
3d82e8cb1d [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 2c33c03230 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b703e50d14868fbaf7ee8d8f6648ff50bb4c57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:16:55 +00:00
Oli Lan
4dbfb21419 [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0759fe98c7662200d9006e212623388e3b5ef887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:16:55 +00:00
Oli Lan
e332eadd1f [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours am: f2fa50a059 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id91e902d6fb968cd4875ca882974124490435556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:16:53 +00:00
Oli Lan
a6668ba68e [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours am: 7c15083061 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: I7a3f5fa13cbd51d957c119a3aa2745ef1aec9e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:16:24 +00:00
Oli Lan
0a47699e0e [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a am: a21b2b7e93 -s ours am: 724ac8fd55 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id81bc39407750c2c68ea86f4e62635682aef3166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:00:40 +00:00
Oli Lan
f98feec2dd [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac9e43b34dc82205e85f469d27b786cbf7467c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:00:35 +00:00
Oli Lan
9efe4fd3a4 [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f46d513c3fd87451fd40f666fa8bf29eae14c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:00:34 +00:00
Oli Lan
f2fa50a059 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: Ie2e15e5ba2e93ebc9adbf26d202407019494b413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:00:34 +00:00
Oli Lan
02804b6396 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a am: a21b2b7e93 -s ours am: 724ac8fd55 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: Idbe0ce5ac3847d15ebceda8d866c0ea6abc8b14f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:59:52 +00:00
Oli Lan
7be25392e1 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f942bd80b333cec180bb378f1506a0856d61adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:59:44 +00:00
Oli Lan
7c15083061 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: Idc2315b95bf59e484eeed715060db0f251c33a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:59:39 +00:00
Oli Lan
2c33c03230 [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: If58b855d8d9220cf19eba700d22a044844729564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:59:32 +00:00
Oli Lan
82ed04734c [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

Change-Id: I2f121082d0f89f755b3683f0ea6667437daa2981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:59:14 +00:00
Oli Lan
724ac8fd55 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a am: a21b2b7e93 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I550438b4a0545356eb3be87ba4c2ba6233357421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:59:13 +00:00
Oli Lan
a21b2b7e93 Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830

Change-Id: I175f671a34e871e1d0591e331081cec0b04d2ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:37:49 +00:00
Oli Lan
0ed5ea2550 [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ie025ea4041ef1af8e379b1d759227d7f2ae8accd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:30:23 +00:00
Oli Lan
93cb81e462 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a64291ff536bb85a001e05408815fadfaa1506e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:29:10 +00:00
Oli Lan
3d587853bd [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48b2c3ddbda597d7ab5f092a65d2a8bfe568b5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:28:45 +00:00
Oli Lan
27d914f70a Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830

Change-Id: I373e4063f297428a293b9b3ef2c75a1f502b646c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:11:35 +00:00
Oli Lan
e910cac05e Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830

Change-Id: I98fb8171d9a82a9850d6cb6881c58f5ea46bf4eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:10:58 +00:00
Oli Lan
7cc9540c50 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23d922594540bfb02546392b254680cd0f7d8674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:09:45 +00:00
Oli Lan
f36dd9d93f [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I631c9e39cc6368a67b11dae2e6649ec164ee9a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:09:29 +00:00
Wei Sheng Shih
2050f249ed Merge "Only dispatch onMove event to BackAnimation in one place." into tm-qpr-dev am: bbccf67ed3 am: 98c8dcf73d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19499676

Change-Id: I698f7d513650865dd53f9eccac70b885c027bc4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 10:56:02 +00:00
TreeHugger Robot
c2aaacb3cb [automerger skipped] Merge changes from topic "qpr_patch_for_smart_idle" into tm-qpr-dev am: 83f272a258 -s ours am: cf171f00a2 -s ours
am skip reason: Merged-In I97503795473a9977740e717bf7b0ef6283c65a53 with SHA-1 b2c7eede16 is already in history

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

Change-Id: Ie99d82bf970283e04a6aaeee2003c90a0fb2b386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 10:55:37 +00:00
Daeho Jeong
64f9a0f8d0 [automerger skipped] Make target dirty segment ratio tunable am: 7b847f7c64 -s ours am: 1feaf1bc0f -s ours
am skip reason: Merged-In I97503795473a9977740e717bf7b0ef6283c65a53 with SHA-1 b2c7eede16 is already in history

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

Change-Id: I0b097917f317bfdeb980265ecd1a4a0ed8a67957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 10:55:21 +00:00
Oli Lan
487c65ea5d Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830

Change-Id: Id3e8ee4b08c109213ea3473a38b562dfb3eaf110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 10:54:38 +00:00