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
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
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
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
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
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
Dave Mankoff
70a5657935
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -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: Iaa43cc4773165cd15b16f9f072977bc0b7feb01a
2021-08-10 21:08:46 +00:00
Dave Mankoff
58dcd2c312
Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev
2021-08-10 20:35:05 +00:00
Dave Mankoff
804799ae8a
[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 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: If3dd19e9e31586eb5e63c87045016f8aa17c4a1b
2021-08-10 19:31:18 +00:00
Dave Mankoff
5a382b6915
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours
...
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358519
Change-Id: I5456f1058281600aa81241000d2a5e8530815126
2021-08-10 19:31:00 +00:00
Dave Mankoff
6db47d2d58
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -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: I31df5dd17183ecaf75a8ee8c0a64b201dc29992b
2021-08-10 19:19:20 +00:00
Dave Mankoff
47d2f291e3
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -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: I2ae8d9dadf42dea7071e2ac23f00d4ed3333660d
2021-08-10 19:11:47 +00:00
Dave Mankoff
0122320cb2
Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358519
Change-Id: Ic923b993f8bff5b5fa2c5f32f91e4787b8c21e18
2021-08-10 19:11:11 +00:00
Dave Mankoff
15336c87fa
Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev
2021-08-10 18:58:52 +00:00
Dave Mankoff
b279744b70
Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev
2021-08-10 18:58:36 +00:00
Dave Mankoff
af9ebd49b1
Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev
2021-08-10 14:10:32 +00:00
Jayant Chowdhary
8d6dbba160
[automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours am: 0965418bf9 -s ours
...
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188
Change-Id: I489bd4243d2e29ac2828869e52649704dd6ca504
2021-08-10 01:33:26 +00:00
Jayant Chowdhary
0965418bf9
[automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours
...
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188
Change-Id: I02f81e3e2cdcdea15423fe4195a969e689eba0bd
2021-08-10 01:22:59 +00:00
Jayant Chowdhary
d3894cef1b
[automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours
...
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188
Change-Id: I8d25192a502857ac4d10bfdfe17cdacbbdfde64b
2021-08-10 01:06:13 +00:00
Jayant Chowdhary
250fe56a43
Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188
Change-Id: I5b6f88fae24d84d5ca766e9dc3ef8863b7d35f9c
2021-08-10 00:41:08 +00:00
Jayant Chowdhary
b8ce7ca6a1
Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev
2021-08-10 00:28:42 +00:00
Jayant Chowdhary
3c93e01ccf
Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727
Change-Id: I1adb4fa9ae369c1eabbd3fcbdac7abf4425743bb
2021-08-09 15:30:32 +00:00
Jayant Chowdhary
0cf6fdb791
Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727
Change-Id: Id144b968bf5154f806900e030d2b7bd9ba407c67
2021-08-09 15:20:58 +00:00
Jayant Chowdhary
93e157955a
Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev
2021-08-09 15:12:22 +00:00
Rhed Jao
be3551edad
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: I4b111020f744352b96f9efb282bdd382d6d70969
2021-08-09 08:29:03 +00:00
Rhed Jao
576965b06d
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15444548
Change-Id: I5af44fd797016e20eaf936ccc9ce2b41ce8dc0a6
2021-08-09 08:28:38 +00:00
Rhed Jao
0f553a5f64
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: I1dd2d666977647ea2051483dec7b47730dbfdae1
2021-08-09 08:11:39 +00:00
Rhed Jao
96254f92a5
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15444548
Change-Id: I4a5ee088ae4b68c695d6c6a3f93034176d8f06eb
2021-08-09 08:11:10 +00:00
Rhed Jao
2159ba8c04
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: I05098a0d0a5a0d3dc97a8788358febcd5d4ad7b8
2021-08-09 07:46:15 +00:00
Rhed Jao
8cd4647906
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15444548
Change-Id: I149a6db2a8594e7d3a6f9a64782c7dd44654ca3c
2021-08-09 07:45:56 +00:00
Rhed Jao
d5b3601177
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: Ieadb3841c95274b877281caaef777273e1592e14
2021-08-09 07:45:08 +00:00
Rhed Jao
7380c153b9
DO NOT MERGE Apply a maximum char count to the load label api
...
The system is overwhelmed by an enormous label string returned by
the load label api. This cl truncates the label string if it exceeds
the maximum safe length.
Also update the max safe label length to 1000 characters, which is
enough.
Bug: 67013844
Test: atest PackageManagerTest
Change-Id: Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd
Merged-in: Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd
2021-08-03 14:00:18 +08:00