Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
654,180 Commits 3 Branches 0 Tags
129bbf0b6865c19bde798db1cebca3cd9d604478
Commit Graph

654180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
bcb801ef06 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-dev 2021-08-11 02:27:51 +00:00
Sudheer Shanka
0925f07c25 Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev 2021-08-11 02:27:05 +00:00
Sudheer Shanka
9c8226caab Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev 2021-08-11 02:26:50 +00:00
Sudheer Shanka
8ec1b12371 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev 2021-08-11 02:24:48 +00:00
TreeHugger Robot
9f13df4f89 Merge "Fix Location equals()" into sc-dev am: b42181c3be am: 81321095aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: I16bc2771042c99cfa3d49703fa32433fbc0345f0
 2021-08-11 02:22:15 +00:00
TreeHugger Robot
0db8d6194e Merge "Fix Location equals()" into sc-dev am: b42181c3be am: 07b2ff7a54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: Ib28fa59ea209e8de0805cbde56842ea23d79ad0e
 2021-08-11 02:21:45 +00:00
TreeHugger Robot
81321095aa Merge "Fix Location equals()" into sc-dev am: b42181c3be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: Icedd653047fc4356a6b5a0cb4b4cff3cebbd8f1f
 2021-08-11 02:08:46 +00:00
TreeHugger Robot
07b2ff7a54 Merge "Fix Location equals()" into sc-dev am: b42181c3be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: I3d5846d248f0f00c507fd3854ddc5a90a0b85277
 2021-08-11 02:07:39 +00:00
Sudheer Shanka
d758d8398e [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-qpr-dev am: a5168b973f -s ours am: 49059eafae -s ours am: 3ccf5ed191 -s ours 
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 1494979a6a is already in history

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

Change-Id: Icc8bb812c4a27420a0d69eeccef4dfe3aa56ff2d
 2021-08-11 01:53:36 +00:00
Sudheer Shanka
e2bb111c45 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-qpr-dev am: a5168b973f -s ours am: 49059eafae -s ours am: 69f41f8378 -s ours 
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 1494979a6a is already in history

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

Change-Id: Ie0cc96e20dc51915bd7ee2d87995b3997abefa24
 2021-08-11 01:53:00 +00:00
TreeHugger Robot
b42181c3be Merge "Fix Location equals()" into sc-dev 2021-08-11 01:52:31 +00:00
Sudheer Shanka
3ccf5ed191 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-qpr-dev am: a5168b973f -s ours am: 49059eafae -s ours 
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 1494979a6a is already in history

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

Change-Id: I1cf39986321b65567bf5397adaad368b1b47457d
 2021-08-11 01:41:22 +00:00
Sudheer Shanka
69f41f8378 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-qpr-dev am: a5168b973f -s ours am: 49059eafae -s ours 
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 1494979a6a is already in history

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

Change-Id: I5cdd14d7259a7bd5223f664f27df2bbc608b34a8
 2021-08-11 01:40:42 +00:00
Shan Huang
3418e49eb9 Fix hard edge on charging ripple. 
Bug: 196132025
Test: Manual
Change-Id: I12eed187fcffc352de5637142b3189c159b3f097
 2021-08-11 01:40:39 +00:00
Sudheer Shanka
49059eafae [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-qpr-dev am: a5168b973f -s ours 
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 1494979a6a is already in history

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

Change-Id: I75ed537f04544b8f454abca95c7e25d9e2b05448
 2021-08-11 01:22:40 +00:00
Sudheer Shanka
a5168b973f Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-qpr-dev 2021-08-11 01:09:08 +00:00
Emilian Peev
a0ced2aa9e Camera: Initialize the forward processor along with the repeating pipeline 
Some preview extensions of the image processor type expect to recevive
'onOutputSurface' calls before the session is enabled by 'onEnableSession'.

Bug: 187341271
Test: atest -c
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: I67147ec24553cf87d23e33c63692fa7e59c57e5f
 2021-08-11 00:42:34 +00:00
Automerger Merge Worker
f49c91e6a8 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 6ec148e202 -s ours am: 4d380e273b -s ours am: 285f1b264f -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I3005ffb647815776fad2df013e76a5fb17ea06fb
 2021-08-10 23:52:38 +00:00
Dave Mankoff
c151a0669c [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 3806a2a28f -s ours am: 7d6482b4b1 -s ours am: 2fe09420a3 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: Iccd2baab92d564e92bbc8e27131470ef1409cede
 2021-08-10 23:52:22 +00:00
Automerger Merge Worker
028ac7e69c Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 6ec148e202 -s ours am: 4d380e273b -s ours am: 18671436c2 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I8dfc7e8f4e9b6445eb3e26e0720a327c903cddeb
 2021-08-10 23:52:17 +00:00
Automerger Merge Worker
5f73bdde66 Merge "Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours am: 4bc1c08af1 -s ours am: 98f71be4d7 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-10 23:52:12 +00:00
Automerger Merge Worker
be49f0f732 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours am: 4bc1c08af1 -s ours am: 98f71be4d7 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I6d292bfb81bd95a4f8d9e2a2db0634ea512dbba2
 2021-08-10 23:51:58 +00:00
Dave Mankoff
92e929d964 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 3806a2a28f -s ours am: 7d6482b4b1 -s ours am: f3cf4a43ee -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I32c1f6c83325dc5b0e7bd57bade8076945396ac1
 2021-08-10 23:51:54 +00:00
Automerger Merge Worker
589fe1a78b Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 671263bccd -s ours am: eb8b442022 -s ours am: 5656402f58 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-10 23:51:51 +00:00
Dave Mankoff
3f1fe673fb [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 671263bccd -s ours am: eb8b442022 -s ours am: 5656402f58 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I2f41fbf0b0d291bd466ab10c2ddb1e105c1e0c85
 2021-08-10 23:51:42 +00:00
Automerger Merge Worker
a8ca9d086a Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours am: 4bc1c08af1 -s ours am: 21877a9eec -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I5209a2d36104845d3beafc3a4b3e82a28c6a6681
 2021-08-10 23:51:35 +00:00
Dave Mankoff
4be8cc6da8 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 671263bccd -s ours am: eb8b442022 -s ours am: 45330c3e7d -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I91199dff44ffc9cc7a8650b82d5bcbbac99d6d7d
 2021-08-10 23:51:17 +00:00
Automerger Merge Worker
285f1b264f Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 6ec148e202 -s ours am: 4d380e273b -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I4c69b95c2652794af6151d0e8c3a0905b171d136
 2021-08-10 23:34:53 +00:00
Dave Mankoff
2fe09420a3 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 3806a2a28f -s ours am: 7d6482b4b1 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I5f96e1d0cf0eff8ddae0b3e08e312d4786b73344
 2021-08-10 23:34:48 +00:00
Automerger Merge Worker
98f71be4d7 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours am: 4bc1c08af1 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: If96e86f53d3e7eb19f7db6377539f26ee40499bd
 2021-08-10 23:34:44 +00:00
Automerger Merge Worker
18671436c2 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 6ec148e202 -s ours am: 4d380e273b -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I865f09cdd3fad4bafd69d4a6f762c02bf41abfaf
 2021-08-10 23:34:40 +00:00
Dave Mankoff
5656402f58 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 671263bccd -s ours am: eb8b442022 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: Ie4777896fe84abeb7369ee14a83b28f512728b90
 2021-08-10 23:34:39 +00:00
Dave Mankoff
f3cf4a43ee [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 3806a2a28f -s ours am: 7d6482b4b1 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I7e8b087c739d0822d8bbbfeadb9d6257b891dc59
 2021-08-10 23:34:29 +00:00
Automerger Merge Worker
21877a9eec Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours am: 4bc1c08af1 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I7ca7279c30beb61a40e333d150ce86628ce9b4a5
 2021-08-10 23:34:15 +00:00
Dave Mankoff
45330c3e7d [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 671263bccd -s ours am: eb8b442022 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: Ie4fd112a13f5a1fddd097509365d362470bdb87b
 2021-08-10 23:33:44 +00:00
Automerger Merge Worker
4d380e273b Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 6ec148e202 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: Ib120963304d43799c1141696832645802a3d7411
 2021-08-10 23:28:03 +00:00
Dave Mankoff
7d6482b4b1 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 3806a2a28f -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I476d3652c195ec7832f8333fb2c6a920b22992d7
 2021-08-10 23:26:51 +00:00
Automerger Merge Worker
4bc1c08af1 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I664e04e4f05c9ef94728f2d2b7890ba7892d3be2
 2021-08-10 23:21:31 +00:00
Dave Mankoff
eb8b442022 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 671263bccd -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I87bc72724f3c6b876a6423d1b932c5bac84a6953
 2021-08-10 23:20:59 +00:00
Automerger Merge Worker
6ec148e202 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I1d90bcc705ccbb05ba04d5f3634ee4c25fb546ff
 2021-08-10 23:11:13 +00:00
Dave Mankoff
3806a2a28f [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I6e4ecf1c8e4bea85ef3c2f992a57f2043bfc01ec
 2021-08-10 23:11:03 +00:00
Automerger Merge Worker
26c8f8d054 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: I14648f534f8c1be5bdc5b6bb7c4fd176391cc6a9
 2021-08-10 23:10:44 +00:00
Dave Mankoff
671263bccd [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I132c5c5f55dd2426bd194df7ea871801e3e7cce4
 2021-08-10 23:10:24 +00:00
Automerger Merge Worker
0fe296d677 Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: Ia67b2944593244b543ac1a6b1a79756a54721e01
 2021-08-10 22:57:58 +00:00
Dave Mankoff
cd5bad2480 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours 
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history

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

Change-Id: I873303e65c4e4e94fc95d70097a7ca17db5d0762
 2021-08-10 22:57:35 +00:00
Michael Groover
02ee9250e9 Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev am: 71f64ff1ac am: 57244b6ebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508291

Change-Id: If70194017ce46148980883614a52a51cf6eae68b
 2021-08-10 22:53:44 +00:00
TreeHugger Robot
2b53745ea7 Merge changes I7a3ba2af,Ifa89ae43 into sc-dev am: 0f1dd468bd am: ca4e09d0c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504100

Change-Id: I1dcc5418844084f5596b2ea5debbd79bb57419b7
 2021-08-10 22:53:35 +00:00
TreeHugger Robot
ba76b3e23b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours am: 48411fcd34 -s ours am: d9b7772c52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e542d89ae32492066cbef3aa5a0e6e65e12cc10
 2021-08-10 22:53:16 +00:00
Michael Groover
7fae0273d4 Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev am: 71f64ff1ac am: a13fd1a4db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508291

Change-Id: I66473d41936b889bdf62b821ede898bf58b26668
 2021-08-10 22:45:04 +00:00
TreeHugger Robot
7086456da5 Merge changes I7a3ba2af,Ifa89ae43 into sc-dev am: 0f1dd468bd am: 0606505179 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504100

Change-Id: I0c6580f7296159e2ea8af99006b84c40d34be756
 2021-08-10 22:44:50 +00:00