Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
500,073 Commits 3 Branches 0 Tags
d40091c7a3a486ba88d1f8c70e8a78800aab18e6
Commit Graph

500073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ioana Alexandru
d40091c7a3 [automerger skipped] Merge "Visit URIs in landscape/portrait custom remote views." into rvc-dev am: 42635aa4d0 -s ours 
am skip reason: Merged-In I7d3d35df0ec38945019f71755bed8797b7af4517 with SHA-1 c80f854e42 is already in history

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

Change-Id: I302bc26071e2fd047d0ef38a8a358a5acf0c9903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 09:12:39 +00:00
Ioana Alexandru
4f90f991c2 [automerger skipped] Visit URIs in landscape/portrait custom remote views. am: 43e1ae4e0d -s ours 
am skip reason: Merged-In I7d3d35df0ec38945019f71755bed8797b7af4517 with SHA-1 c80f854e42 is already in history

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

Change-Id: I028016250a5b2e7543c53ae30c3e520a418c7aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 09:12:33 +00:00
Ioana Alexandru
42635aa4d0 Merge "Visit URIs in landscape/portrait custom remote views." into rvc-dev 2023-05-08 08:44:40 +00:00
Ioana Alexandru
d8e733ece2 Merge "Visit URIs in landscape/portrait custom remote views." into rvc-qpr-dev 2023-05-08 08:44:19 +00:00
Austin Borger
1678956190 Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into rvc-dev am: 2a509c82ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22911665

Change-Id: I570f3ea30dd4eca2b913f63ffdbc7ca68564b908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 22:44:43 +00:00
Austin Borger
2a509c82ba Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into rvc-dev 2023-05-05 22:16:43 +00:00
András Kurucz
c8e95960f4 [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-dev am: ab15dd4748 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

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

Change-Id: Ief66c7670c66631b803677c9597ee2790a985fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 14:00:56 +00:00
András Kurucz
d0b98bc699 [automerger skipped] Truncate ShortcutInfo Id am: f31df62340 -s ours 
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

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

Change-Id: I4021e366bb0f12ba28b8dd1d9ae13c6d71976bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 14:00:43 +00:00
Ioana Alexandru
9a0e0e03e1 [automerger skipped] Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into rvc-dev am: 08a8ba51f0 -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history

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

Change-Id: I5087ba8d9eeb452aa88f41ad0f1a17e045481038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 13:59:32 +00:00
Ioana Alexandru
50682f1b14 [automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 63f8ce3efd -s ours 
am skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history

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

Change-Id: I0f11e8a673ca61d3bbc7e816769268980364541b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 13:59:09 +00:00
András Kurucz
ed402182f2 Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev 2023-05-04 13:49:20 +00:00
András Kurucz
ab15dd4748 Merge "Truncate ShortcutInfo Id" into rvc-dev 2023-05-04 13:47:04 +00:00
Ioana Alexandru
ae08612d34 Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into rvc-qpr-dev 2023-05-04 13:20:08 +00:00
Ioana Alexandru
08a8ba51f0 Merge "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." into rvc-dev 2023-05-04 13:19:04 +00:00
Ioana Alexandru
022550d586 DO NOT MERGE Increase notification channel limit. am: 5664378a7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456

Change-Id: Ie583cdcfae673d0a3422525d213da797bae7f75b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 10:05:29 +00:00
András Kurucz
f31df62340 Truncate ShortcutInfo Id 
Creating Conversation with a ShortcutId longer than 65_535 (max unsigned short), we did not save the conversation settings into the notification_policy.xml due to a restriction in FastDataOutput.
This put us to a state where the user changing the importance or turning off the notifications for the given conversation had no effect on notification behavior.

Fixes: 273729476
Test: atest ShortcutManagerTest2
Test: Create a test app which creates a Conversation with a long shortcutId. Go to the Conversation Settings and turn off Notifications. Post a new Notification to this Conversation and see if it is displayed.
Change-Id: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5
Merged-In: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5
 2023-05-03 13:02:30 +00:00
András Kurucz
6a278c3998 Truncate ShortcutInfo Id 
Creating Conversation with a ShortcutId longer than 65_535 (max unsigned short), we did not save the conversation settings into the notification_policy.xml due to a restriction in FastDataOutput.
This put us to a state where the user changing the importance or turning off the notifications for the given conversation had no effect on notification behavior.

Fixes: 273729476
Test: atest ShortcutManagerTest2
Test: Create a test app which creates a Conversation with a long shortcutId. Go to the Conversation Settings and turn off Notifications. Post a new Notification to this Conversation and see if it is displayed.
Change-Id: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5
Merged-In: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5
 2023-05-03 13:02:20 +00:00
Ioana Alexandru
43e1ae4e0d Visit URIs in landscape/portrait custom remote views. 
Bug: 277740848
Test: atest RemoteViewsTest NotificationManagerServiceTest & tested with POC from bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e8acb2f660bdb03616989852f9dbbf1726f8237e)
Merged-In: I7d3d35df0ec38945019f71755bed8797b7af4517
Change-Id: I7d3d35df0ec38945019f71755bed8797b7af4517
 2023-05-02 17:02:33 +00:00
Ioana Alexandru
c80f854e42 Visit URIs in landscape/portrait custom remote views. 
Bug: 277740848
Test: atest RemoteViewsTest NotificationManagerServiceTest & tested with POC from bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e8acb2f660bdb03616989852f9dbbf1726f8237e)
Merged-In: I7d3d35df0ec38945019f71755bed8797b7af4517
Change-Id: I7d3d35df0ec38945019f71755bed8797b7af4517
 2023-05-02 17:02:16 +00:00
Ioana Alexandru
a8078ff43d Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. 
Also added the person URIs in the test, since they weren't being
checked.

Test: atest NotificationManagerServiceTest & tested with POC from bug
Bug: 276729064
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e0d8602a0200ba92283463bd54cefcf97394bfa8)
Merged-In: I848545f7aee202495c515f47a32871a2cb6ae707
Change-Id: I848545f7aee202495c515f47a32871a2cb6ae707
 2023-05-02 17:01:52 +00:00
Ioana Alexandru
63f8ce3efd Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. 
Also added the person URIs in the test, since they weren't being
checked.

Test: atest NotificationManagerServiceTest & tested with POC from bug
Bug: 276729064
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e0d8602a0200ba92283463bd54cefcf97394bfa8)
Merged-In: I848545f7aee202495c515f47a32871a2cb6ae707
Change-Id: I848545f7aee202495c515f47a32871a2cb6ae707
 2023-05-02 17:01:44 +00:00
Ioana Alexandru
5664378a7c DO NOT MERGE Increase notification channel limit. 
This was previously reduced because it can cause an out of memory error or be abused to trigger a permanent denial of service, but it breaks some messages apps in Android 11, as they are creating too many channels. Rolling it back until the apps are fixed to reduce user impact.

Bug: 279447569
Bug: 261723753
Test: N/A, this was previously 50k
Change-Id: Id8da382f812d4abb8db723c40a61366a7402da4f
 2023-05-02 10:29:27 +00:00
Ioana Alexandru
de7c43eb60 DO NOT MERGE Increase notification channel limit. 
This was previously reduced because it can cause an out of memory error or be abused to trigger a permanent denial of service, but it breaks some messages apps in Android 11, as they are creating too many channels. Rolling it back until the apps are fixed to reduce user impact.

Bug: 279447569
Bug: 261723753
Test: N/A, this was previously 50k
Change-Id: Id8da382f812d4abb8db723c40a61366a7402da4f
 2023-05-02 10:29:16 +00:00
Austin Borger
821f4c0d8b ActivityManagerService: Allow openContentUri from vendor/system/product. 
Apps should not have direct access to this entry point. Check that the
caller is a vendor, system, or product package.

Test: Ran PoC app and CtsMediaPlayerTestCases.
Bug: 236688380
Change-Id: I0335496d28fa5fc3bfe1fecd4be90040b0b3687f
Merged-In: I0335496d28fa5fc3bfe1fecd4be90040b0b3687f
(cherry picked from commit d0ba7467c2)
 2023-05-01 19:51:01 +00:00
Aaron Liu
cd993dd7e0 Merge "DO NOT MERGE Dismiss keyguard when simpin auth'd and..." into rvc-dev am: 2b3817680a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733

Change-Id: I232f9ca2bb579dcca8c7d20284b6dcad4fc776fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:18:45 +00:00
Aaron Liu
a4ff8bed4c DO NOT MERGE Dismiss keyguard when simpin auth'd and... am: 09f0047222 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733

Change-Id: Ib65c3b8759581e04f6bdfa3dfed49a467ef846e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:18:24 +00:00
Aaron Liu
2b3817680a Merge "DO NOT MERGE Dismiss keyguard when simpin auth'd and..." into rvc-dev 2023-04-19 17:30:06 +00:00
Winson Chung
b4ce1ebb4a Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev am: a082fd92a4 am: a0237b2e83 am: 7d8fd7a9e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525

Change-Id: I43cb95c6c9e4878ef9e16b86f8c4b39de2a85ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 09:45:03 +00:00
Winson Chung
7d8fd7a9e9 Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev am: a082fd92a4 am: a0237b2e83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525

Change-Id: Ifef9764db9f05834e98d53e946028ce1b7a54463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 09:00:10 +00:00
Winson Chung
a0237b2e83 Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev am: a082fd92a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525

Change-Id: I6815d23a9672f31048a650bb29de39880b698194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 08:19:51 +00:00
Winson Chung
a082fd92a4 Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev 2023-04-19 07:24:18 +00:00
Nate(Qiang) Jiang
48994ad16f Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-dev am: 07272cfaee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772

Change-Id: I19ee0bfac5c35699d0138eb1d13c7195ac97ba06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 18:04:14 +00:00
Nate(Qiang) Jiang
88bc01ef01 DO NOT MERGE: Limit the ServiceFriendlyNames am: 6b1746ab6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772

Change-Id: Ie3aa7e164a8ea3342d7ce0a9f5e5f24af732acfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 18:03:34 +00:00
Nate(Qiang) Jiang
07272cfaee Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-dev 2023-04-18 17:23:33 +00:00
Nate(Qiang) Jiang
4de0740bf8 Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-qpr-dev 2023-04-18 17:22:49 +00:00
Nate(Qiang) Jiang
472f9aa49e Merge "DO NOT MERGE: Add size check on PPS#policy" into rvc-dev am: 23a890a43f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22633545

Change-Id: Ia09371195083387d7def181fca256f1e4c3b91f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 20:09:28 +00:00
Nate(Qiang) Jiang
a6809f47b7 DO NOT MERGE: Add size check on PPS#policy am: d1afd2c47d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22633545

Change-Id: I5b9287cccadb3c93a395b5a991c1f996f0557fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 20:08:53 +00:00
Aaron Liu
09f0047222 DO NOT MERGE Dismiss keyguard when simpin auth'd and... 
security method is none. This is mostly to fix the case where we auth
sim pin in the set up wizard and it goes straight to keyguard instead of
the setup wizard activity.

This works with the prevent bypass keyguard flag because the device
should be noe secure in this case.

Fixes: 222446076
Test: turn locked sim on, which opens the sim pin screen. Auth the
screen and observe that keyguard is not shown.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48fa9bef3451e4a358c941af5b230f99881c5cb6)
Merged-In: Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4
Change-Id: Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4
Cherry-picking this CL as a security fix

Bug: 222446076
Change-Id: If4360dd6ae2e5f79b43eaf1a29687ac9cc4b6101
 2023-04-14 19:56:13 +00:00
Nate(Qiang) Jiang
23a890a43f Merge "DO NOT MERGE: Add size check on PPS#policy" into rvc-dev 2023-04-14 19:43:49 +00:00
Winson Chung
c62d2e1021 Only allow NEW_TASK flag when adjusting pending intents 
Bug: 243794108
Test: atest CtsSecurityBulletinHostTestCases:android.security.cts.CVE_2023_20918
Change-Id: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b
 2023-04-14 19:23:04 +00:00
Nate(Qiang) Jiang
de5afd30ab DO NOT MERGE: Add size check on PPS#policy 
Bug: 275340417
Test: atest android.net.wifi
Change-Id: I6e6128b7ed5327da8dbc9186a82bef0f2e4197bb
 2023-04-13 21:34:37 +00:00
Nate(Qiang) Jiang
d1afd2c47d DO NOT MERGE: Add size check on PPS#policy 
Bug: 275340417
Test: atest android.net.wifi
Change-Id: I6e6128b7ed5327da8dbc9186a82bef0f2e4197bb
 2023-04-13 21:20:37 +00:00
Nate(Qiang) Jiang
de8f0fef64 DO NOT MERGE: Limit the ServiceFriendlyNames 
Bug: 274445194
Test: atest android.net.wifi
Change-Id: Id4e16007531ba1ce3e3f9fa3d3111b5af57751be
 2023-04-12 19:24:22 +00:00
Nate(Qiang) Jiang
6b1746ab6f DO NOT MERGE: Limit the ServiceFriendlyNames 
Bug: 274445194
Test: atest android.net.wifi
Change-Id: Id4e16007531ba1ce3e3f9fa3d3111b5af57751be
 2023-04-12 18:43:20 +00:00
TreeHugger Robot
39b0da14c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 1360ebb441 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0015618d7bb8d38cbf2bcd804dd36e1f778c7149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 06:36:19 +00:00
Bill Yi
962f5322b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2fe87df11e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I507e088a6e12dad5c53268ee42ea564f94b0922e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 06:35:57 +00:00
TreeHugger Robot
1360ebb441 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2023-04-06 06:12:02 +00:00
Michael Groover
d8cdf2d931 Merge "Limit the number of supported v1 and v2 signers" into rvc-dev am: 00f3afecdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22390145

Change-Id: Iaf94fa26b8d4bc386802820387f088482af03ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 01:19:21 +00:00
Michael Groover
00f3afecdb Merge "Limit the number of supported v1 and v2 signers" into rvc-dev 2023-04-05 00:38:04 +00:00
Bill Yi
2fe87df11e Import translations. DO NOT MERGE ANYWHERE 
BUG:204554636

Auto-generated-cl: translation import
Change-Id: I1720c67e4361d9019b12fa5a510cd34918dfedb4
 2023-04-04 11:24:47 -07:00