Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
483,178 Commits 3 Branches 0 Tags
7d9c55fd150c39a488f082bfa6be008b73037465
Commit Graph

483178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
7d9c55fd15 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours 
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

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

Change-Id: I6ca536a1e387ab2df802df9bfb4ed2e504154ddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 19:01:51 +00:00
Julia Reynolds
f1c5754b97 Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: Ida57571c08e6c1be93b7b70adff8fce3759c109a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 18:44:15 +00:00
Julia Reynolds
04ccf69df1 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev 2022-08-23 18:41:17 +00:00
Julia Reynolds
c2d264989a Limit the size of NotificationChannel and NotificationChannelGroup 
Test: android.app.NotificationChannelGroupTest
Test: android.app.NotificationChannelTest
Test: cts NotificationChannelTest
Test: cts NotificationChannelGroupTest
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I0925583ab54d6c81c415859618f6b907ab7baada
Merged-In: I0925583ab54d6c81c415859618f6b907ab7baada
(cherry picked from commit 3850857cb0)
 2022-08-23 13:22:33 +00:00
TreeHugger Robot
87755b712a [automerger skipped] [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b23 am: a8fe3a8f50 -s ours 
am skip reason: Merged-In I62a875e26e214847ec72ce3c41b4f2fa8e597e07 with SHA-1 a367c0a16a is already in history

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

Change-Id: I5de4f2f5b016828231f035aa045a8faf3849d805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 21:30:32 +00:00
Julia Reynolds
6d417539d7 Limit the size of NotificationChannel and NotificationChannelGroup 
Test: android.app.NotificationChannelGroupTest
Test: android.app.NotificationChannelTest
Test: cts NotificationChannelTest
Test: cts NotificationChannelGroupTest
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I0925583ab54d6c81c415859618f6b907ab7baada
(cherry picked from commit 3850857cb0)
 2022-08-22 17:27:35 +00:00
TreeHugger Robot
a8fe3a8f50 [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19607760

Change-Id: I62ba986987ba4f490177e2e5bc4c981a8f4a8fe7
Merged-In: I62a875e26e214847ec72ce3c41b4f2fa8e597e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:22:44 +00:00
Iván Budnik
c4d258d8b1 Merge "Enforce ComponentName belongs to caller app" into rvc-dev 2022-08-22 12:07:16 +00:00
TreeHugger Robot
dedf573b23 Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev 2022-08-20 02:34:14 +00:00
Daniel Norman
f914ec1768 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev 2022-08-19 21:35:32 +00:00
Ganesh Olekar
26f72ff555 [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9581db45a6bbf1233af5b30be6dfc0ec1b2feec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 11:24:20 +00:00
Ganesh Olekar
e37a0ac9f8 DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 
Test: Manually install app apks targeting Q and verifying that AR permission is not auto-granted
Test: atest ActivityRecognitionPermissionTest
Bug: 210065877
Change-Id: I90adf45a6611ab8bc953765c72af77a6a4f7aae8
(cherry picked from commit 84b1160cfc)
 2022-08-15 10:47:16 +00:00
Ganesh Olekar
0f8fc1a47e [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic974d67a09adfde7137fac9d90b67d69f38133a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 09:55:28 +00:00
Ganesh Olekar
6732f3304f [automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7d552e9ede491bff1daf95515eea4d5b04e7cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 09:55:04 +00:00
Ganesh Olekar
dc45b9fed3 Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: I782fb9a0fe395df6413d543b27812112a531cfea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 09:38:09 +00:00
Ganesh Olekar
0a761a9510 [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410

Change-Id: I439bf33ed4be4f0bf2439f5565b57c9bdc398504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-15 06:35:33 +00:00
Ganesh Olekar
e893eff6f2 Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev 2022-08-15 06:08:20 +00:00
Louis Chang
34f726089c Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev 2022-08-15 00:21:27 +00:00
Daniel Norman
18f2ec86d6 Do not send AccessibilityEvent if notification is for different user. 
Bug: 237540408
Test: BuzzBeepBlinkTest#testA11yCrossUserEventNotSent
Change-Id: I62a875e26e214847ec72ce3c41b4f2fa8e597e07
Merged-In: I62a875e26e214847ec72ce3c41b4f2fa8e597e07
 2022-08-12 19:44:08 +00:00
Daniel Norman
a367c0a16a Do not send AccessibilityEvent if notification is for different user. 
Bug: 237540408
Test: BuzzBeepBlinkTest#testA11yCrossUserEventNotSent
Change-Id: I62a875e26e214847ec72ce3c41b4f2fa8e597e07
 2022-08-12 19:36:22 +00:00
TreeHugger Robot
192f2e6360 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37fb6ef29c8bf945b2d2201b71d18a8589effcf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:49:35 +00:00
Louis Chang
b38b3eaccb [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9334f8f8223d74767a6ae95f5e74a8c9abebfd0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:49:12 +00:00
TreeHugger Robot
b302dca798 Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948

Change-Id: I04e528e35f4c860b0f989e7c3e063a9bc5e23cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:17:37 +00:00
Louis Chang
53c6a79cfd [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948

Change-Id: I298a415227f87fa71a196cfad35c88319f265e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:17:21 +00:00
TreeHugger Robot
750c978db5 Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev 2022-08-11 15:41:19 +00:00
Louis Chang
b9a9340645 [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 
The new Intent was delivered to a non-exported activity while
#navigateUpTo was called from an Activity of a different uid.

Bug: 238605611
Test: atest StartActivityTests
Change-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
 2022-08-11 02:03:47 +00:00
Louis Chang
834812c423 [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 
The new Intent was delivered to a non-exported activity while
#navigateUpTo was called from an Activity of a different uid.

Bug: 238605611
Test: atest StartActivityTests
Change-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
 2022-08-11 02:03:07 +00:00
Yuri Lin
4d015c710d Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev 
* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
 2022-08-11 01:32:32 +00:00
Yuri Lin
fa7e3ae758 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e am: b618fee451 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Idd8503674a3bae4d09df32d8668866e3e317af62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:21:20 +00:00
Julia Reynolds
b953b5eff6 Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19202448

Change-Id: I30d2f72da503892d245bbedf27f2395f8640923d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:21:02 +00:00
Julia Reynolds
8e552b10c7 [automerger skipped] Store DND rule owners am: eda171cffa am: 1eaa443544 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Ic9774cd49158e32f7b4e42b1ee410580e8d8ce86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:20:44 +00:00
Yuri Lin
b618fee451 Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19117579

Change-Id: I031700a1b2592e1f647f2e727b26610a1e48268f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:27:02 +00:00
Julia Reynolds
8a021141ff Fix NPE when deleting old zen rules am: 7bb9cd92bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19202448

Change-Id: I5849b48a9a54f52c1bb7a8eafa9595c160577547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:51 +00:00
Julia Reynolds
1eaa443544 Store DND rule owners am: eda171cffa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19197499

Change-Id: I9014b79735494dd9ea763ec18490bb2b12b6ecf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:47 +00:00
Yuri Lin
718c21f25e Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev 
* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
 2022-08-10 20:51:29 +00:00
TreeHugger Robot
276cf3586d [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092 am: 3ff00b522f -s ours 
am skip reason: skipped by user tjstuart

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

Change-Id: Ie8f4ed29b1dae5a031e971a27009cf052e067d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 19:53:28 +00:00
Thomas Stuart
2f287743a4 Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev 2022-08-10 19:47:08 +00:00
TreeHugger Robot
3ff00b522f Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19300734

Change-Id: Ibc4990d59b8a9d353c05365b867d12bc798cc171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 16:42:02 +00:00
TreeHugger Robot
8f07d18092 Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev 2022-08-10 16:17:49 +00:00
Linus Tufvesson
c9d18836c2 [automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev am: b6d3c1a021 am: d6b9cb3584 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31ef68598dfb54efb3f8ce0f73d7b6776903e6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 09:19:16 +00:00
Linus Tufvesson
e83cda5db2 [automerger skipped] DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity am: c97296e9d9 am: 2b28fb61b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7b290c1affe4693d8beb808506771fdb172290e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 09:18:53 +00:00
Linus Tufvesson
d6b9cb3584 Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev am: b6d3c1a021 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537069

Change-Id: I981c9f3a7cdadf66d6ceab6e86b7ef17a14cd3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 08:48:24 +00:00
Linus Tufvesson
2b28fb61b6 DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity am: c97296e9d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537069

Change-Id: I51090ef67905c994de084ecc9291e95b1f2cff85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 08:48:08 +00:00
Linus Tufvesson
b6d3c1a021 Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev 2022-08-10 07:59:57 +00:00
Linus Tufvesson
69e4884a10 Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into rvc-dev 2022-08-10 07:58:52 +00:00
Iván Budnik
ff7be9912f Enforce ComponentName belongs to caller app 
Add checks that enforce ComponentName's package belongs to calling app
in MediaButtonReceiverHolder and MediaSessionRecord. This avoids
privileged execution of arbitrary code.

Bug: 238177121
Test: atest CtsMediaBetterTogetherTestCases
Change-Id: Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897
Merged-In: Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897
 2022-08-09 16:46:08 +00:00
Linus Tufvesson
c97296e9d9 DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity 
These windows can only be placed on private virtual displays, and as
such they should not be considered when deciding if an application has
any visible windows or not.

Bug:205130886
Test:Manually verified that sample from 205130886 no longer allows
background activity launches
Test: atest CtsActivityManagerBackgroundActivityTestCases

Change-Id: I76208722bbb7a407ba1f2dc4305a28226166414d
Merged-In: I76208722bbb7a407ba1f2dc4305a28226166414d
 2022-08-08 12:55:24 +02:00
Oli Lan
d69df94c24 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b52e16af09235bf13cc1c2b4c12299bc7c2fbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 10:54:17 +00:00
Oli Lan
2f4d46fca2 [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34823ac46a356f70554c8c1c9bfe4e8a54fc7cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 10:53:57 +00:00
Oli Lan
fb6f84fe35 Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: Ie9e4bde2bc2ad7fb63a770e9f56ea731786a09da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 10:38:31 +00:00