Caitlin Shkuratov
b6e33a1c16
Merge "[Disable Flags] Move DisableFlagsLogger to the disableflags package."
2022-09-02 14:33:07 +00:00
Pavel Grafov
62291e970b
Merge "Handle exception thrown by KCS.setGrant()"
2022-09-02 09:28:55 +00:00
Chun-Wei Wang
266bef4617
Merge "Include dependency packages in RunningAppProcessInfo"
2022-09-02 07:09:51 +00:00
JW Wang
b8a9b524f2
Include dependency packages in RunningAppProcessInfo
...
So we have a complete picture about all packages loaded into a process.
This will be used to check if installing a package causes a process to
be killed.
Note if pkgList or pkgDeps contain the package to be installed, the process
will be killed during install.
Bug: 235306967
Test: m
Change-Id: I052185f8d54717e65fa1fddaa42ca80ebbf15a5d
2022-09-02 09:08:04 +08:00
TreeHugger Robot
684dc6bda1
Merge "Update TaskFragmentToken for Activity relaunch" into tm-qpr-dev am: 379c38b1ae am: de4ca9845c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19707668
Change-Id: Ic8407732ba353215b6e466247d1e8710bf59b51a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 22:47:01 +00:00
TreeHugger Robot
de4ca9845c
Merge "Update TaskFragmentToken for Activity relaunch" into tm-qpr-dev am: 379c38b1ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19707668
Change-Id: Ief7239f819fc1babade677aca230c2df93ad5a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 22:17:20 +00:00
TreeHugger Robot
379c38b1ae
Merge "Update TaskFragmentToken for Activity relaunch" into tm-qpr-dev
2022-09-01 21:51:47 +00:00
Caitlin Shkuratov
f9288d1d2a
[Disable Flags] Move DisableFlagsLogger to the disableflags package.
...
disableflags package was created by ag/19795082.
Bug: 240590557
Test: atest SystemUITests
Test: manual: Verify we still get disable state logs
Change-Id: Ia02ba83e653197e4c77deb5cd7db1e805914e340
2022-09-01 20:45:32 +00:00
Yuri Lin
144337d92a
Merge "Trim any long string inputs that come in to AutomaticZenRule" into tm-qpr-dev am: f5f9c1ec1d am: 9bed5947c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19794266
Change-Id: I416e1bae50d3be388bb2c38314ead4bf86d1316d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 20:07:25 +00:00
Darrell Shi
d5d2cbc7f1
Merge "Add hidden system dream API in DreamManagerService." into tm-qpr-dev am: 68e81c211e am: ec6724232e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19461449
Change-Id: Ic1de0271fa2afa7185b31472afb45424f88eaa57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 19:51:57 +00:00
Yuri Lin
9bed5947c0
Merge "Trim any long string inputs that come in to AutomaticZenRule" into tm-qpr-dev am: f5f9c1ec1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19794266
Change-Id: Icbf3cd03cd1ede0817e7c23596861c070781c34c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 19:50:54 +00:00
Yuri Lin
f5f9c1ec1d
Merge "Trim any long string inputs that come in to AutomaticZenRule" into tm-qpr-dev
2022-09-01 18:47:55 +00:00
Eghosa Ewansiha-Vlachavas
3bc8a07765
Handle exception thrown by KCS.setGrant()
...
KeyChainService.setGrant() now throws an IllegalArguementException if
the alias passed to it does not have an exisitng key. So
DPMS.setKeyGrantForApp() and DMPS.setKeyGrantToWifiAuth() will also now
throw IllegalArgumentExceptions in the senario described above. As this
will propagaet up to the DPM API's that call these functions, we will
have to gate this new behavios on DPC's target SDK level.
So if DPC targets DPC U+ : throw exception
else : return false
Fixes: 175101461
Test: n/a
Topic: make-GrantKeyPairToApp-And-grantKeyPairToWifiAuth-Throw-Exception
Change-Id: I995227b633e2fd60dad096e35f92cb539a9389d4
2022-09-01 18:29:19 +00:00
Darrell Shi
ec6724232e
Merge "Add hidden system dream API in DreamManagerService." into tm-qpr-dev am: 68e81c211e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19461449
Change-Id: I11f43a63201a0f56f8f61c56012d2f4fcaf69abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 16:49:50 +00:00
Darrell Shi
68e81c211e
Merge "Add hidden system dream API in DreamManagerService." into tm-qpr-dev
2022-09-01 16:41:32 +00:00
Yuri Lin
de172ba0d4
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
2022-08-31 14:59:18 -04:00
Lili Zou
af0f550742
Merge "AmbientContextManager API changes to support quick-tap detection" into tm-qpr-dev am: 7b21fb6b4a am: 578c374311
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19753874
Change-Id: I54faff579dc7d4e475151330565ef3e08b3d9b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-31 14:29:17 +00:00
Lili Zou
578c374311
Merge "AmbientContextManager API changes to support quick-tap detection" into tm-qpr-dev am: 7b21fb6b4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19753874
Change-Id: Ife7c05da34d53e35140464570f4ba78530a614d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-31 14:00:51 +00:00
Chris Li
f1bf8d6d9d
Update TaskFragmentToken for Activity relaunch
...
Before, we store the TaskFragmentToken in ActivityClientRecord from
LaunchActivityItem, which won't update if the Activity is relaunched.
Now, we update the token when the activity is reparented to make sure
the token is up-to-date when relaunched.
Also make sure that when activity is destroyed, it is no longer
available using SplitController#getContainerWithActivity(Activity).
Bug: 243330085
Test: atest WMJetpackUnitTests:TaskFragmentContainerTest
Change-Id: I37f1a442c6f1bfb40f04f61eb4f9a3d8d09733ee
2022-08-31 11:37:17 +08:00
Lili Zou
81f52b053d
AmbientContextManager API changes to support quick-tap detection
...
Test: "atest CtsAmbientContextServiceTestCases", "atest FrameworksServicesTests:AmbientContextManagerServiceTest"
BUG: 242480433
Ignore-AOSP-First: to prevent new feature leak.
Change-Id: If445894f0d68fbb336156d2817e0dea884182a10
2022-08-31 02:28:09 +00:00
Darrell Shi
3c94bacacd
Add hidden system dream API in DreamManagerService.
...
This change
- adds a new private API in dream manager that allows a client with
write dream permission to set a system dream component, which takes
precedence over user configured dream
- fixes startDream() API in DreamManager which shouldn't take in a
component name
Test: atest SystemDreamTest
Bug: 222529147
Change-Id: Iee9a0af1071e5ed57fa5bd4b0d06d8178118116e
2022-08-30 23:19:44 +00:00
Cole Faust
9acf46f66f
[conflict] Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 am: 91d6c5b564 am: 6a79ae2567 am: 9b3a5fc03b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016
Change-Id: I5e59b8549df348c181cd3b72311798a5d7602a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 21:03:54 +00:00
Cole Faust
9b3a5fc03b
Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 am: 91d6c5b564 am: 6a79ae2567
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016
Change-Id: I7052a1f7391ed6701fe0e1036c27368609032e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 20:44:00 +00:00
Cole Faust
6a79ae2567
Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 am: 91d6c5b564
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016
Change-Id: I931e692e6d170d19a7492e44cc1333c10e96c897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 20:00:09 +00:00
Cole Faust
91d6c5b564
Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016
Change-Id: Icfb700330d9a9cd0a592b76c9e4cf4a8bcd19c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 19:01:56 +00:00
Cole Faust
a1eb8cf128
Merge "Fix array-related errorprone warnings"
2022-08-30 18:03:01 +00:00
Lili Zou
a98765cb86
Merge "Fix shell command bugs for supporting CTS test. Add service unit test. Fix javadoc." into tm-qpr-dev am: b2f2546b5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19751510
Change-Id: I0ffc853aa8b2700c8a7f1f65f53c23d38f665a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 15:23:28 +00:00
Yeabkal Wubshit
09f31c2c2b
Fix NotificationChannel#getVibrationPattern API Documentation
...
Missing parenthesis has been added.
Change-Id: I094a9b0aa9a60690cc38904810d609a1ce5a0a72
2022-08-30 07:37:04 +00:00
Kathy Chen
7a168cc8c1
Fix shell command bugs for supporting CTS test. Add service unit test. Fix javadoc.
...
Test: unit test and cts test
Ignore-AOSP-First: confidential feature
BUG: 242480433
Change-Id: I0fd2950eea267d56fbd8e89ecc52fdd590992e75
Merged-In: I0fd2950eea267d56fbd8e89ecc52fdd590992e75
(cherry picked from commit 44eafb8f58 )
2022-08-30 02:37:59 +00:00
Treehugger Robot
e9712ca91b
Merge "Exclude large tests from presubmit." am: 3d8681e31d am: 9dc9fd8930 am: 5860c207c9 am: da40df7c95
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2176682
Change-Id: I56d7b99eab9acc055a6935166f962d10e6df357c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-29 22:35:54 +00:00
Treehugger Robot
da40df7c95
Merge "Exclude large tests from presubmit." am: 3d8681e31d am: 9dc9fd8930 am: 5860c207c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2176682
Change-Id: I7f48882ac9978964da17b93579e385557866a1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-29 22:09:58 +00:00
Treehugger Robot
5860c207c9
Merge "Exclude large tests from presubmit." am: 3d8681e31d am: 9dc9fd8930
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2176682
Change-Id: Ia285f9d7b8e2ac0a4b7116af9b759bed56074aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-29 21:43:14 +00:00
Treehugger Robot
3d8681e31d
Merge "Exclude large tests from presubmit."
2022-08-29 20:52:36 +00:00
Nan Wu
21d8b0c7da
Merge "Mark framework created intent as safe"
2022-08-29 18:05:26 +00:00
Nate Myren
e0f3d12d32
Revert "DO NOT MERGE Add GET_USAGE_STATS to RUNTIME_AND_APPOP_PERMISSIONS_OPS" am: 768e9f12d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19735199
Change-Id: Ice331481669003abfa7df7ef713170da35f40f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:16:42 +00:00
Felipe Leme
28584e88ff
Merge "Fixed argument check on AM.switchUser(UserHandle)."
2022-08-26 17:05:37 +00:00
Nate Myren
04f6c9fa6a
Merge "Revert "DO NOT MERGE Add GET_USAGE_STATS to RUNTIME_AND_APPOP_PERMISSIONS_OPS"" into tm-qpr-dev
2022-08-26 17:01:32 +00:00
Daniel Norman
47d8fe5c9f
Merge changes from topic "reland-a11y-adp"
...
* changes:
Tweak behavior of isAccessibilityDataPrivate() to reduce CPU usage.
Revert "Revert "Limit off-label accessibility access using a new..."
2022-08-25 23:25:12 +00:00
Allen Xu
4b60d0f337
Merge "Revert "Verify that the component is exported""
2022-08-25 23:08:33 +00:00
Allen Xu
24a489a25a
Revert "Verify that the component is exported"
...
Revert submission 18335517-safer-implicit-intents
Reason for revert: DroidMonitor-triggered revert due to many breakages in Quarterdeck, bug b/243844000
BUG: b/243844000
Reverted Changes:
Ida701f445:Update PackageManager test in Car to adapt to safe...
Ibd29e145a:CTS tests for safer implicit intents
I84e5d20f5:Verify that the component is exported
Change-Id: If4ac0c5e743f78417c4caa7d92a34f5027b34ec3
2022-08-25 23:02:12 +00:00
Christophe Pinelli
6c41965141
Merge "Verify that the component is exported"
2022-08-25 19:42:47 +00:00
Cole Faust
584140c83a
Fix array-related errorprone warnings
...
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.
Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ia6f216cc36ad0a5758f39fd9b34962cd4adf9d8e
2022-08-25 10:57:12 -07:00
wilsonshih
848db58379
[RESTRICT AUTOMERGE]BackGestureAnimation: a lightweight recents am: c9c9a757a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19394174
Change-Id: I855a2c63713e9543f18b6e84e071b21589dd3729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 15:07:21 +00:00
Wei Sheng Shih
4ec0b52029
Merge "[RESTRICT AUTOMERGE]BackGestureAnimation: a lightweight recents animation controller" into tm-qpr-dev
2022-08-25 14:04:21 +00:00
Thiébaud Weksteen
5d28354057
Merge "Remove lowpan internal API" am: 649a208492 am: 4ad24dd314 am: e9a59c6013 am: 52101fa97d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2192895
Change-Id: I83a483bf766325978ac70b52414f153ee7a5246f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 04:06:20 +00:00
Thiébaud Weksteen
52101fa97d
Merge "Remove lowpan internal API" am: 649a208492 am: 4ad24dd314 am: e9a59c6013
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2192895
Change-Id: I2f67c1b86855bc1accc236cbeee8e84b2bfe3d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 03:40:29 +00:00
Thiébaud Weksteen
e9a59c6013
Merge "Remove lowpan internal API" am: 649a208492 am: 4ad24dd314
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2192895
Change-Id: I8d4192ac1cf5bd97a295d62f8d46dae795c3e096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 02:19:57 +00:00
Nate Myren
768e9f12d6
Revert "DO NOT MERGE Add GET_USAGE_STATS to RUNTIME_AND_APPOP_PERMISSIONS_OPS"
...
This reverts commit 76718dd9f4 .
Reason for revert: b/243646481
Change-Id: I6b200a3269e2a4fd1943c20e3074f19afe46f6dd
2022-08-24 20:49:02 +00:00
Nate Myren
f82b80203f
Merge "Revert "Add GET_USAGE_STATS to RUNTIME_AND_APPOP_PERMISSIONS_OPS""
2022-08-24 19:28:23 +00:00
Christophe Pinelli
c000456edd
Verify that the component is exported
...
CL for tests: ag/18698797
Bug: 229362273
Test: atest CtsContentTestCases:PackageManagerTest + manual tests
Change-Id: I84e5d20f575a77ece1459e79f288f1f5867449d1
2022-08-24 16:52:22 +00:00