Commit Graph

813479 Commits

Author SHA1 Message Date
Santiago Seifert
e0eab7ed87 Merge "Add aquilescanta to SettingsLib owners" 2023-02-01 16:26:41 +00:00
Santiago Seifert
5e4a514797 Add aquilescanta to SettingsLib owners
For minor changes only, to avoid cross timezone dependencies.

Bug: 205124386
Change-Id: Id67f030e9bf83bcdf9fbbeb2f6b35240263a0d0f
Test: N/A. OWNERS change.
2023-02-01 14:48:08 +00:00
Jack Yu
77d44520e2 Use IPv4v6 as default protocol when APN setting is not available
Use IPv4v6 for default protocol and IPv4 for default roaming protocol
when APN setting is not available.

Fix: 258636082
Test: atest DataProfileTest
Merged-In: Ic61fa42f99750e6e48ea1cd08f058af3fd67c551
Change-Id: Ic61fa42f99750e6e48ea1cd08f058af3fd67c551
2023-01-31 20:42:51 -08:00
Jordan Demeulenaere
fac75fe58b Use minimumInteractiveComponentSize() instead of custom modifier
Bug: 266151699
Bug: 267373926
Test: Open the Dialog screen in the gallery app, notice that even small
expandables are at least 48dp

Change-Id: I6f3803bcbc849ed89b7e7c4179d53ebf2e4b3cf1
2023-02-01 00:57:16 +00:00
Chris Wailes
bd0b423890 Merge "Skip resetting the stack protector on eng builds" am: 838c317e2d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2407872

Change-Id: I71ec8fd573bad385d074c9ad6689cdcd99a992d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 20:10:46 +00:00
Chris Wailes
838c317e2d Merge "Skip resetting the stack protector on eng builds" 2023-01-31 19:58:41 +00:00
Jason Chang
9a1634a944 Merge "Fix typo TOLERENCE --> TOLERANCE" am: aefe92f478
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2407716

Change-Id: I687a2b422d7a17f75f914d92f92386dca7e45eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 19:51:21 +00:00
Jason Chang
aefe92f478 Merge "Fix typo TOLERENCE --> TOLERANCE" 2023-01-31 17:47:39 +00:00
Treehugger Robot
442199a93d Merge "voiceinteraction: Add VisualQuery OWNERS" am: 2a8503514b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2410953

Change-Id: I00d7fd19aa654a147eb677c817f47979b8d19322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 17:01:28 +00:00
Eran Messeri
c17512848d Merge "Keystore: Attestation fix in AOSP builds" am: ecb4b6d158
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2237500

Change-Id: I1317f2c69bfa97e189d522548596a57a6b2f2586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 16:59:07 +00:00
Treehugger Robot
2a8503514b Merge "voiceinteraction: Add VisualQuery OWNERS" 2023-01-31 15:15:53 +00:00
Andrea Ambu
8caf768eee voiceinteraction: Add VisualQuery OWNERS
Test: n/a -- will be used in ag/20886376
Bug: 264557373
Change-Id: I72af3bc71cd6f41873a47a2466578084e3cbe7bb
2023-01-31 13:50:13 +00:00
Eran Messeri
ecb4b6d158 Merge "Keystore: Attestation fix in AOSP builds" 2023-01-31 13:43:56 +00:00
Chris Wailes
ffd57d7a41 Skip resetting the stack protector on eng builds
This CL will cause the Zygote to skip re-initialization of the stack
protector cookie on Eng builds.  This will prevent interpreter functions
that would not normally appear on the critical call path from causing
stack check failures.

Bug: 265760793
Test:  m libandroid_runtime (to ensure correct branch of pre-processor
conditional is taken)

Change-Id: I7ec7ac5a2230d1078c818013ae90f3d2597734a3
2023-01-30 14:15:28 -08:00
Treehugger Robot
9e0210622d Merge "Convert RecoverySystemService to use AIDL BootControl HAL" am: b1cd796fa6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2399144

Change-Id: I4d9881a3b103df8f5ca5c88807a378db807f14c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 21:58:09 +00:00
Treehugger Robot
b1cd796fa6 Merge "Convert RecoverySystemService to use AIDL BootControl HAL" 2023-01-30 21:29:44 +00:00
Jason Chang
4b30f5bab9 Fix typo TOLERENCE --> TOLERANCE
Test: refactoring CL. Existing unit test still pass.

Change-Id: I8f6e48d3fe4342ae28739f59fd62950aeb79fc71
2023-01-30 19:15:16 +00:00
Treehugger Robot
64a23c980f Merge "Fix "form/from" typos in comments" am: c66a390867
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392792

Change-Id: Id371845b254598cdc40f1a3464ac980c04b52e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 18:42:11 +00:00
Treehugger Robot
c66a390867 Merge "Fix "form/from" typos in comments" 2023-01-30 17:51:39 +00:00
Seth Moore
f852fd961a Merge "Add support for new OUT_OF_KEYS_* errors" am: eac01345e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2399533

Change-Id: If4426490accf88d275ba524893fc857a1fca17e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 17:27:09 +00:00
Seth Moore
eac01345e5 Merge "Add support for new OUT_OF_KEYS_* errors" 2023-01-30 17:11:37 +00:00
qinyige1
5408d16fb7 [EasterEgg][Bugfix] Create PendingIntents with flag FLAG_MUTABLE.
PendingIntent attached to BubbleMetadata should not be immutable.

Bug: 267009669
Test: Manual
Change-Id: I2063c973146f9376e5ea90285f67cbe500e9646d
2023-01-29 15:32:23 +08:00
Shen Lin
514e43a6ab Change mODICaptionsTooltipView null check occasion to avoid potential crash
Null check before a runnable can not guarantee a non-null
mODICaptionsTooltipView when it starts running. This CL switched the
null check occasion to fix it.

Fixes: 266980616
Test: manual, atest
Change-Id: I3c83e775a7fd278dc255242518412ba790625fdb
2023-01-29 06:49:08 +00:00
Treehugger Robot
caebc65963 Merge "Add a method to note waking network packets to BatteryStats" am: b3238fc8a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2403112

Change-Id: I249d7181241140b8267544e27510d8758e057791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-28 12:26:01 +00:00
Treehugger Robot
b3238fc8a4 Merge "Add a method to note waking network packets to BatteryStats" 2023-01-28 11:12:42 +00:00
Yixiao Luo
249b09ac23 Merge "Add constants for supplementary audio placement" am: f5ac336b1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2380848

Change-Id: I190d3ed1395486c5679ffd16f9620b3c84231cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-28 06:47:44 +00:00
Yixiao Luo
f5ac336b1d Merge "Add constants for supplementary audio placement" 2023-01-28 06:18:11 +00:00
Xiang Wang
b370f5ac98 Merge "Add owners to ThermalManagerService mocking tests" am: b51c532a58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2364067

Change-Id: I8e28713b01ffcab4ae0bcfc25c09d642a60addfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-28 02:59:27 +00:00
Android Build Coastguard Worker
9295c136bf Merge cherrypicks of ['googleplex-android-review.googlesource.com/21091394', 'googleplex-android-review.googlesource.com/21116839'] into tm-qpr2-release.
Change-Id: I3a1a2ca5006b81b4c3bef31af915be727da22db6
2023-01-28 02:57:18 +00:00
Behnam Heydarshahi
cbcb3ba0e5 DO NOT MERGE ANYWHERE
Revert "Change volume ringer icon based on device config"

This reverts commit 903b3025a7.

Reason for revert: b/261809910 fixing for qpr2

Change-Id: Ica3ef9df1470fd2b5e20fc8caa3bdf6647a21426
(cherry picked from commit 1bdb0b76bfa439abf6cddb11e752aec3499d8f03)
Merged-In: Ica3ef9df1470fd2b5e20fc8caa3bdf6647a21426
2023-01-28 02:56:55 +00:00
Behnam Heydarshahi
69cf0a56f4 DO NOT MERGE ANYWHERE
Revert "Add flag to separate notification audio and ui"

Revert submission 20180104-flag_for_b38477228

Reason for revert: b/261809910 fixing for qpr2

Reverted changes: /q/submissionid:20180104-flag_for_b38477228

Include only in tm-qpr2-release because fix forward is already submitted to tm-qpr-deb at ag/20806122

Change-Id: I35549d7b7b41632c857bdbdda02ddb7220208243
(cherry picked from commit 9fcce567af715a80929a4bbbdfdffa3410ae0d8e)
Merged-In: I35549d7b7b41632c857bdbdda02ddb7220208243
2023-01-28 02:56:48 +00:00
Xiang Wang
b51c532a58 Merge "Add owners to ThermalManagerService mocking tests" 2023-01-28 02:11:30 +00:00
Yixiao Luo
9a4ba4d624 Add constants for supplementary audio placement
bug: 230158637
test: mmm
Change-Id: Iebde7dcb0ecfcc47c771a65aa633d2fbe1ee7ba3
2023-01-27 16:46:30 -08:00
Suprabh Shukla
676d9e3f28 Add a method to note waking network packets to BatteryStats
This will be used to attribute CPU wakeups to the correct subsystem and
uids when possible.

Test: Builds, boots.

Bug: 265742148
Change-Id: I1a29fc7cbe74990e317f0d62d3894523387bdde1
Merged-In: I1a29fc7cbe74990e317f0d62d3894523387bdde1
2023-01-27 23:59:35 +00:00
Nick Kovacs
8b33a118c1 Merge "Add install flag --bypass-low-target-sdk-block" am: e39d3e9347
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2401860

Change-Id: Iab7df36315210221e55097d70abf41c9f185a9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:35:56 +00:00
Mitch Phillips
2c8ed23591 Merge "Add explicit handling for an unspecified gwpAsanMode manifest flag." am: 95e227bf7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2405114

Change-Id: Ice81f9e296c484a2142d8b078f08201b1b8b8bb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:33:56 +00:00
Kyle Zhang
8b8a0a5f36 Merge "Check NULL for Drm object" am: 849320e814
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2401079

Change-Id: I1db05b3d7941b0d8296025cadc2d7dd2dc17549b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:31:32 +00:00
Treehugger Robot
19ea10dfd5 Merge "Disable librs_jni for riscv64" am: 516a2f8815
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2403115

Change-Id: I58915ac6918e53fd069e223152bf69228df3522e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:29:49 +00:00
Michael Wright
08ddcb1ba6 Merge "Don't warn for displays with no input device matching." am: c5253c1d1c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2277826

Change-Id: Ie732c3c4020ee2eac35703cabea10658f1669ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:25:14 +00:00
Victor Chang
8d159732f7 Merge "Remove libandroidicu usage" am: cc3049a2c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378888

Change-Id: I6e006408ef213cd8ba1f2a6c46a1edf7c9bd92a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:14:05 +00:00
Yixiao Luo
8efed016b9 Merge "Add API to register AttributionSource of TV App to TIS" am: 9a2db08346
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2356827

Change-Id: I5d0997ff602582794bca39ef9c6ec53e0999da92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:07:36 +00:00
Nick Kovacs
e39d3e9347 Merge "Add install flag --bypass-low-target-sdk-block" 2023-01-27 19:58:07 +00:00
Kelvin Zhang
ae97009ea5 Convert RecoverySystemService to use AIDL BootControl HAL
Test: th
Bug: 227536004

Merged-In: I4938a4a9a9b1ccffc55f45634b321f44b5cd5fa5
Change-Id: I4938a4a9a9b1ccffc55f45634b321f44b5cd5fa5
2023-01-27 18:27:57 +00:00
Mitch Phillips
95e227bf7b Merge "Add explicit handling for an unspecified gwpAsanMode manifest flag." 2023-01-27 15:23:37 +00:00
Nick Kovacs
ffa1a73c53 Add install flag --bypass-low-target-sdk-block
Added a PM shell install flag to bypass the low target sdk block for
installing apps that are using low targetSdkVersion.

When set, this flag will bypass the install block and
allow the app to be installed.

Bug: 237321649
Test: adb install --bypass-low-target-sdk-block
~/install_target_sdk_22.apk

Change-Id: If6d47d60c4768f704b8ba6d4f5f07b5127b44cf7
Merged-In: Ie6d44b5f16bf7dd35d3c75f51a9c94fd4ef9dcb6
Merged-In: I42b003f8c42a7f8c45a581bd9383c78090462d0f
2023-01-27 15:05:11 +00:00
Seth Moore
9ae19e5001 Add support for new OUT_OF_KEYS_* errors
This is the first in a set of changes that get RKP error data directly
from keystore.

Starting with Android U, we get detailed RKP error information directly
in the ResponseCode from keystore. This means mRkpStatus and related
logic can be removed after AOSP fully switches over to using rkpd
from the old RemoteProvisioner.

Test: RkpdAppUnitTests
Bug: 264888027
Change-Id: I32e128cca51b2d7dfdd67824ecb100f4e1cd4341
2023-01-26 16:29:41 -08:00
Mitch Phillips
11bfbf075c Add explicit handling for an unspecified gwpAsanMode manifest flag.
In future, we'd like to change the default for an unspecified
gwpAsanMode flag. Currently, this implies
mallopt(M_INITIALIZE_GWP_ASAN, { .desire =
DONT_TURN_ON_UNLESS_OVERRIDDEN }) for non-system apps and { .desire =
TURN_ON_WITH_SAMPLING } for system apps.

But, as noted in the TODO, we'd like to change this behaviour. Thus, we
need to plumb through the fact that the manifest flag was left
unspecified.

Bug: 247012630
Test: Add some logging code to libc's android_mallopt, install an app
with an unspecified gwpAsanMode, and make sure that log line is hit.

Change-Id: I45b064c89ceeace0014a19ba1d9e8ac0a2157328
2023-01-26 15:23:19 -08:00
Kyle Zhang
849320e814 Merge "Check NULL for Drm object" 2023-01-26 19:16:46 +00:00
Treehugger Robot
516a2f8815 Merge "Disable librs_jni for riscv64" 2023-01-26 17:37:33 +00:00
Michael Wright
c5253c1d1c Merge "Don't warn for displays with no input device matching." 2023-01-26 16:18:11 +00:00