Songchun Fan
88fb2c7e2a
[pm] fix sharedUserSetting during reconcile
...
requestSharedUserSetting and resultSharedUserSetting are sometimes
different.
BUG: 281626378
Test: presubmit
Change-Id: I09a7c762b6d41daaf62f472d23159bf432f0cef0
2023-05-09 10:22:00 -07:00
Beverly Tai
5c48f673fb
Merge "Move toTriple/Quad/Quint methods to a Utils class" into udc-dev am: c8abb1e0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23087236
Change-Id: Ia80de8d6943676b40302b7f31936496ba54587a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:21:17 +00:00
Nicolò Mazzucato
550f35fcdb
Merge "Change unfold background color based on split screen state" into udc-dev
2023-05-09 17:19:13 +00:00
arunvoddu
23755fe55e
New hidden API to support the CTS test case that checks the file contents remains unaltered.
...
Bug: 276402673
Test: atest tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java#testCarrierRestrictionStatusAllowList also pformed the sanity and all the basic scenarios are working fine.
Change-Id: I4922b6bf12820e61531782d01dabad55f3b63323
2023-05-09 17:18:05 +00:00
Guojing Yuan
641d66ba66
Merge "[ContextSync] Disable ContextSync flag by default" into udc-dev
2023-05-09 17:15:01 +00:00
Atneya Nair
3d360a0e49
Merge "Add AppOps listening to STService" into udc-dev
2023-05-09 17:14:49 +00:00
Helen Qin
60ef9de138
Merge "Handle empty auth entry title" into udc-dev
2023-05-09 17:10:09 +00:00
Treehugger Robot
b6699962a2
Merge "Only honor preferUiBrandingComponentName with permission" into udc-dev
2023-05-09 17:09:12 +00:00
TreeHugger Robot
02416e1589
Merge "Unlocked empty auth entry shouldn't be clickable anymore" into udc-dev
2023-05-09 17:08:42 +00:00
Treehugger Robot
5756c96508
Merge "Handle empty action entry subtitle" into udc-dev
2023-05-09 17:08:15 +00:00
Beverly Tai
5349dd72fb
Merge "On device lockdown, always show the keyguard" into udc-dev
2023-05-09 17:04:08 +00:00
Beverly Tai
c8abb1e0dc
Merge "Move toTriple/Quad/Quint methods to a Utils class" into udc-dev
2023-05-09 17:03:34 +00:00
Winson Chiu
64ea84cce3
Drop prebuilt files to android source tree.
...
The following files have been updated as part of this change:
packages/CtsShim/apk/arm/CtsShim.apk
package: name=com.android.cts.ctsshim
versionCode=34
versionName=14-10093150
platformBuildVersionName=14
compileSdkVersion=34
compileSdkVersionCodename=14
sdkVersion:24
targetSdkVersion:28
packages/CtsShim/apk/arm/CtsShimPriv.apk
package: name=com.android.cts.priv.ctsshim
versionCode=34
versionName=14-10093150
platformBuildVersionName=14
compileSdkVersion=34
compileSdkVersionCodename=14
sdkVersion:24
targetSdkVersion:28
packages/CtsShim/apk/x86/CtsShim.apk
package: name=com.android.cts.ctsshim
versionCode=34
versionName=14-10093150
platformBuildVersionName=14
compileSdkVersion=34
compileSdkVersionCodename=14
sdkVersion:24
targetSdkVersion:28
packages/CtsShim/apk/x86/CtsShimPriv.apk
package: name=com.android.cts.priv.ctsshim
versionCode=34
versionName=14-10093150
platformBuildVersionName=14
compileSdkVersion=34
compileSdkVersionCodename=14
sdkVersion:24
targetSdkVersion:28
Built here: ab/10093150
This build IS suitable for public release.
The change is generated with prebuilt drop tool.
Bug: 278988121
Test: presubmit
Change-Id: I6d54f4ff9b3f7645ee1badea879613061f07fa45
2023-05-09 17:03:18 +00:00
Simranjit Kohli
038ad91cd5
Merge "[Autofill PCC]: Fix SaveInfo IllegalArgumentException" into udc-dev am: d507626754
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23104432
Change-Id: I1f7a5e9f13865dc8b0b714ce30a3e7626af82d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:59:56 +00:00
Riddle Hsu
116fb2d5ff
Merge "Polish entering pip from fullscreen with shell transition" into udc-dev am: 16e51ba19f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22952408
Change-Id: Ib5ea65882875c64aca07aa00b4ebe396d4e0ac18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:59:28 +00:00
Massimo Carli
a689cfd589
Merge "Remove temporary double icon workarounds" into udc-dev am: d38421d06e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23051003
Change-Id: I88f637993d3e627e17b41b8f323d4984de16829f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:59:03 +00:00
Evan Rosky
25ad0662e2
Merge "Start tracking unknownvisibility immediately for launchBehind" into udc-dev am: 440cf52261
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089553
Change-Id: I183f23df08bcd0f76954ead0030ae6d557db752a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:58:36 +00:00
Android Culprit Assistant
5ed831fa9d
Revert "Log the process hosting component types in ProcessMemory..." am: 06d917ece1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23112808
Change-Id: If6b76230e56da2e4796a35dadcc50f6b736487f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:58:24 +00:00
Ioana Alexandru
2e13a4afde
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034
Change-Id: I801f497dd957cda7d145eda1202c580a1d5df899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:56:39 +00:00
Ioana Alexandru
820da584b7
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034
Change-Id: Ide3ce1307875134f8301b7b8a3386f1ee02c2f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:56:15 +00:00
Ioana Alexandru
5307ceb881
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: I8b658c46a429c2fac24a81051580c63db34a6567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:55:53 +00:00
Simranjit Kohli
d507626754
Merge "[Autofill PCC]: Fix SaveInfo IllegalArgumentException" into udc-dev
2023-05-09 16:55:45 +00:00
Ioana Alexandru
036b2e6c4f
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: I34c349c8fce823cf641597b7eff96ecf9e744116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:55:33 +00:00
Riddle Hsu
16e51ba19f
Merge "Polish entering pip from fullscreen with shell transition" into udc-dev
2023-05-09 16:49:43 +00:00
Massimo Carli
d38421d06e
Merge "Remove temporary double icon workarounds" into udc-dev
2023-05-09 16:43:57 +00:00
Evan Rosky
440cf52261
Merge "Start tracking unknownvisibility immediately for launchBehind" into udc-dev
2023-05-09 16:43:50 +00:00
Treehugger Robot
4637db23c2
Merge "Add metrics around scheduling failures." into udc-dev am: 07c181c783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089736
Change-Id: Iecc1225517791103fe8e8fd0d3e4919b64e6550f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:41:25 +00:00
Austin Borger
201ffd28d1
Merge "UidObserverController: Fix incorrect usage of binarySearch return value" into udc-dev am: fbcc05a92a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23095316
Change-Id: Ia74896b169b135f3187b10b86cf9afcbaa87bf26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:39:54 +00:00
Android Culprit Assistant
06d917ece1
Revert "Log the process hosting component types in ProcessMemory..."
...
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/5f01059b-51af-4073-b5d2-667ab4e4d6a3 ).
Bug: 10093767
Change-Id: I30e39f2eaaca0cd04d28cc030891cefb079f0404
2023-05-09 16:35:31 +00:00
Treehugger Robot
07c181c783
Merge "Add metrics around scheduling failures." into udc-dev
2023-05-09 16:34:47 +00:00
Austin Borger
fbcc05a92a
Merge "UidObserverController: Fix incorrect usage of binarySearch return value" into udc-dev
2023-05-09 16:30:56 +00:00
Dmitry Dementyev
ca24397a4d
Ignore failing RecoverableKeyStoreManager tests.
...
Failure started after certifcicate expiration.
Bug: 281583079
Test: atest com.android.server.locksettings.recoverablekeystore
Change-Id: I9f07182ec92f023ee74d90e861452b6906e6a1b1
2023-05-09 16:25:04 +00:00
Anton Potapov
7eaa5e3d5c
Use a separated Configuration instance to save the last state
...
Test: manual
Test: atest ControlsActivityTest
Fixes: 280500001
Change-Id: I8975b28a68c34cd27d4e53646d2b034a8edb97f9
2023-05-09 17:23:37 +01:00
Treehugger Robot
471cb6fdf8
Merge "Add PS5 controller PID to Alsa manager block list." into udc-dev am: ed6ae54c97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23078264
Change-Id: I8fdeea49e2fe661e3d86d513fa1fe3f7f816f99d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:22:27 +00:00
Atneya Nair
165600e003
Merge "Invalidate recognition token if model is stopped" into udc-dev am: 9204df3757
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23075452
Change-Id: I5c1e011628c3046ccf32ff2fb5317bbbc6778a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:20:56 +00:00
Treehugger Robot
ed6ae54c97
Merge "Add PS5 controller PID to Alsa manager block list." into udc-dev
2023-05-09 16:20:47 +00:00
Jean-Michel Trivi
9465d85a7e
Merge "AudioService: log stream mute events" into udc-dev am: b9683d61cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23078515
Change-Id: I5f93a0fa9faf8bb92566f0746aaa5c7ed24609db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:20:29 +00:00
Treehugger Robot
d37c382e2a
Merge "Handle integer overflow in BaseInputConnection" into udc-dev am: 51cacb70e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22900702
Change-Id: Ic0895b15e2042414e15bc442bde5b95f5627855c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:19:47 +00:00
Andreas Miko
c61016736f
Merge "Add tap to wake light reveal with tap position awareness" into udc-dev am: e28c758073
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22335733
Change-Id: I4316c9a29ae04da3f976b09699f42267323b443f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:19:05 +00:00
Ioana Alexandru
e707b58e15
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034
Change-Id: Idd5aa31ae78ca19dc665ad5eaacf14e7bb108f8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:19:03 +00:00
Ioana Alexandru
8135fa991b
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034
Change-Id: Id4901ea8d2b3160d8a738906dc50d2d84887ab5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:19:00 +00:00
Atneya Nair
9204df3757
Merge "Invalidate recognition token if model is stopped" into udc-dev
2023-05-09 16:18:45 +00:00
Ioana Alexandru
a8c418d17b
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: I24f8222147e250070ab20f946342b450c8286dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:18:44 +00:00
Ioana Alexandru
4e045e55d0
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: Ia9b18a463ccef0cf2d6bf949aad12e9da9c5ea0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:18:32 +00:00
Atneya Nair
d86afe8a94
Merge "Fix potential NPE in STHelper" into udc-dev am: c27813ebbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23075100
Change-Id: Ieb0addf0d728ee96af4b98467dfad219df6de558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:17:45 +00:00
Jean-Michel Trivi
b9683d61cb
Merge "AudioService: log stream mute events" into udc-dev
2023-05-09 16:16:43 +00:00
Dmitry Dementyev
e28a8c66a6
Ignore failing RecoverableKeyStoreManager tests.
...
Failure started after certifcicate expiration.
Bug: 281583079
Test: atest com.android.server.locksettings.recoverablekeystore
Change-Id: I9f07182ec92f023ee74d90e861452b6906e6a1b1
2023-05-09 09:15:57 -07:00
Treehugger Robot
51cacb70e6
Merge "Handle integer overflow in BaseInputConnection" into udc-dev
2023-05-09 16:14:40 +00:00
Yohei Yukawa
2fdfaa2a07
Implement InputConnectionWrapper#replaceText()
...
This is a follow up CL to our previous CL [1], which forgot to
implement
InputConnectionWrapper#replaceText().
As a result, it has alreays fallen back to the slow path even if the
wrapped InputConnection does have more efficient implementation of
InputConnection#replaceText().
With this CL, wrapped InputConnection can also start taking advantage
of the optimized version of InputConnection#replaceText() if
available.
This CL also adds InputConnectionWrapperTest#verifyAllMethodsWrapped()
to verify that tall the default methods defined in InputConnection are
implemented in InputConnectionWrapper.
[1]: Ia0e42270cfae112fcf19205a7151e4ab4ac4afdd
d5d530ad63
Bug: 241503197
Fix: 279960381
Fix: 281150084
Test: atest FrameworksCoreTests:InputConnectionWrapperTest
Change-Id: I02a3549f72bf969812bb924a51c18fc81a2668af
2023-05-09 16:13:33 +00:00
Andreas Miko
e28c758073
Merge "Add tap to wake light reveal with tap position awareness" into udc-dev
2023-05-09 16:13:27 +00:00