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

499802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuri Lin
543b401329 Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-qpr-dev 2022-11-08 20:09:29 +00:00
Yuri Lin
aad71ae8d8 Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-qpr-dev 2022-11-08 20:09:29 +00:00
Yuri Lin
7c0ae1bdcc [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" 
This reverts commit df439a438f.

Reason for revert: broke DND schedules in multi-user mode b/257477671

Change-Id: I74c6f92c5026424d644569b3829ad47aed3b0920
 2022-11-07 19:08:15 +00:00
Yuri Lin
9631f58f21 [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" 
This reverts commit 2ceaaebb3c.

Reason for revert: broke DND schedules in multi-user mode b/257477671

Change-Id: I5b0b521c15a86a67a7aad8692a532026d2670088
 2022-11-07 19:07:55 +00:00
Winson Chung
99f48340ac Merge "Ensure that only SysUI can override pending intent launch flags" into qt-dev am: c741c6211c am: 41bf4e7cba am: 7adf19f3fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20219552

Change-Id: Ic7c18fc4fa02b79d3fad18653e4c2e9ad424ea12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-05 01:13:23 +00:00
Winson Chung
7adf19f3fa Merge "Ensure that only SysUI can override pending intent launch flags" into qt-dev am: c741c6211c am: 41bf4e7cba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20219552

Change-Id: Iba23d44134c5a1b885a7a9a8b89918d7523624c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-05 00:28:42 +00:00
Winson Chung
41bf4e7cba Merge "Ensure that only SysUI can override pending intent launch flags" into qt-dev am: c741c6211c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20219552

Change-Id: Idfd4de223a64d7b8008e2dd09a903f58169c0c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 23:46:08 +00:00
Winson Chung
c741c6211c Merge "Ensure that only SysUI can override pending intent launch flags" into qt-dev 2022-11-04 23:19:05 +00:00
TreeHugger Robot
69b752610f [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours am: ec86264fcb -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: Ie2a00cb2c288b532b0aae0817f05f18a514e04a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 23:33:41 +00:00
TreeHugger Robot
ec86264fcb [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: I7a391127593cc6a8014ed6cd4593ed5e4bd6ce06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 23:03:52 +00:00
TreeHugger Robot
3f2358892f [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: I1192bdd5e99ad44ef0b74793b5c2148848bb9fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 22:37:23 +00:00
TreeHugger Robot
1eeb1758fd Merge "Enable user graularity for lockdown mode" into qt-dev 2022-11-01 21:54:57 +00:00
Wenhao Wang
f6f4800b6c [automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-dev am: abf1cfa4ec -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: I73200537783a979a3eabb3bfadd54a39082198dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 19:52:43 +00:00
Wenhao Wang
d314c8c718 [automerger skipped] Enable user graularity for lockdown mode am: 5e40f39f5b -s ours 
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history

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

Change-Id: I61c754cc210e32aad9c453c0e468e2ce2671ed82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 19:52:34 +00:00
Wenhao Wang
abf1cfa4ec Merge "Enable user graularity for lockdown mode" into rvc-dev 2022-11-01 19:23:47 +00:00
Wenhao Wang
5a1a9ba40a Merge "Enable user graularity for lockdown mode" into rvc-qpr-dev 2022-11-01 19:23:40 +00:00
David Saff
b1f9159e57 [automerger skipped] DO NOT MERGE: Ignore flaky setup failures in qt-dev am: f83cd419e5 am: 02e202676b -s ours am: d5f188fab8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I663782cc6e3ede7a4db1a269f0cb9c3b1b0e965f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:53:00 +00:00
David Saff
d5f188fab8 [automerger skipped] DO NOT MERGE: Ignore flaky setup failures in qt-dev am: f83cd419e5 am: 02e202676b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f018fe6a008937ac00df6454aa3144b3973bb17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 17:22:52 +00:00
David Saff
02e202676b DO NOT MERGE: Ignore flaky setup failures in qt-dev am: f83cd419e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20292026

Change-Id: I090cda5c061996e354c3cb3b1201ad4b163c5669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 16:54:46 +00:00
Liahav Eitan
eec74eb462 Merge "Fix sharing to another profile where an app has multiple targets" into rvc-dev am: 59a63e8062 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20256127

Change-Id: I96f7aaf1edac0904923f07127cccbe369650196d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 14:53:40 +00:00
Liahav Eitan
59a63e8062 Merge "Fix sharing to another profile where an app has multiple targets" into rvc-dev 2022-10-31 13:53:41 +00:00
David Saff
f83cd419e5 DO NOT MERGE: Ignore flaky setup failures in qt-dev 
Bug: 255797461
Test: See forrest run in bug
Change-Id: Ie0b15636edb2210b44a9b96edc267ea7271cc939
 2022-10-31 13:52:37 +00:00
Khoa Hong
201de8b179 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed." into qt-dev am: 9b0f39acfb am: bee6932774 -s ours am: 5a530a5695 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad75feb6cf2de56cea4f890e72017bd4124a28a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 05:19:32 +00:00
Khoa Hong
960dc0eb12 [automerger skipped] [RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed. am: 7a8d56b2fe am: 271b7fa23c -s ours am: ac571d29c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa21fe11c284c42db082ae9cc904e4ca6cfcd55c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 05:19:26 +00:00
Khoa Hong
5a530a5695 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed." into qt-dev am: 9b0f39acfb am: bee6932774 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1986b58fcd5cb17de1937774c39321bfe176f956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 04:34:59 +00:00
Khoa Hong
ac571d29c5 [automerger skipped] [RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed. am: 7a8d56b2fe am: 271b7fa23c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54c122f683c6d7b2be8fe0837ed6d2685d2788bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 04:34:43 +00:00
Khoa Hong
bee6932774 Merge "[RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed." into qt-dev am: 9b0f39acfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20234866

Change-Id: I2c8358a6ea996ce69435832d758d5207bdaf1f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 04:08:40 +00:00
Khoa Hong
271b7fa23c [RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed. am: 7a8d56b2fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20234866

Change-Id: Ib21057b8df8c9d5ad4719de60e9db7fb88765046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 04:08:37 +00:00
Khoa Hong
a4ebf141dc Merge "Add protections against queueing a UsbRequest when the underlying UsbDeviceConnection is closed." into rvc-dev am: 046dc1b7b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20210471

Change-Id: I3266c0e101adbdd450e8f2ced8ceacec771e45d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 04:06:41 +00:00
Khoa Hong
046dc1b7b2 Merge "Add protections against queueing a UsbRequest when the underlying UsbDeviceConnection is closed." into rvc-dev 2022-10-31 03:24:25 +00:00
Khoa Hong
9b0f39acfb Merge "[RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed." into qt-dev 2022-10-31 03:24:09 +00:00
Nate Myren
86124f2a83 [automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev am: d38c2bc0ce am: 28c85af5dd -s ours am: 527e832744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3c4a2d0265e068c0bd79b89d5598f79ae119ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 23:32:09 +00:00
Nate Myren
b86e0b967a [automerger skipped] RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am: f6ba142a84 am: 33b93dc60c -s ours am: 7da50b5652 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35e1c64bdcf2420d82710fa0af9bd8d243e1ba33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 23:31:55 +00:00
Nate Myren
527e832744 [automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev am: d38c2bc0ce am: 28c85af5dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I403b8e6d6701e3d20e1a21cc7d7465e36e5c56bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 22:48:12 +00:00
Nate Myren
7da50b5652 [automerger skipped] RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am: f6ba142a84 am: 33b93dc60c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59d6472b447c9be711251ecc6acffd15954673b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 22:47:58 +00:00
Nate Myren
28c85af5dd Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev am: d38c2bc0ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20122955

Change-Id: I9dbd8dca6329ba47b343410c45bf4c529920eab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 22:20:42 +00:00
Nate Myren
33b93dc60c RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am: f6ba142a84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20122955

Change-Id: I648f48d3a0395b64bdb4119074dcfb2f104386ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 22:20:30 +00:00
Nate Myren
104d33007e Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into rvc-dev am: 6664a27f76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105226

Change-Id: I74d97d8f2f108e9f5b4ab192fe5550b2debac478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 22:18:48 +00:00
Nate Myren
6e14c5cfbe RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am: 14551ab6d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105226

Change-Id: I194d02c57d7f5cd2704ddd9035867e8b8da49707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 22:18:30 +00:00
Nate Myren
d38c2bc0ce Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev 2022-10-28 21:27:28 +00:00
Nate Myren
6664a27f76 Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into rvc-dev 2022-10-28 21:06:40 +00:00
Nate(Qiang) Jiang
70adad45d4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Passpoint Add more check to limit the config size" into rvc-dev am: 0185f5fc5d -s ours 
am skip reason: Merged-In I97522ce3607547c10025caa107cd1a40455a9c5d with SHA-1 b6d7849df2 is already in history

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

Change-Id: I459476e33532a257cd425e7409d9ca2798af6237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 17:02:01 +00:00
Nate(Qiang) Jiang
83200cef50 [automerger skipped] [RESTRICT AUTOMERGE] Passpoint Add more check to limit the config size am: e1a80210f3 -s ours 
am skip reason: Merged-In I97522ce3607547c10025caa107cd1a40455a9c5d with SHA-1 b6d7849df2 is already in history

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

Change-Id: I867b77aad31e6ca3ea86b6473e34461052c589b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 17:01:51 +00:00
Nate(Qiang) Jiang
0185f5fc5d Merge "[RESTRICT AUTOMERGE] Passpoint Add more check to limit the config size" into rvc-dev 2022-10-28 16:20:28 +00:00
Nate(Qiang) Jiang
6c7d0c518a Merge "[RESTRICT AUTOMERGE] Passpoint Add more check to limit the config size" into rvc-qpr-dev 2022-10-28 16:20:17 +00:00
TreeHugger Robot
b4b3e02753 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev am: 191036a989 am: 70536c0199 -s ours am: bdf427e3a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b1af58b9281bb24a9de37900c09dc7c4012851a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 02:52:24 +00:00
Louis Chang
fc4753847a [automerger skipped] [RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege am: 9c19841384 am: 7db5e05361 -s ours am: d6e2a72bbb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f2b9b50c286341b72ee9bb6f9b1a4ea41b757ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 02:52:05 +00:00
TreeHugger Robot
bdf427e3a0 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev am: 191036a989 am: 70536c0199 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I967740e2fa3ac29db50b714ed9c750060d2d3d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 02:18:35 +00:00
Louis Chang
d6e2a72bbb [automerger skipped] [RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege am: 9c19841384 am: 7db5e05361 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92e556ef06b8e7a15d1fcd231e1fdcb3aee9d2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 02:18:14 +00:00
TreeHugger Robot
70536c0199 Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev am: 191036a989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219

Change-Id: I076b7d224f3502d95b7a8e2021489ed12f562ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 01:30:18 +00:00