Commit Graph

486275 Commits

Author SHA1 Message Date
Bill Yi
385c28b337 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idb57776f61dc6d4b2862b082fdd96cc8ab0107d0
2021-08-13 02:12:49 +00:00
Sudheer Shanka
5833c655f9 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I637a45b1b50fc12a7e562a49d8e4278b8c87cc32
2021-08-11 09:03:23 +00:00
Sudheer Shanka
2ea88737b2 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I5dede0bbce340b220f3b096cbae320a36960b77e
2021-08-11 08:49:05 +00:00
Sudheer Shanka
a899051254 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I56a4bd7bb79d1cf720c9eb9a37c137d0639a0451
2021-08-11 08:28:20 +00:00
Sudheer Shanka
d95a81b720 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I393aefeb1cb8aa19118b301df8cdbd0cef7dd94a
2021-08-11 08:11:09 +00:00
Sudheer Shanka
b0fccf4d9d [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I472c7d28b702b45537deb67d425dee9503f60a73
2021-08-11 07:57:05 +00:00
Sudheer Shanka
83f71f1227 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev 2021-08-11 07:43:26 +00:00
Lucas Lin
d28527a3fe Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347258

Change-Id: Iee0706abd8d45cc0f38f50dce25e7a54ce795060
2021-08-11 06:11:17 +00:00
Lucas Lin
15941027a9 Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev 2021-08-11 05:58:24 +00:00
Rhed Jao
37739a5f52 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-dev am: 1c93d67774 -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 6172201637 is already in history

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

Change-Id: I98f42b34dafbb4a16ebb265b7dc18b275390b94e
2021-08-11 05:33:39 +00:00
Rhed Jao
1c93d67774 Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-dev 2021-08-11 05:19:39 +00:00
Rhed Jao
707762ee17 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours am: a746ce4a30 -s ours am: 4fc54276f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74d695ade3a5a8247b69be5364e03d1c87d46850
2021-08-11 04:07:10 +00:00
Sudheer Shanka
3c2542f54b [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours am: 113ecdc386 -s ours am: 9769bbeeca -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: Ic9c76a8694a8c23696a69afbc3f742cfcd64ffb7
2021-08-11 04:06:59 +00:00
Sudheer Shanka
dd48647b28 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours am: 7b68389397 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: Ia55503967cc88ab55f048a8159c7df259b18605c
2021-08-11 04:06:52 +00:00
Rhed Jao
4fc54276f8 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours am: a746ce4a30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e421d9487a7bfec701717cf34d05dbdf294bb04
2021-08-11 04:06:06 +00:00
Rhed Jao
a746ce4a30 [automerger skipped] Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev am: eeb7b8088a -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 b55d314f46 is already in history

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

Change-Id: Idb9fa3da460f60289aa7269c509d49ad22ccd60e
2021-08-11 03:51:10 +00:00
Sudheer Shanka
9769bbeeca [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours am: 113ecdc386 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I6b2830a0ff743222bf350c619dc7f2e57c92f279
2021-08-11 03:46:50 +00:00
Sudheer Shanka
7b68389397 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: I7da86dee11bfad7617935e6ffd7a72eb310123a7
2021-08-11 03:46:34 +00:00
Rhed Jao
eeb7b8088a Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev 2021-08-11 03:39:57 +00:00
Sudheer Shanka
113ecdc386 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours am: 4cbe7fc6f8 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: If0b3fb71bb0cca6bc14162466377578f33831fba
2021-08-11 03:27:46 +00:00
Sudheer Shanka
776b171548 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: I8069195c84a12e0ac61c4f8a3dd8ac359c79dc83
2021-08-11 03:27:42 +00:00
Sudheer Shanka
4cbe7fc6f8 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I89d30316f751650584ccb849d018ffed621b5c6e
2021-08-11 03:11:29 +00:00
Sudheer Shanka
a7d40af8a5 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: I75e673c695d4e91409ae09ae14f54726b7b2cd68
2021-08-11 03:11:15 +00:00
Sudheer Shanka
0e04f5ea34 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours am: d44234aea4 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: Id67b8c2fa6c309edf421e65f6619961de041edce
2021-08-11 03:11:09 +00:00
Sudheer Shanka
c1b3a16c94 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours am: 6c8bcd9dd4 -s ours am: ec27887633 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: I8b336942ac4ec98eb16fb1fd91c43670b501bf1e
2021-08-11 03:11:05 +00:00
Sudheer Shanka
f305cf08ee [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev am: 0925f07c25 am: 8252fb118c -s ours am: 77547e1deb -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: Ic8961fad98f46c8d0f7fc4082e837133ca0a7b51
2021-08-11 03:11:02 +00:00
Sudheer Shanka
d44234aea4 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: If25f54c6813f6afb09ca7766de8b816e477268b0
2021-08-11 02:56:41 +00:00
Sudheer Shanka
ec27887633 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours am: 6c8bcd9dd4 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: I89297b3cbdfc3ae1de551365341208faf8b740fe
2021-08-11 02:56:31 +00:00
Sudheer Shanka
afeb24ebbd [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I3c09c148a9bdebce36144b1f779d9f726127ea4e
2021-08-11 02:56:07 +00:00
Sudheer Shanka
b95ca39e29 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301703

Change-Id: I56e45bdc455fe62f0f26a4e49b35deaab56206b0
2021-08-11 02:56:07 +00:00
Sudheer Shanka
77547e1deb [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev am: 0925f07c25 am: 8252fb118c -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: If808dcb75c3429ef8e36e771a3e6f6c895d726ce
2021-08-11 02:56:06 +00:00
Sudheer Shanka
98adfca8a6 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev 2021-08-11 02:55:31 +00:00
Sudheer Shanka
e8426090a6 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev 2021-08-11 02:51:07 +00:00
Sudheer Shanka
b10d3c4609 Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev 2021-08-11 02:44:06 +00:00
Sudheer Shanka
6c8bcd9dd4 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: Id153e2b3a60d15cb9e0098ec6a41198874d04c5a
2021-08-11 02:43:12 +00:00
Sudheer Shanka
29c9f61d92 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-dev am: bcb801ef06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301701

Change-Id: I5e6f25fe3b29fd548408f115e064c7e27ff67c6c
2021-08-11 02:40:22 +00:00
Sudheer Shanka
994735d6c4 Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev am: 9c8226caab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15053177

Change-Id: Id4da32ee1585d2b747a7a0ab2188ba3304a17970
2021-08-11 02:39:52 +00:00
Sudheer Shanka
c7ee5074b3 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: I8815ce52e7db701ab389abd023ed546c4ee5b1fb
2021-08-11 02:39:46 +00:00
Sudheer Shanka
8252fb118c Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev am: 0925f07c25
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15053176

Change-Id: I09a0140925f7c851ff64a131c5ad233161b91625
2021-08-11 02:39:23 +00:00
Sudheer Shanka
df8ca125d6 Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev 2021-08-11 02:29:11 +00:00
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
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
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
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
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