tim peng
|
a2df72be88
|
Merge "Disable volume control bar for all remote devices" into sc-dev am: 10ad24809c am: 17590c3a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498082
Change-Id: I0177058148c62a9f28ab6462121507dbd6210dd0
|
2021-08-11 03:11:33 +00:00 |
|
Sudheer Shanka
|
419a46d28b
|
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours am: 5a215b12a2 -s ours am: 9ec070a785 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301702
Change-Id: If6660d03f11a6ec7eb4488b9c7a2dc653ba91f87
|
2021-08-11 03:11:17 +00:00 |
|
tim peng
|
17590c3a10
|
Merge "Disable volume control bar for all remote devices" into sc-dev am: 10ad24809c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498082
Change-Id: I0fc04f92e28c1a758ed4746d29ff794108d58a5d
|
2021-08-11 02:54:28 +00:00 |
|
Sudheer Shanka
|
9ec070a785
|
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours am: 5a215b12a2 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301702
Change-Id: If1342fb8923ba8c081d851a86527f79df35deea2
|
2021-08-11 02:53:35 +00:00 |
|
tim peng
|
10ad24809c
|
Merge "Disable volume control bar for all remote devices" into sc-dev
|
2021-08-11 02:44:47 +00:00 |
|
Sudheer Shanka
|
5a215b12a2
|
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301702
Change-Id: If94c8cc284ce2ef680fda35412ce7b145883374f
|
2021-08-11 02:34:52 +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
|
bf93994c78
|
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: I13c0cf500d49d5fad0a0127e67cdb22f4ca6cf63
|
2021-08-11 02:22:15 +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 |
|
Sudheer Shanka
|
4e8145a475
|
[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: I49003425569c1b850d92a020fb1f407f3258d81b
|
2021-08-11 01:53:37 +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 |
|
Wei Sheng Shih
|
7dd382e0e9
|
Merge "Use window manager global to add/remove starting window." into sc-v2-dev
|
2021-08-11 01:38:26 +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 |
|
Automerger Merge Worker
|
fb0204cc81
|
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: If1a4cb5df93a4ec9f6807e32c4b61f720e0b4bf0
|
2021-08-10 23:52:29 +00:00 |
|
Dave Mankoff
|
c7fd1ab358
|
[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: I2d012ab1ea79a1218377d7b4f52301371312e8b8
|
2021-08-10 23:52:20 +00:00 |
|
Automerger Merge Worker
|
fe36aa3c56
|
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: I1c15a2d7e37de4494ac73ec83160864072c5275a
|
2021-08-10 23:51:58 +00:00 |
|
Dave Mankoff
|
2410d5bd9d
|
[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: I4c454d26974f0ff8771308a0ef3a2a545e1850f4
|
2021-08-10 23:51:38 +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 |
|
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 |
|
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
|
7ca2837ab2
|
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: I09d11748055a19495feae106005b61ce99f2a843
|
2021-08-10 22:53:40 +00:00 |
|
TreeHugger Robot
|
5e7792df46
|
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: Ib607b263e084c3211e01cd55e3062377f03c7cff
|
2021-08-10 22:53:35 +00:00 |
|
TreeHugger Robot
|
e8fe1794d2
|
[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: I630c5c03ab27e998380f2c7515a45d4537be89ba
|
2021-08-10 22:53:17 +00:00 |
|
Automerger Merge Worker
|
50c7797637
|
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 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: Ia7b043f41c17732d468dc64daa819d978d1e2650
|
2021-08-10 22:42:49 +00:00 |
|
Dave Mankoff
|
a540241260
|
[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 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: Ia83a72319614bb3cf3f94caab49f4581c89374e4
|
2021-08-10 22:42:41 +00:00 |
|
Michael Groover
|
57244b6ebb
|
Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev am: 71f64ff1ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508291
Change-Id: I1090c0fc89ba68ff8c20411dd35d27692b560de0
|
2021-08-10 22:36:04 +00:00 |
|
TreeHugger Robot
|
ca4e09d0c1
|
Merge changes I7a3ba2af,Ifa89ae43 into sc-dev am: 0f1dd468bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504100
Change-Id: I398b961956a7c0b06b37784aca6ff870739f7900
|
2021-08-10 22:35:00 +00:00 |
|
TreeHugger Robot
|
d9b7772c52
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours am: 48411fcd34 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508304
Change-Id: I38fd98780aed2475f3a760858bee932cd4d11f24
|
2021-08-10 22:33:48 +00:00 |
|
Michael Groover
|
71f64ff1ac
|
Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev
|
2021-08-10 22:30:03 +00:00 |
|
Automerger Merge Worker
|
7162d024b2
|
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
|
2021-08-10 22:29:35 +00:00 |
|
Dave Mankoff
|
926e47bcdc
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -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: If05869aa7d10c4696e98b6e677491792f272ea73
|
2021-08-10 22:29:02 +00:00 |
|
TreeHugger Robot
|
0f1dd468bd
|
Merge changes I7a3ba2af,Ifa89ae43 into sc-dev
* changes:
Fix app widget deadlock when toggling overlays
Revert "Revert "Apply overlay updates to widget provider info""
|
2021-08-10 21:46:39 +00:00 |
|
TreeHugger Robot
|
48411fcd34
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508304
Change-Id: Icb6ba573de3d611c8f506b355b2f8a15c6834579
|
2021-08-10 21:29:34 +00:00 |
|
Dave Mankoff
|
80a875282b
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -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: If6c9892c0816129270ee0c9ebaeb22c4bf7bc5a5
|
2021-08-10 21:29:16 +00:00 |
|
Soonil Nagarkar
|
271b907bab
|
Fix Location equals()
Should handle extras in a better manner.
Bug: 196075248
Test: presubmits + manual
Change-Id: I89e45c289b26ea97486c5a72feb0a805c8c1a950
|
2021-08-10 14:25:39 -07:00 |
|
TreeHugger Robot
|
ddd769d0d6
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-08-10 21:10:45 +00:00 |
|
Dave Mankoff
|
431bbeeab4
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: da9baed374 -s ours am: 642240ef30 -s ours am: 414288574a -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358518
Change-Id: Id763145884f0b335e2c7c1c6fc2face1c1b5f3db
|
2021-08-10 21:10:05 +00:00 |
|