Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
419,512 Commits 3 Branches 0 Tags
a7d40af8a5573d32f555ff0121b11622c1fce8a0
Commit Graph

419512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
0925f07c25 Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev 2021-08-11 02:27:05 +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
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
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
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
93e157955a Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev 2021-08-09 15:12:22 +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
Rhed Jao
b55d314f46 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-02 22:46:59 +08:00
Dave Mankoff
55cd8952c0 Guard DISABLE_PLUGIN with PLUGIN permission. 
Fixes a p0 security bug. We already have the plugin permission
defined in our manifest. Ensure that senders of the DISABLE_PLUGIN
broadcast have that permission.

Bug: 193444889
Test: manual
Change-Id: Iebaba435c17c5644c5357c0683858447f5ffb897
Merged-In: Iebaba435c17c5644c5357c0683858447f5ffb897
 2021-07-22 13:06:57 +00:00
Dave Mankoff
c279a42a3f Guard DISABLE_PLUGIN with PLUGIN permission. 
Fixes a p0 security bug. We already have the plugin permission
defined in our manifest. Ensure that senders of the DISABLE_PLUGIN
broadcast have that permission.

Bug: 193444889
Test: manual
Change-Id: Iebaba435c17c5644c5357c0683858447f5ffb897
Merged-In: Iebaba435c17c5644c5357c0683858447f5ffb897
 2021-07-22 13:04:01 +00:00
Dave Mankoff
de779f8124 Guard DISABLE_PLUGIN with PLUGIN permission. 
Fixes a p0 security bug. We already have the plugin permission
defined in our manifest. Ensure that senders of the DISABLE_PLUGIN
broadcast have that permission.

Fixes: 193444889
Test: manual
Change-Id: Iebaba435c17c5644c5357c0683858447f5ffb897
Merged-In: Iebaba435c17c5644c5357c0683858447f5ffb897
 2021-07-21 16:46:28 +00:00
Sudheer Shanka
ad79043436 Add SafetyNet logging if a certain broadcast is received by apps. 
In case the broadcast intents "com.android.server.net.action.SNOOZE_WARNING"
or "com.android.server.net.action.SNOOZE_RAPID" are dispatched to apps,
then add a SafetyNet log.

Bug: 177931370
Test: manual
Change-Id: I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a
Merged-In: I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a
(cherry picked from commit a22e341ac2)
 2021-07-15 18:04:32 +00:00
Sudheer Shanka
452a5aeec5 Add SafetyNet logging if a certain broadcast is received by apps. 
In case the broadcast intents "com.android.server.net.action.SNOOZE_WARNING"
or "com.android.server.net.action.SNOOZE_RAPID" are dispatched to apps,
then add a SafetyNet log.

Bug: 177931370
Test: manual
Change-Id: I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a
Merged-In: I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a
(cherry picked from commit a22e341ac2)
 2021-07-15 18:04:10 +00:00
Bernardo Rufino
22500563c1 Merge "Fix background bypass via notifications" into qt-dev 2021-06-30 07:18:28 +00:00
John Reck
92ed82502c Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455f2 am: 2e440eb0a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

Change-Id: I609ab85f2e6bec6496d2badd6df4554acb6033f0
 2021-06-29 20:04:44 +00:00
Dmitry Dementyev
1d8503c538 Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b152 am: c9fdb5f38e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15016192

Change-Id: I9958960adcd72f402c545763ff89b67fb0af66a1
 2021-06-29 20:04:26 +00:00
John Reck
2e440eb0a8 Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

Change-Id: Iedc452ae575a64585eab01961815f35a62b52f06
 2021-06-29 19:51:01 +00:00
Dmitry Dementyev
c9fdb5f38e Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b152 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15016192

Change-Id: I6aca96a54021efb9d212dbb18490482b11f60f5e
 2021-06-29 19:50:37 +00:00
John Reck
61cf6455f2 Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev 2021-06-29 19:40:18 +00:00
Dmitry Dementyev
aaccd1b152 Merge "Change ownership of the account request notification." into oc-mr1-dev 2021-06-29 19:35:04 +00:00
John Reck
6a154c0cb5 Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880619

Change-Id: I2ad0fcf011f79460eed5543c6a67459dbeb57005
 2021-06-29 18:08:28 +00:00
TreeHugger Robot
7253e1ee9f [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev am: 075e4bbbb2 -s ours am: cbe9be1eec -s ours 
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 49be6ee46a is already in history

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

Change-Id: I82cb298e3f981311ca629ab7b95d6ccfcfa95bad
 2021-06-29 18:08:18 +00:00
TreeHugger Robot
f5dd6374a3 [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865c9 -s ours 
am skip reason: skipped by user steell

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

Change-Id: I782a41de18ca5edf5125a8cab441bfd1420a6041
 2021-06-29 18:07:48 +00:00
John Reck
547df6be1e Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev 2021-06-29 16:47:21 +00:00
John Reck
78e73d3f3b Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev 2021-06-29 16:47:18 +00:00
Jayant Chowdhary
8a11538146 camera2: Fix exception swallowing in params classes createFromParcel 
Do not catch exceptions when we attempt to create the following classes
from a parcel
- OutputConfiguration
- VendorTagDescriptor
- VendorTagDescriptorCache
- SessionConfiguration
This could cause subsequent parcel information to be read incorrectly.

Bug: 188675581

Test: Sample app which tries to write invalid data into an
      OutputConfiguration parcel to send in an intent via Broadcast. When read by the receiving app,
      gets an exception (not swallowed).

Merged-In: I745ca49daa6ca36b1020d518e9f346b52684f2b1
Change-Id: I745ca49daa6ca36b1020d518e9f346b52684f2b1
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 6b0bcd60c8)
 2021-06-29 01:08:28 +00:00
Jayant Chowdhary
7bf30cb92a camera2: Fix exception swallowing in params classes createFromParcel 
Do not catch exceptions when we attempt to create the following classes
from a parcel
- OutputConfiguration
- VendorTagDescriptor
- VendorTagDescriptorCache
- SessionConfiguration
This could cause subsequent parcel information to be read incorrectly.

Bug: 188675581

Test: Sample app which tries to write invalid data into an
      OutputConfiguration parcel to send in an intent via Broadcast. When read by the receiving app,
      gets an exception (not swallowed).

Merged-In: I745ca49daa6ca36b1020d518e9f346b52684f2b1
Change-Id: I745ca49daa6ca36b1020d518e9f346b52684f2b1
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 6b0bcd60c8)
 2021-06-28 20:32:50 +00:00
TreeHugger Robot
976266733d Merge "Don't attach private Notification to A11yEvent when user locked" into qt-dev 2021-06-28 20:25:15 +00:00
TreeHugger Robot
cbe9be1eec [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev am: 075e4bbbb2 -s ours 
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 49be6ee46a is already in history

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

Change-Id: I67ce55ca0045d686f8f3850ff7467e3568c0187b
 2021-06-28 19:09:51 +00:00
TreeHugger Robot
075e4bbbb2 Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev 2021-06-28 18:50:57 +00:00
TreeHugger Robot
fa06b865c9 Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev 2021-06-28 18:39:50 +00:00
TreeHugger Robot
afd2af6f87 [automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours am: 41378ed286 -s ours 
am skip reason: skipped by user nona

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

Change-Id: I4718eb293f114399a708b4fb4a71274567a7f4f5
 2021-06-26 19:27:07 +00:00
TreeHugger Robot
41378ed286 [automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours 
am skip reason: skipped by user nona

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

Change-Id: Ie41a7f83f27194050fca526b5ac62e94c559c5ac
 2021-06-26 19:11:21 +00:00
TreeHugger Robot
2a43ff54e6 Merge "Improve ellipsize performance" into pi-dev am: bb487c3233 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14905054

Change-Id: Iff5983577266bd350db57121fdcf5b3ab8f1f51b
 2021-06-26 02:38:04 +00:00
TreeHugger Robot
819dc46ad3 Merge "Improve ellipsize performance" into qt-dev 2021-06-26 02:36:19 +00:00