Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
834,445 Commits 3 Branches 0 Tags
ef854fbdb9a67c585d590f97d34a80910ccb60f3
Commit Graph

3667 Commits

Author SHA1 Message Date
Chavi Weingarten
4960560d62 Merge "Migrate screen capture code to ScreenCapture file" 2022-09-15 17:35:56 +00:00
Yuri Lin
dd028ec3fe Merge "Limit lengths of fields in Condition to a max length." into tm-qpr-dev am: f36bcf9739 am: 15bfe2203b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19953610

Change-Id: Ib4e0d8a6752bfcf2c0ce2fe47d95406b8c8d1a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 15:47:25 +00:00
Yuri Lin
15bfe2203b Merge "Limit lengths of fields in Condition to a max length." into tm-qpr-dev am: f36bcf9739 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19953610

Change-Id: I1f744354fb637ca2ba9890fcef797c6a4c9b7471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 15:17:35 +00:00
Yuri Lin
f36bcf9739 Merge "Limit lengths of fields in Condition to a max length." into tm-qpr-dev 2022-09-15 14:59:18 +00:00
Yuri Lin
81352c3775 Limit lengths of fields in Condition to a max length. 
This app-generated input needs to not be too long to avoid errors in the process of writing to disk.

Bug: 242846316
Test: cts ConditionTest; atest ConditionTest; manually verified exploit apk is OK

Change-Id: Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9
 2022-09-14 15:27:11 -04:00
Chavi Weingarten
2b7f2aee30 Migrate screen capture code to ScreenCapture file 
Test: ScreenshotTests
Bug: 242714168
Change-Id: I8061f1717cc4e293ee07672d6d415c2c36010ccd
 2022-09-14 15:35:46 +00:00
Aurélien Pomini
1524ae71dd Move ImageWallpaper.java into package 'com.android.systemui.wallpapers' am: 369f1b973e am: 6417667198 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19695564

Change-Id: Ie217fe1ac22f17007903284cd6a476748cd87244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 14:16:11 +00:00
Aurélien Pomini
6417667198 Move ImageWallpaper.java into package 'com.android.systemui.wallpapers' am: 369f1b973e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19695564

Change-Id: Icd17af82b132897dddd88164d32df55b1c3c635e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 13:47:58 +00:00
Aurélien Pomini
369f1b973e Move ImageWallpaper.java into package 'com.android.systemui.wallpapers' 
Test: Manual on mobile (try to download & attach a wallpaper, check that
nothing breaks)
Test: atest ImageWallpaperTest
Bug: 243402530

Change-Id: I5af1acf08bb1c43a5e119597a9cef2ea667723c3
 2022-09-12 09:49:31 +00:00
Beverly Tai
c1752ea2e2 Merge "Don't show any trust granted message if passed an empty string" into tm-qpr-dev am: 8129d7acb0 am: 09914c7b42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816375

Change-Id: I06964a2c8a2eeb5635c68a777bb83df416680c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 21:10:51 +00:00
Xiang Wang
5d3e39e770 Merge "Add TEST_MAPPING for game manager and game service code" 2022-09-09 21:00:30 +00:00
Beverly Tai
09914c7b42 Merge "Don't show any trust granted message if passed an empty string" into tm-qpr-dev am: 8129d7acb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816375

Change-Id: I23f8d0d1fb2219c27cca567963cbba65b0903a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 20:47:45 +00:00
Beverly Tai
8129d7acb0 Merge "Don't show any trust granted message if passed an empty string" into tm-qpr-dev 2022-09-09 20:43:56 +00:00
Xiang Wang
0fcf3af1c8 Add TEST_MAPPING for game manager and game service code 
Test: atest
Bug: b/243854920
Change-Id: Ic0368d79b3dccb8a69cc78a66ba7bd9a5bc43871
 2022-09-07 16:50:25 -07:00
Beverly
5dccdb24cf Don't show any trust granted message if passed an empty string 
If the trustGranted call has flag DISPLAY_MESSAGE and
message is intentionally set to an empty string "", then
don't show ANY trust granted message. If the message is null
or DISPLAY_MESSAGE is not set when trust is granted,
then the device will show its default trust granted string.

Test: atest KeyguardIndicationControllerTest
Test: manually grantTrust with the FLAG_GRANT_TRUST_DISPLAY_MESSAGE
and an empty string. See that device has trust granted and doesn't
show any keyguard indication message.
Fixes: 243075236
Change-Id: Ic31a1758e9baa27b236f09ba8e656d15dd04e7f0
 2022-09-07 15:57:29 +00:00
TreeHugger Robot
8cee5077f9 Merge "Rename the methods to easier understand what they do" 2022-09-07 15:08:40 +00:00
Lucas Silva
ec8024638f Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-qpr-dev am: de117f20ff am: e264ab6190 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19775871

Change-Id: Ia86075f1a94716c36ebb0148590c172cd973a199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 17:43:06 +00:00
Lucas Silva
e264ab6190 Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-qpr-dev am: de117f20ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19775871

Change-Id: Iad0b84f489fa749e146769650dc87cd7008e137a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-02 17:26:11 +00:00
Lucas Silva
de117f20ff Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-qpr-dev 2022-09-02 17:18:21 +00:00
Lucas Silva
1b38787e58 Merge "Don't start dreams immediately if keyguard is occluded when docked." into tm-qpr-dev am: deb4e7788a am: 392cdcfea5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19763724

Change-Id: If4442a36570fe6ca43520daad9126dce397d8352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 20:04:08 +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
Lucas Silva
392cdcfea5 Merge "Don't start dreams immediately if keyguard is occluded when docked." into tm-qpr-dev am: deb4e7788a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19763724

Change-Id: I51664a04a35c6a5f2817bcab427d1257d88132d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-01 19:46:59 +00:00
Lucas Silva
deb4e7788a Merge "Don't start dreams immediately if keyguard is occluded when docked." into tm-qpr-dev 2022-09-01 17:09:01 +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
lpeter
0d7aa31d35 Rename the methods to easier understand what they do 
Because it is not clear to understand what these two methods do,
we rename them.
(1)updateVisibleActivitiesLocked()
(2)updateVisibleActivitiesChangedLocked

Bug: 235296082
Test: atest VoiceInteractionSessionVisibleActivityTest
Change-Id: Id7db3a0dc9c2a17276ae213223fa3dd6ae572b9f
 2022-09-01 08:07:41 +00:00
Lucas Silva
2ce1b7fd37 Fix vulnerability that allowed attackers to start arbitary 
activities

Test: atest DreamServiceTest
Test: flashed device and verified dream settings works as expected
Fixes: 242845514
Change-Id: I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716
 2022-08-31 11:10:21 -04: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
a1eb8cf128 Merge "Fix array-related errorprone warnings" 2022-08-30 18:03:01 +00:00
Lucas Silva
1e16b3c217 Don't start dreams immediately if keyguard is occluded when docked. 
The keyguard must be showing and unoccluded, or the device is not
interactive (eg screen off) in order for dreams to be started
immediately when docked. This prevents dreams from starting if there is
an activity currently showing over the lockscreen.

Also includes some refactoring to be able to unit test this change,
since dock state changes were not previously tested.

Fixes: 233412496
Test: atest UiModeManagerServiceTest
Test: manually on device with keyguard occluded, unoccluded, and screen
off while docked

Change-Id: I12f1a4cf3ae4784e391e3c5a3fd1d50b4d4f7ecd
 2022-08-30 09:56:06 -04:00
Treehugger Robot
1ac9f9f922 Merge "Add dirtectories and OWNER files" am: 37310607aa am: 44028380e1 am: 5a543f5ac0 am: 87eb7a2711 am: cfdb4292fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2193497

Change-Id: I92ab20adb7645261b3663175bc0519fd7c84f3fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 20:49:40 +00:00
Treehugger Robot
cfdb4292fa Merge "Add dirtectories and OWNER files" am: 37310607aa am: 44028380e1 am: 5a543f5ac0 am: 87eb7a2711 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2193497

Change-Id: If1f13e509ddca2603de692d433ae6c554dc81359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 20:30:52 +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
Chloris Kuo
b5c3bf5638 Merge "Add new intent to open NAS detail settings page in NAS app." into tm-qpr-dev am: 235ce54b78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19719514

Change-Id: I636e201479940226d8b8a0280d3c99e2ab87c343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 22:59:01 +00:00
Chloris Kuo
235ce54b78 Merge "Add new intent to open NAS detail settings page in NAS app." into tm-qpr-dev 2022-08-24 22:37:57 +00:00
Chloris Kuo
f99fd3c87e Add new intent to open NAS detail settings page in NAS app. 
Bug: 231492005
Test: manually on local device
Change-Id: I87361b640c5fc7b258e3e807e14baeab52a66953
Merged-In: I87361b640c5fc7b258e3e807e14baeab52a66953
 2022-08-24 19:50:12 +00:00
Joanne Chung
140dff9b49 Merge "Fix toolbar announce wrong text." into tm-qpr-dev am: 3292a30a1c am: ff672bc4db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19632605

Change-Id: Ib9ed18b9de38598e639a526fdb3d63dd39751cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 05:57:41 +00:00
Joanne Chung
ff672bc4db Merge "Fix toolbar announce wrong text." into tm-qpr-dev am: 3292a30a1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19632605

Change-Id: If97f639c018bec3bcdb7e66b4e0d6b5b0848eadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 01:12:26 +00:00
Joanne Chung
3292a30a1c Merge "Fix toolbar announce wrong text." into tm-qpr-dev 2022-08-24 01:07:32 +00:00
Chloris Kuo
d748cfddaf Merge "Add new intent to open NAS detail settings page in NAS app." 2022-08-23 18:35:18 +00:00
Reema Bajwa
827821d058 Add dirtectories and OWNER files 
Change-Id: I8c6cf6632696f128e1cc68e3850448a33c3d79f3
 2022-08-23 18:15:22 +00:00
Daniel Kim
1c307b4ee5 Revert^2 "Add proximity state to the HotwordDetectedResult" am: aa972f2c88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19619189

Change-Id: Ia20d28254c35ede309ac0887d5747aad13371c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 01:55:19 +00:00
Daniel Kim
7811c2b731 Merge changes from topic "hotword_qpr" into tm-qpr-dev 
* changes:
  Revert "Revert "Refactor ProximityUpdateCallbackInternal to inte..."
  Revert^2 "Add proximity state to the HotwordDetectedResult"
 2022-08-20 01:30:46 +00:00
Joanne
53d6f568ec Fix toolbar announce wrong text. 
This is a regression during refactor toolbar code, we don't intent
to announce the toolbar popup window so we should not set content
description for the container.

Bug: 239563674
Test: manual. Turn on talkback and make sure the announce is correct
and the behavior is the same
Test: atest TextViewIntegrationTest pass for local/remote
Test: atest TextViewActivityTest pass for local/remote
Test: atest SuggestionsPopupWindowTest pass for local/remote

Change-Id: I6e30d2f6d9a2c4905b702c25655fe5e4eb7de5d5
 2022-08-19 13:42:24 +00:00
Chloris Kuo
b2c2d1aa17 Add new intent to open NAS detail settings page in NAS app. 
Bug: 231492005
Test: manually on local device
Change-Id: I87361b640c5fc7b258e3e807e14baeab52a66953
 2022-08-18 14:17:30 -07:00
Mady Mellor
2a1fdce412 Merge "Add a method in IDreamManager to check if dreaming OR in dream preview" into tm-qpr-dev am: 3448c2fe1c am: dfe71854c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19603443

Change-Id: I225c0ae9494b996f13631b0c8723da735ea64637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:46:56 +00:00
Mady Mellor
dfe71854c4 Merge "Add a method in IDreamManager to check if dreaming OR in dream preview" into tm-qpr-dev am: 3448c2fe1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19603443

Change-Id: I003dde1065c5d16c44bd63d7693b593d157fe47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:25:56 +00:00
Mady Mellor
3448c2fe1c Merge "Add a method in IDreamManager to check if dreaming OR in dream preview" into tm-qpr-dev 2022-08-17 18:51:28 +00:00
Joanne Chung
cf488547e4 Merge "Fix system toolbar doesn't use correct theme." into tm-qpr-dev am: 9e263e643d am: 20dbe919b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18800482

Change-Id: Idabdc7d36d30c014d383163a2e01c51fa76bbf9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 13:51:33 +00:00