Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
499,647 Commits 3 Branches 0 Tags
e13c6379fbd58f5992f61ba6ca0d7ad58bc7716f
Commit Graph

499647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
e13c6379fb Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: Ia131a4e9679f0aa1e0a3f508cf98383f4f27be21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 13:06:31 +00:00
TreeHugger Robot
539fea38c2 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I7a377d2787cb077e3d717558da0b21e297699112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 12:36:21 +00:00
TreeHugger Robot
676cefb0ee Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I3bf51cd6e7046c7e128f1008ed830c5e02603f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 12:05:20 +00:00
TreeHugger Robot
62044e5099 Merge "Stop managed profile owner granting READ_SMS" into qt-dev 2022-10-08 11:41:10 +00:00
Hao Ke
c3cde6206d Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 am: ac02d51ea3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: Ia84e89e68912e5e11c38ebb3afa8258b9143491b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 20:35:15 +00:00
Hao Ke
ac02d51ea3 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: I8ebe172f9d76d5b21e3beb0f99b36189511fc71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 20:05:33 +00:00
Hao Ke
64e4cbc1d8 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: I38314b7569ac5e5fbdffc43b734ec996178e7c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 19:29:54 +00:00
Hao Ke
459808b2c0 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev 2022-10-05 18:40:44 +00:00
Rhed Jao
3d7a421abf [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours am: 886fab1952 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifaedeab25092163958160adb1715e20f9a4e89d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:10:22 +00:00
Rhed Jao
83ca24a005 [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours am: 0de1dbc4f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4c575780940c4d20cc1241ee15acd390a73c398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 02:10:03 +00:00
Rhed Jao
886fab1952 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6acb4026cb6b949dd5158a84274fe539306480cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:10:04 +00:00
Rhed Jao
0de1dbc4f4 [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f13363fb41ece156b858755174244cc875d5099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:09:40 +00:00
Rhed Jao
806167eda3 Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305

Change-Id: I8657b8b6d1f46889a61d9ecd4af6e834df4ba544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:43:47 +00:00
Rhed Jao
cd6e9585b9 [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305

Change-Id: I717dc0210b91048ac79afb2ef0d22dc9a266802f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:43:40 +00:00
Rhed Jao
6fa037454b Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev am: 32a7d30650 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061344

Change-Id: Id28a913c468097ffbdb5a8ac3f65d83f21e62be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:42:30 +00:00
Rhed Jao
2246ebbdd2 [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 5e98f26759 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061344

Change-Id: I1037ef22c1d1204c4e45e484542ed27448094be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:42:12 +00:00
Rhed Jao
4727daddff Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev 2022-10-05 00:12:20 +00:00
Rhed Jao
32a7d30650 Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev 2022-10-05 00:12:02 +00:00
Hao Ke
eb9a0566a5 Add safety checks on KEY_INTENT mismatch. 
For many years, Parcel mismatch typed exploits has been using the
AccoungManagerService's passing of KEY_INTENT workflow, as a foothold of
launching arbitrary intents. We are adding an extra check on the service
side to simulate the final deserialization of the KEY_INTENT value, to
make sure the client side won't get a mismatched KEY_INTENT value.

Bug: 250588548
Bug: 240138294
Test: atest CtsAccountManagerTestCases
Test: local test, also see b/250588548
Change-Id: I433e34f6e21ce15c89825044a15b1dec46bb25cc
 2022-10-04 22:07:34 +00:00
Pinyao Ting
f552951850 Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227

Change-Id: I6f24475c941abe5046db5264af1ada1ec7c69da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-03 23:43:22 +00:00
Pinyao Ting
10033535fc [Do Not Merge] Ignore malformed shortcuts am: a8fe41afb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227

Change-Id: Iec12138fa01ed8ddb78a1d62307afd157d8060ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-03 23:43:13 +00:00
Pinyao Ting
9e3aecfce1 Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev 2022-10-03 23:10:14 +00:00
TreeHugger Robot
725961fbbf [automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours am: 2fcbfbf644 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e8c15a710b25ee3be43f66dfb87ff3ac934e83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-03 22:17:30 +00:00
Pinyao Ting
b74c7cbb9d [automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 am: f67179a1ff -s ours am: 0750f90369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I539ade65ec5fd83412a2df04fdc6e780f1e5832b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-03 22:17:17 +00:00
TreeHugger Robot
2fcbfbf644 [automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I519e92f1b6ed06675d1c3bea1ee817f05e1ee241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-03 21:33:29 +00:00
Pinyao Ting
0750f90369 [automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 am: f67179a1ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I660704085d0f838fc10ab1a280262c86faf41c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-03 21:33:09 +00:00
TreeHugger Robot
de5113eebd Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225

Change-Id: If25d47e0bf3f6b5fd6d33dcdd57e82e5475ba893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-03 21:05:51 +00:00
Pinyao Ting
f67179a1ff [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225

Change-Id: I4591ed42f0af65bab2679fdc99aa824b28ba0a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-03 21:05:36 +00:00
TreeHugger Robot
8a2baf4e16 Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev 2022-10-03 20:23:07 +00:00
Matt Pietal
e32da18b5e [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf19ede4651fb9f6187c4bac9f5b844061d438fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:53:46 +00:00
Matt Pietal
feba47c36a [automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia105005b59b08288288fd1cfc7e139080fa8df00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:53:24 +00:00
Matt Pietal
974a8471ea [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a7ec8e03a49993aa99f2b8317755b1569e70b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:24:54 +00:00
Matt Pietal
4b70b75d1c [automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6b7f47d6cdb87b4861b925a1fa0a2db742632b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:24:30 +00:00
Matt Pietal
4f404a5015 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040

Change-Id: Id5d34e9689120d991ca8904938c38c81cd018ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 13:57:36 +00:00
Matt Pietal
d78f1693ef [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040

Change-Id: Ie7874f87fa568f76047a9e08dae3d406b7b565f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 12:52:00 +00:00
Matt Pietal
2663e8aa43 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev 2022-09-27 19:25:13 +00:00
Matt Pietal
2fdf59ef45 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc38a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952038

Change-Id: Ic5a7614e9843dbb20f563eb518c761762bf47204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:42:37 +00:00
Matt Pietal
dc0ba857f2 [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc2146966b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952038

Change-Id: I18ee62f32bf7c7364ad5e88643a6cd3ac7f8eb71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:42:26 +00:00
Matt Pietal
d7710fc38a Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev 2022-09-27 18:05:36 +00:00
Rhed Jao
4d13148a3f [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting 
Do not update invalid component enabled settings to prevent the
malicious apps from exhausting system server memory.

Bug: 240936919
Test: atest android.security.cts.PackageManagerTest
Change-Id: I08165337895e89f13a2b9fcce1201cba9ad13d7d
 2022-09-27 03:33:09 +00:00
Rhed Jao
5e98f26759 [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting 
Do not update invalid component enabled settings to prevent the
malicious apps from exhausting system server memory.

Bug: 240936919
Test: atest android.security.cts.PackageManagerTest
Change-Id: I08165337895e89f13a2b9fcce1201cba9ad13d7d
 2022-09-27 03:25:50 +00:00
Jeff Chang
86138c26fd Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761

Change-Id: I4ee9fc257692776e5dbd465f217ca9d10e693892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:12:38 +00:00
Jeff Chang
ef00451cc5 [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761

Change-Id: Ib96e68b166f745d709300479aab5cc5af0da6722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:12:35 +00:00
Jeff Chang
d667038512 Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev 2022-09-26 01:43:42 +00:00
Pinyao Ting
1dd381ac4a Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8bf4 am: f90c770087 am: af809557f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20026360

Change-Id: I1dd4b4346229303d1e959ad06c98eb49a289e807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 21:15:00 +00:00
Pinyao Ting
af809557f8 Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8bf4 am: f90c770087 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20026360

Change-Id: I170c5947cf1aedce8dfd11a99132bcbb1a760b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 20:45:30 +00:00
Pinyao Ting
f90c770087 Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8bf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20026360

Change-Id: I153e3da4a1208d7f4bcd3818902993108f80a6a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 20:20:04 +00:00
Pinyao Ting
5a292b8bf4 Merge "Fix a security issue in app widget service." into qt-dev 2022-09-23 19:57:23 +00:00
Julia Reynolds
6a00b13417 Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: Ife4aed80f3989498a14433f5249a4d6d9aabd943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 20:27:04 +00:00
Julia Reynolds
bdb417dc04 Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: Ic90281a2476860b6d7537162f1921c2a31e8b206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 19:57:45 +00:00