Kholoud Mohamed
065eefea23
Merge "Fix lock task clearing for affiliated users" into udc-dev am: 029eb856a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22766263
Change-Id: Icb12b7f3073916debda07573892c53131ec2fad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 15:39:42 +00:00
Kholoud Mohamed
b705b11968
Merge "Fix bug in userControlDisabledPackages on reboot" into udc-dev am: 0008bee5a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22766262
Change-Id: I97ec2ee5daa3852257c46eabcd34fc938425c28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 15:23:35 +00:00
Kholoud Mohamed
89f0525979
Merge "Enable unicorn APIs" into udc-dev am: a8b0dcfaef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22761777
Change-Id: Ie3c3aa06b1380aa38ba96f343e24c30c9571a617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 15:21:21 +00:00
Kholoud Mohamed
029eb856a3
Merge "Fix lock task clearing for affiliated users" into udc-dev
2023-04-24 14:48:58 +00:00
Kholoud Mohamed
0008bee5a3
Merge "Fix bug in userControlDisabledPackages on reboot" into udc-dev
2023-04-24 14:46:18 +00:00
Kholoud Mohamed
a8b0dcfaef
Merge "Enable unicorn APIs" into udc-dev
2023-04-24 14:45:11 +00:00
Vlad Popa
e0fd0c2f5d
Merge "CSD: Fix initial logic for mSafeMediaVolumeState" into udc-dev am: 661518fc70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22810558
Change-Id: Id53d451c33ef06130615ede87fccc674529a9a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 13:53:49 +00:00
Vlad Popa
661518fc70
Merge "CSD: Fix initial logic for mSafeMediaVolumeState" into udc-dev
2023-04-24 13:42:20 +00:00
Beverly Tai
aecdc36b3a
Merge "Only ONE view controller controls KeyguardIndication" into udc-dev am: 353d5f1229
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22786080
Change-Id: Iaf80421d0b382eec8e6b3f059d7056424c40f3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 13:32:09 +00:00
Beverly Tai
353d5f1229
Merge "Only ONE view controller controls KeyguardIndication" into udc-dev
2023-04-24 13:12:53 +00:00
Oleg Petšjonkin
5a59193901
Merge "Extracting VotesStorage to separate class with local locking" into udc-dev am: 24dcc93de7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22289563
Change-Id: I3b05ea2575cccb298965bba803d44fb137493b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 13:11:53 +00:00
Oleg Petšjonkin
0ae9b36da3
Merge "Properly handling situation when display is added and removed instantly" into udc-dev am: 23636fedc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22761588
Change-Id: Ife656de9c1b0a59a9099351e7dafe18897455246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 13:11:05 +00:00
Oleg Petšjonkin
24dcc93de7
Merge "Extracting VotesStorage to separate class with local locking" into udc-dev
2023-04-24 12:51:56 +00:00
Oleg Petšjonkin
23636fedc6
Merge "Properly handling situation when display is added and removed instantly" into udc-dev
2023-04-24 12:35:39 +00:00
Kholoud Mohamed
1fac50a2bd
Merge "Allow setting lock task features without setting packages" into udc-dev am: f0a411d69c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22761399
Change-Id: Ia15bb42a5bf67be22c8e2fb7ca8c1ffeaaf59653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 12:08:25 +00:00
Kholoud Mohamed
f0a411d69c
Merge "Allow setting lock task features without setting packages" into udc-dev
2023-04-24 11:54:05 +00:00
Vaibhav Devmurari
cfa107bb78
Merge "Add Home shortcut Meta+Enter" into udc-dev am: f83766ecce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22764147
Change-Id: I57ebed4d9c39f0571a0458b545d1657267fb5c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 11:47:45 +00:00
Vaibhav Devmurari
5f1c72239d
Merge "Show all KCMs if IME doesn't provide language tag information" into udc-dev am: d2ca40f78d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22799639
Change-Id: I48c3124175d1d92c07d3572e2e65f184c95355ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 11:47:11 +00:00
Vaibhav Devmurari
5dd010014c
Merge "Maintain keyboard configuration and reload layouts if changed" into udc-dev am: ec725e14e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22573861
Change-Id: I5a025da8b96ce1b9f836976490014628b65f6217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 11:09:20 +00:00
Vaibhav Devmurari
7b25ec96d9
Merge "Fix crash: ArrayIndexOutOfBounds on restoring backlight" into udc-dev am: 78a9212630
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22806556
Change-Id: I21683f6c4864e4e49daa7756b75604eedd9b118f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 11:07:31 +00:00
Vaibhav Devmurari
f83766ecce
Merge "Add Home shortcut Meta+Enter" into udc-dev
2023-04-24 11:02:26 +00:00
Vaibhav Devmurari
d2ca40f78d
Merge "Show all KCMs if IME doesn't provide language tag information" into udc-dev
2023-04-24 11:02:08 +00:00
Vaibhav Devmurari
ec725e14e8
Merge "Maintain keyboard configuration and reload layouts if changed" into udc-dev
2023-04-24 11:01:10 +00:00
Vaibhav Devmurari
78a9212630
Merge "Fix crash: ArrayIndexOutOfBounds on restoring backlight" into udc-dev
2023-04-24 11:00:34 +00:00
Kholoud Mohamed
c7fc36a82c
Fix lock task clearing for affiliated users
...
Fixes: 278141432
Test: com.android.cts.devicepolicy.DeviceOwnerTest#testSetUserControlDisabledPackages_singleUser_reboot_verifyPackageNotStopped
Change-Id: I19c64a39cdee4395c7eabf9f3da3f0c53a691d90
2023-04-24 10:29:12 +00:00
Kholoud Mohamed
3b366ef5f5
Fix bug in userControlDisabledPackages on reboot
...
Test: com.android.cts.devicepolicy.DeviceOwnerTest#testSetUserControlDisabledPackages_singleUser_reboot_verifyPackageNotStopped
Fixes: 278141432
Change-Id: I640e054529a16c4efc691cf3b15a26ca853f1209
2023-04-24 10:29:05 +00:00
Kholoud Mohamed
e97dbbc052
Enable unicorn APIs
...
Bug: 273494642
Test: N/A
Change-Id: Iafd78cb61d96abe5299377f1cec86f2dc0d299d9
2023-04-24 10:27:21 +00:00
Vlad Popa
5e7759ba5e
CSD: Fix initial logic for mSafeMediaVolumeState
...
When refactoring the safe hearing logic into the SoundDoseHelper we
simplified the msg enum logic for configuring the safe hearing state.
This lead to an issue allowing the forced init messages to be removed by
the config changed message.
Reintroduced the different messages for state configuration which should
fix the issue of having devices with MCC 0 not configured for safe
hearing.
Test: check state in dumpsys
Bug: 278822191
Change-Id: I515ca3e5dec3f0d1facf752e6f82886b9760bb04
2023-04-24 12:21:15 +02:00
Oleg Petsjonkin
d6795179ab
Properly handling situation when display is added and removed instantly
...
Bug: b/279146324 b/279145472 b/270742628
Test: atest DisplayModeDirectorTest atest ActivityThreadTest atest LogicalDisplayTest
Change-Id: Ic48d67f4c1e383ca1419eb3980625a61ce766a7c
2023-04-24 10:05:43 +00:00
Adrian Roos
5231d41a76
Merge "Add missing validation in IInputMethodWrapper" into udc-dev am: 9c6a31ea65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22719022
Change-Id: Ia5c63888479e5e813949e35a8a52150f49878d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 09:48:45 +00:00
Oleg Petsjonkin
7e857c3942
Extracting VotesStorage to separate class with local locking
...
Bug: b/266789924
Test: atest com.android.server.display.mode
Change-Id: I8fb46b393a96db6476db58a025cf881516754bf9
2023-04-24 09:27:21 +00:00
Adrian Roos
9c6a31ea65
Merge "Add missing validation in IInputMethodWrapper" into udc-dev
2023-04-24 09:10:30 +00:00
Riddle Hsu
ce9d570925
Merge "Validate forced display size from settings" into udc-dev am: a8d94a19c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22728988
Change-Id: Ia79b599bbd4239fe4df174e629f286025bc02511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 08:16:48 +00:00
Riddle Hsu
a8d94a19c0
Merge "Validate forced display size from settings" into udc-dev
2023-04-24 07:39:33 +00:00
Shubang Lu
226db58a67
Merge "Fix a bug in timeshift mode" into udc-dev am: 750d5d6837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22749264
Change-Id: Icf1e2bb9b6cf467a05be24f9bfb4eb7be5ef7e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 06:32:21 +00:00
Shubang Lu
750d5d6837
Merge "Fix a bug in timeshift mode" into udc-dev
2023-04-24 05:56:42 +00:00
Louis Chang
2e6da43dd2
Merge "Create transition when converting an Activity to translucent" into udc-dev am: cf71476fd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22779397
Change-Id: I69faa63ecd347eb2dff4df1d08ce64779c5c7138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 03:45:01 +00:00
Louis Chang
cf71476fd8
Merge "Create transition when converting an Activity to translucent" into udc-dev
2023-04-24 03:10:52 +00:00
Vaibhav Devmurari
867beac911
Fix crash: ArrayIndexOutOfBounds on restoring backlight
...
Test: atest KeyboardBacklightControllerTests
Bug: 279322814
Change-Id: I1edf9fcbe38a230976e67c0de263ced74745e7b3
2023-04-23 20:41:20 +00:00
Atneya Nair
b59877b40e
Merge changes from topic "detach_cut" into udc-dev am: 8bcb06a146
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22536415
Change-Id: I7036709ede8a3aadac1192ec5bcd9cf7044cf20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 18:57:16 +00:00
Atneya Nair
ba5164c9a3
Protect STHelper from calls after detach am: 14de650038
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22477697
Change-Id: I97c32184b64d25960e249112d843140d32dbe30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 18:57:11 +00:00
Atneya Nair
8bcb06a146
Merge changes from topic "detach_cut" into udc-dev
...
* changes:
[hotword] detach session when detector is destroyed
Protect STHelper from calls after detach
2023-04-23 17:46:47 +00:00
Vaibhav Devmurari
81f10425e6
Show all KCMs if IME doesn't provide language tag information
...
Test: atest KeyboardLayoutManagerTests
Bug: 279281653
Change-Id: Idce443602bfa844b59754f980f8fc0ec0b2b7e66
2023-04-23 14:38:21 +00:00
Vaibhav Devmurari
94c48398e7
Add Home shortcut Meta+Enter
...
Test: atest ModifierShortcutTests
Bug: 277081504
Change-Id: I850667c836e32ee8ae6cf9dbac028716115299c0
2023-04-23 11:25:16 +00:00
Chaohui Wang
d36a80a466
Merge "Upgrade SpaLib AGP to 8.0.0" into udc-dev am: 9b1982542f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22800060
Change-Id: If8a35904bffc26c4edbe9207db69224b1e6196a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 06:07:48 +00:00
Chaohui Wang
9b1982542f
Merge "Upgrade SpaLib AGP to 8.0.0" into udc-dev
2023-04-23 05:53:07 +00:00
Chaohui Wang
a1a07d9489
Merge "Add vertical padding between Spinner texts" into udc-dev am: 0f8650e54c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22779457
Change-Id: I0f4dce2438138d7a61b5247aa901e9486cf2b6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 05:47:29 +00:00
Chaohui Wang
0f8650e54c
Merge "Add vertical padding between Spinner texts" into udc-dev
2023-04-23 05:11:10 +00:00
Chaohui Wang
f061fcdd9d
Upgrade SpaLib AGP to 8.0.0
...
Also
- Kotlin to 1.8.10
- Unify the kotlin jvm target version to 17.
- androidx.navigation:navigation-compose to 2.6.0-alpha08
Bug: 260441791
Test: Gradle Sync
Test: Build Gallery
Change-Id: Iddf49d2b630674d25216cde625cf3e0027f57f05
2023-04-23 10:49:16 +08:00
Atneya Nair
14de650038
Protect STHelper from calls after detach
...
Now that we expose detach to upper layers, we should ensure that
calling a method on a detached STHelper strongly errors.
Fixes: 277390523
Bug: 272147641
Test: atest AlwaysOnHotwordDetectorTest#isSessionInvalid_afterDetach
Change-Id: I32cf30d711e27debed0d643a9627663830e2ccf6
2023-04-22 15:22:15 -07:00