Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
768,716 Commits 3 Branches 0 Tags
5656d425786ecdc2955d922fa9dc89140f685813
Commit Graph

23444 Commits

Author SHA1 Message Date
Andrew Solovay
c5c0567f59 docs: Fixing badly-formatted doc comment am: d80824b57d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20157157

Change-Id: Ia7a6926f97bbce0d8b3371033c6d35f7e751098b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 19:40:31 +00:00
Andrew Solovay
d80824b57d docs: Fixing badly-formatted doc comment 
The Javadoc specification doesn't actually define a {@more}
tag. The Java-reference engine interpreted it as a paragraph
break, but the Kotlin doc engine (more properly) passed the
tag through verbatim.

Replaced it with a <p> to make it a paragraph break in both
languages.

Bug: 247563816
Test: (docs build)
Change-Id: Ib7bb4c2628141b7479c338f1d3fb28da503b847f
 2022-10-10 16:55:46 -07:00
TreeHugger Robot
45ee517849 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: fe2c3c269b am: e7253363d2 am: 4e8fadf947 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

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

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

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

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

Change-Id: I83dfe3ce05718113bd6acb1daed09b51f5b60a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 13:38:01 +00:00
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
Julia Reynolds
23ffc379fe Merge "Fix NPE" into qt-dev am: 261b601d25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I1d34705e2995a26c7f396fef7027031d62010990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 19:31:57 +00:00
Julia Reynolds
812f10cff1 Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 am: 1cdad7c9ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886854

Change-Id: I6f175a177d4dca48cd383782617cfbf975e58790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:25:27 +00:00
Julia Reynolds
1cdad7c9ae Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886854

Change-Id: Id6b047d1c50f922da3b54cfc00a5251c1df711e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:21:09 +00:00
Julia Reynolds
e51c402650 Fix NPE 
Test: NotificationChannelGroupTest
Test: view notification settings for an app that doesn't use groups
Fixes: 244574602
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I9c681106f6d645e62b0e44903d40aa523fee0e95
(cherry picked from commit 6f02c07176)
Merged-In: I9c681106f6d645e62b0e44903d40aa523fee0e95
 2022-09-08 20:51:08 +00:00
Julia Reynolds
a375542897 Fix NPE 
Test: NotificationChannelGroupTest
Test: view notification settings for an app that doesn't use groups
Fixes: 244574602
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I9c681106f6d645e62b0e44903d40aa523fee0e95
(cherry picked from commit 6f02c07176)
 2022-09-08 14:05:01 +00:00
Julia Reynolds
ad30b85784 Fix NPE 
Test: NotificationChannelGroupTest
Test: view notification settings for an app that doesn't use groups
Fixes: 244574602
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I9c681106f6d645e62b0e44903d40aa523fee0e95
(cherry picked from commit 6f02c07176)
 2022-09-08 14:04:25 +00:00
Julia Reynolds
02e177caeb Fix NPE 
Test: NotificationChannelGroupTest
Test: view notification settings for an app that doesn't use groups
Fixes: 244574602
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I9c681106f6d645e62b0e44903d40aa523fee0e95
(cherry picked from commit 6f02c07176)
 2022-09-08 14:03:53 +00:00
Julia Reynolds
410a197948 Fix NPE 
Test: NotificationChannelGroupTest
Test: view notification settings for an app that doesn't use groups
Fixes: 244574602
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I9c681106f6d645e62b0e44903d40aa523fee0e95
(cherry picked from commit 6f02c07176)
 2022-09-08 14:03:27 +00:00
Julia Reynolds
c23f14f874 Fix NPE 
Test: NotificationChannelGroupTest
Test: view notification settings for an app that doesn't use groups
Fixes: 244574602
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I9c681106f6d645e62b0e44903d40aa523fee0e95
(cherry picked from commit 6f02c07176)
 2022-09-08 14:02:17 +00:00
Yuri Lin
e5fdd7f0de Merge "Trim any long string inputs that come in to AutomaticZenRule" into qt-dev am: 380ec03dee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816794

Change-Id: I86c52b898436188c231a44b342c0ccd1672e07dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-06 23:34:37 +00:00
Yuri Lin
bb36470dd7 Merge "Trim any long string inputs that come in to AutomaticZenRule" into tm-dev am: de7b49d170 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816377

Change-Id: I8e5403cb24fa43ff6bedadab41d14470c1884b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-06 23:22:43 +00:00
Yuri Lin
c4b2c877ec Trim any long string inputs that come in to AutomaticZenRule 
This change both prevents any rules from being unable to be written to disk and also avoids risk of running out of memory while handling all the zen rules.

Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Test: cts AutomaticZenRuleTest; atest android.app.AutomaticZenRuleTest; manually confirmed each exploit example either saves the rule successfully with a truncated string (in the case of name & conditionId) or may fail to save the rule at all (if the owner/configactivity is invalid). Additionally ran the memory-exhausting PoC without device crashes.

Change-Id: I110172a43f28528dd274b3b346eb29c3796ff2c6
Merged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6
(cherry picked from commit de172ba0d4)
 2022-09-01 18:54:21 +00:00
Yuri Lin
1fcd99f5aa Trim any long string inputs that come in to AutomaticZenRule 
This change both prevents any rules from being unable to be written to disk and also avoids risk of running out of memory while handling all the zen rules.

Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Test: cts AutomaticZenRuleTest; atest android.app.AutomaticZenRuleTest; manually confirmed each exploit example either saves the rule successfully with a truncated string (in the case of name & conditionId) or may fail to save the rule at all (if the owner/configactivity is invalid). Additionally ran the memory-exhausting PoC without device crashes.

Change-Id: I110172a43f28528dd274b3b346eb29c3796ff2c6
Merged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6
(cherry picked from commit de172ba0d4)
 2022-09-01 18:54:01 +00:00
Yuri Lin
5b0c4af9ba Trim any long string inputs that come in to AutomaticZenRule 
This change both prevents any rules from being unable to be written to disk and also avoids risk of running out of memory while handling all the zen rules.

Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Test: cts AutomaticZenRuleTest; atest android.app.AutomaticZenRuleTest; manually confirmed each exploit example either saves the rule successfully with a truncated string (in the case of name & conditionId) or may fail to save the rule at all (if the owner/configactivity is invalid). Additionally ran the memory-exhausting PoC without device crashes.

Change-Id: I110172a43f28528dd274b3b346eb29c3796ff2c6
Merged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6
(cherry picked from commit de172ba0d4)
 2022-09-01 18:53:15 +00:00
Yuri Lin
9ed71acfb1 [automerge] Trim any long string inputs that come in to AutomaticZenRule 2p: 19bc2c3559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816496

Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Change-Id: Ifbf41438485e2061ab2e9aaba375cb420ae1fb80
Merged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6
 2022-09-01 18:52:10 +00:00
Yuri Lin
19bc2c3559 Trim any long string inputs that come in to AutomaticZenRule 
This change both prevents any rules from being unable to be written to disk and also avoids risk of running out of memory while handling all the zen rules.

Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Test: cts AutomaticZenRuleTest; atest android.app.AutomaticZenRuleTest; manually confirmed each exploit example either saves the rule successfully with a truncated string (in the case of name & conditionId) or may fail to save the rule at all (if the owner/configactivity is invalid). Additionally ran the memory-exhausting PoC without device crashes.

Change-Id: I110172a43f28528dd274b3b346eb29c3796ff2c6
Merged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6
(cherry picked from commit de172ba0d4)
 2022-09-01 18:51:55 +00:00
Yuri Lin
3d8504587c Trim any long string inputs that come in to AutomaticZenRule 
This change both prevents any rules from being unable to be written to disk and also avoids risk of running out of memory while handling all the zen rules.

Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Test: cts AutomaticZenRuleTest; atest android.app.AutomaticZenRuleTest; manually confirmed each exploit example either saves the rule successfully with a truncated string (in the case of name & conditionId) or may fail to save the rule at all (if the owner/configactivity is invalid). Additionally ran the memory-exhausting PoC without device crashes.

Change-Id: I110172a43f28528dd274b3b346eb29c3796ff2c6
Merged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6
(cherry picked from commit de172ba0d4)
 2022-09-01 18:50:29 +00:00
Yuri Lin
d4b5212eb6 Trim any long string inputs that come in to AutomaticZenRule 
This change both prevents any rules from being unable to be written to disk and also avoids risk of running out of memory while handling all the zen rules.

Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Test: cts AutomaticZenRuleTest; atest android.app.AutomaticZenRuleTest; manually confirmed each exploit example either saves the rule successfully with a truncated string (in the case of name & conditionId) or may fail to save the rule at all (if the owner/configactivity is invalid). Additionally ran the memory-exhausting PoC without device crashes.

Change-Id: I110172a43f28528dd274b3b346eb29c3796ff2c6
Merged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6
(cherry picked from commit de172ba0d4)
 2022-09-01 18:48:34 +00:00
Julia Reynolds
dc9fe11d8d Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 am: 5415ede546 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: I0d2e6623563ec9b74ee4c3356384750a97b347c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 19:11:50 +00:00
Julia Reynolds
8d506d3591 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into tm-dev am: 92c1b9e850 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697540

Change-Id: I158e0d850eaeb3f1e8d87aa15fc5561516677018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 18:54:53 +00:00
Julia Reynolds
5415ede546 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: I1079b5d5ae03e517d83d1224023cd7ba89c37605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 18:53:53 +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
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
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
Julia Reynolds
46f943383d 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:26:04 +00:00
Julia Reynolds
c0b8f4fb21 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:23:39 +00:00
Julia Reynolds
20ead01c35 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:22:59 +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
Evan Rosky
85817e6590 Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab60091c am: 5a154b395a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518999

Change-Id: Id85f7d2eeaf467cc5c77213379fff81b57c4a67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-04 05:23:58 +00:00
Evan Rosky
5a154b395a Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab60091c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518999

Change-Id: I2996d813bc8a89c220e7c89efdd064d3c7ef3fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-04 04:58:41 +00:00
Evan Rosky
2e763d31d2 Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b2d am: d7ae033815 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194

Change-Id: I75303fa1000a2a5ca6233daa8c75fbcdce1238ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-04 03:53:28 +00:00
Evan Rosky
d7ae033815 Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194

Change-Id: I0b8d234013f3551354f815533f2b4576b9100a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-04 03:26:51 +00:00
Evan Rosky
0d03e6f1fc Strip transition information from activityoptions when sent to app 
The implementation of shared-element transitions takes the
ActivityOptions from the calling activity and sends them to
another activity. This means that any sensitive information
passed into ActivityManager via ActivityOptions can make its
way to an unrelated app. Recently a RemoteTransition object
was added which includes some sensitive information.

This CL strips the sensitive information from the activity
options before sending it to anonther app.

Bug: 237290578
Test: atest ActivityManagerTest#testActivityManager_stripTransitionFromActivityOptions
Change-Id: Ifa08fc195698f02bf70ca386178c67f6ba4a14ea
 2022-08-04 01:30:53 +00:00
Evan Rosky
d1b32da845 Revert "Strip transition information from activityoptions once it is read." 
This reverts commit 0b3ad39abf.

Reason for revert: Broke NexusLauncherTests:MemoryTests

Change-Id: Ibc8e9f516054f017e9db2e5608cf6806531ab554
 2022-08-03 20:15:33 +00:00
Evan Rosky
7cb144249f Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae7665a am: a824844cdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505172

Change-Id: Id7de444318f392c3d8e9735df2dd78834fc79eee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-03 00:18:31 +00:00
Evan Rosky
a824844cdf Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae7665a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505172

Change-Id: I489c233fea52fff948c5b4d92cd61163904e974d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 23:52:01 +00:00
Evan Rosky
0b3ad39abf Strip transition information from activityoptions once it is read. 
The implementation of shared-element transitions takes the
ActivityOptions from the calling activity and sends them to
another activity. This means that any sensitive information
passed into ActivityManager via ActivityOptions can make its
way to an unrelated app. Recently a RemoteTransition object
was added which includes some sensitive information.

This CL strips the sensitive information from the activity
options after it is extracted so that it can't be sent
to the target.

Bug: 237290578
Test: atest ActivityManagerTest#testActivityManager_stripTransitionFromActivityOptions
Change-Id: Ic9f8062e67ab895292af75e97a9ce2f4aa45d467
 2022-08-02 20:37:50 +00:00
Andrew Solovay
7d00787cbf Merge "docs: Fixing typo in Activity reference" into tm-dev am: 22dd45bd59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19278953

Change-Id: Iaa1ea8164208ef999ceb58a8eb25b8e6e5385888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 19:40:06 +00:00
Evan Severson
0440b6851b [automerge] Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..." 2p: f21335c469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441568

Bug: 231496105
Change-Id: I202a3af16bdacb71bfd82742fbae5400a18eb273
 2022-07-27 22:38:25 +00:00