Pawan Wagh
9cd187ba6e
Merge "Turn off automatic updates in page-agnostic mode" into main am: ef175b48f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073273
Change-Id: I6bb3f97b0ddc16c7914a26507b2820d3d5b51413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 14:28:23 +00:00
Pawan Wagh
ef175b48f8
Merge "Turn off automatic updates in page-agnostic mode" into main
2024-05-07 14:11:01 +00:00
Treehugger Robot
74da70de2d
Merge "Disallow turning off developer options in page-agnostic mode" into main am: 0d124654ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073278
Change-Id: I87d83efc72a97bd942b522716d799efd6e5ed033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 06:44:32 +00:00
Treehugger Robot
0d124654ca
Merge "Disallow turning off developer options in page-agnostic mode" into main
2024-05-07 06:30:59 +00:00
Pawan Wagh
e4b9c69442
Disallow turning off developer options in page-agnostic mode
...
When device is in page-agnostic mode, it would be OEM unlocked and
filesystem will be different than production. Don't allow to turn
off developer options in that state.
Bug: 329657279
Bug: 295035851
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: I9b8a9dbaf8192bb3758c53501450eb45e2fe8d9c
2024-05-07 05:30:23 +00:00
Pawan Wagh
e84cce90b3
Merge "Show persistent notification for page-agnostic mode" into main am: 4795662e6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073296
Change-Id: Ic8c971596e79dd0fd54ba6c22b0c003cbd8564f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 02:29:30 +00:00
Pawan Wagh
f224840b37
Merge "Make links in dialog text clickable" into main am: 12ff1e2422
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3072263
Change-Id: Id907c80bdb3f090ea83bd7c74f3df329142b46cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 02:29:12 +00:00
Pawan Wagh
4795662e6a
Merge "Show persistent notification for page-agnostic mode" into main
2024-05-07 02:13:53 +00:00
Pawan Wagh
12ff1e2422
Merge "Make links in dialog text clickable" into main
2024-05-07 02:13:30 +00:00
Pawan Wagh
b98a8acf9b
Turn off automatic updates in page-agnostic mode
...
Update global settings to disable updates in page-agnostic mode
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 302391134
Change-Id: I170bb3ffd50a08a1399bffcde23e5f111d9a5a1d
2024-05-06 22:17:30 +00:00
Pawan Wagh
a697fba513
Show persistent notification for page-agnostic mode
...
When device enters page-agnostic mode using 16KB developer
options, show notification to user using boot receiver and service.
On clicked on notification, show detailed instructions on how to
get back to production mode. Removing OEM carrier unlock allowed
condition.
Bug: 295035851
Bug: 338139755
Bug: 302600682
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: Ib7a57af4c6151d2a8da1ec94130532d10b1679aa
2024-05-06 22:16:27 +00:00
Eric Biggers
231766c463
Merge changes I20f2330d,Iaca5b20c into main am: 790e28c431
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3061866
Change-Id: I1216169e50d35d6bd80cd016c55a0db77dc08830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-06 17:52:05 +00:00
Eric Biggers
790e28c431
Merge changes I20f2330d,Iaca5b20c into main
...
* changes:
Remove unused class ShadowKeyStore
Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF
2024-05-06 17:36:00 +00:00
Kangping Dong
030ebbf23c
Merge "fix container designation, it should be system_ext" into main am: 91d5413375
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3074306
Change-Id: Ia19b4a08cb1434b89ebbb6eed89096e1ffb31070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-06 09:09:19 +00:00
Kangping Dong
91d5413375
Merge "fix container designation, it should be system_ext" into main
2024-05-06 08:55:06 +00:00
Dennis Shen
d9ec7f2b34
fix container designation, it should be system_ext
...
Cherry pick of internal aflag fix ag/27165141
Bug: b/338095619
Merged-In: I8ee2fd5fad529da2026af77f969abbf88e636ac3
Change-Id: Icea56b89944afd85b7760265ea8bfe35e3300f13
2024-05-06 14:35:13 +08:00
Oriol Prieto Gascó
7812cfcee5
Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: 14d4df602b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647
Change-Id: I90cf0dba57d305ef58f757191600254b0a20a0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 14:26:07 +00:00
Oriol Prieto Gasco
1aaa1f96ca
RESTRICT AUTOMERGE am: 0a441b2f06
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647
Change-Id: Ia5cc1f4909193ced38a676a7bc84e9795d823bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-03 14:25:55 +00:00
Oriol Prieto Gascó
14d4df602b
Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main
2024-05-03 14:09:48 +00:00
Oriol Prieto Gasco
0a441b2f06
RESTRICT AUTOMERGE
...
Set the container field of aconfig flags
Test: printflags --format='{package}:{container}:' | grep "::"
Bug: 312769710
Flag: NONE
Change-Id: I4fc69f563ead7206ef48278be4fb4cbcfc9cb1f7
2024-05-03 11:42:26 +00:00
Pawan Wagh
883f1e9dba
Merge "Apply OTA from /vendor/boot_otas" into main am: 8c85f8b3c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3065886
Change-Id: I6bb52915494151ca4cab3508110899f321b239b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-02 19:54:25 +00:00
Pawan Wagh
8c85f8b3c3
Merge "Apply OTA from /vendor/boot_otas" into main
2024-05-02 19:28:44 +00:00
Pawan Wagh
7d0d858136
Make links in dialog text clickable
...
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Change-Id: I71d4f5cb1e27cd52e6f0c5aaeabc9b3f89520cf1
2024-05-02 18:04:58 +00:00
Pawan Wagh
2c05fc6e52
Merge "Updating strings for 16KB developer option" into main am: ed3a48df6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068826
Change-Id: I11d162dcac3ba62aa6b9d3b87473645deacc3242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-01 23:44:58 +00:00
Pawan Wagh
ed3a48df6a
Merge "Updating strings for 16KB developer option" into main
2024-05-01 23:23:32 +00:00
Pawan Wagh
aaa0a3faf5
Updating strings for 16KB developer option
...
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Change-Id: Ie70b238985b1ccaf3f8893efa6687629d767729e
2024-05-01 21:16:59 +00:00
Pawan Wagh
07f71333bc
Merge "Set 16K dev option as checked by default for 16KB page size" into main am: 4c647972fe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3053444
Change-Id: I17006093b2505056becde9efd2e4ccca3d76b4b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-30 03:47:37 +00:00
Pawan Wagh
4c647972fe
Merge "Set 16K dev option as checked by default for 16KB page size" into main
2024-04-30 03:33:54 +00:00
Pawan Wagh
a961dfe289
Apply OTA from /vendor/boot_otas
...
If BOARD_16K_OTA_MOVE_VENDOR := true is set, OTAs will be present at
/vendor/boot_otas for 16KB developer option. Apply OTA from vendor if
present, otherwise fallback to system OTAs
Test: m, m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 335022191
Change-Id: I534b354c830de2c90fee76502667d5e4ef5a7714
2024-04-29 22:17:46 +00:00
Treehugger Robot
4e01eba72c
Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main am: 4ab7d5bacc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3058523
Change-Id: Id0ba2a35398e129e8855db927ac7dd483edab9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-26 12:42:30 +00:00
Treehugger Robot
4ab7d5bacc
Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main
2024-04-26 12:27:51 +00:00
Eric Biggers
f56ead496e
Remove unused class ShadowKeyStore
...
Since the class android.security.KeyStore is going away, remove the
unused test utility class ShadowKeyStore that references it.
(ShadowKeyStore was originally used by a test, but
https://r.android.com/1353609 deleted that test.)
Bug: 326508120
Test: build
Flag: TEST_ONLY
Change-Id: I20f2330dee171a0bfe860a1318dc2f962a80bd19
2024-04-25 19:46:54 +00:00
Eric Biggers
3fd46cc27d
Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF
...
Since the class 'android.security.KeyStore' is going away, the UID_SELF
constant is being moved to a more appropriate location in KeyProperties.
Update code that references this constant to use the new location. No
change in behavior; the value of the constant remains the same.
Bug: 326508120
Test: build
Flag: NONE mechanical refactoring with no behavior change
Change-Id: Iaca5b20c37b7952df8f26a99b3f7391c5a7f01b6
2024-04-25 19:21:31 +00:00
Jeff DeCew
1d4d5343cc
Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()
...
Change-Id: I1b628f9430cfdd4b1c12deb7e8f4345658f05ca8
Test: atest
Bug: 336802415
Flag: none
2024-04-24 16:56:31 +00:00
Treehugger Robot
90d0111cfd
Merge "Tightens Accessibility Settings owners." into main am: 1c7a9269a1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3052422
Change-Id: I09ed68909389eb2fdc9f5f6d97f915a32fa9137b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-23 19:48:49 +00:00
Treehugger Robot
1c7a9269a1
Merge "Tightens Accessibility Settings owners." into main
2024-04-23 19:35:23 +00:00
Anna Bauza
469cc72050
Merge "Integrating new Avatar Picker App in Settings" into main am: cb9cd3fa46
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3051323
Change-Id: I54107dc624b4787281e475e9e7abd469a581461c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-23 12:16:04 +00:00
Anna Bauza
cb9cd3fa46
Merge "Integrating new Avatar Picker App in Settings" into main
2024-04-23 12:10:34 +00:00
Pawan Wagh
c1659eaeee
Set 16K dev option as checked by default for 16KB page size
...
Page agnostic targets use 16KB pages by default. Set the developer
option for 16KB enabled when booted with 16KB page size.
Bug: 303280163
Bug: 295035851
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: I01457ce3003ea884c7d1e47aca6b85aab341aa24
2024-04-22 22:22:03 +00:00
Daniel Norman
5c32deeb16
Tightens Accessibility Settings owners.
...
Per discussion with leads, we'd like to ensure that Settings > Accessibility changes are seen
and approved by the Android Accessibility team. This change prevents default Settings owners
from accidentally approving changes without looping in a11y, while ensuring Settings lead cipson
has approval for emergency changes.
Change-Id: I914067a4d2616c212309b70fb29679f9acfa7643
2024-04-22 16:54:42 +00:00
Anna Bauza
71361dafd3
Integrating new Avatar Picker App in Settings
...
Bug: 309426522
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e6c9a08ab7648d884c0d9c3fbbc7f8c74a016624 )
Merged-In: Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b
Change-Id: Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b
2024-04-22 12:15:54 +00:00
Jakub Rotkiewicz
0ea966fa43
Merge "Bluetooth Codec Settings: Assure flag enabled" into main am: 52038eb6f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3024725
Change-Id: If1709e6ddf9f805ec263833f6f0f5902fa9d7677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-16 07:58:54 +00:00
Jakub Rotkiewicz
52038eb6f2
Merge "Bluetooth Codec Settings: Assure flag enabled" into main
2024-04-16 07:41:41 +00:00
Jakub Rotkiewicz
c923103142
Bluetooth Codec Settings: Assure flag enabled
...
Assure flag a2dpOffloadCodecExtensibilitySettings is enabled before
calling BluetoothA2dp API.
Bug: 331612641
Tag: #feature
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.AbstractBluetoothListPreferenceController
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.BluetoothCodecListPreferenceControllerTest
Merged-In: Iac33a6c95a544230e034807b320c80a727ade307
Change-Id: I2b0ed6c7ac91401b958b206817aca55e0aa47170
2024-04-16 06:08:46 +00:00
Android Build Coastguard Worker
fdcb1ee0a0
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26908656'] into 24Q2-release.
...
Change-Id: I1d252cb9fd8b85080f5d06552f1787609fa15923
2024-04-12 21:40:50 +00:00
Neil Fuller
2a339992d3
Restore enterprise policy checks
...
Restore enterprise policy checks removed by commit
fdab44f9e7 and not since restored by other
changes.
Bug: 325886855
Bug: 316584466
Bug: 235445309
Test: Treehugger only
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5d80553a155524e73713348fc11b9f98bee0308b )
Merged-In: Id3d79805bb2289b84ad34ac05a97e50f0410502f
Change-Id: Id3d79805bb2289b84ad34ac05a97e50f0410502f
2024-04-12 21:23:49 +00:00
Android Build Coastguard Worker
ca5ff1a5e0
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26877792'] into 24Q2-release.
...
Change-Id: I200b4370f13a419af976e25610a37884e1eed2c5
2024-04-10 18:12:16 +00:00
Bill Yi
720210157a
Import translations. DO NOT MERGE ANYWHERE
...
Bug: 328603775
Auto-generated-cl: translation import
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1d9f123997c1159a6e7d35a783a18275163862df )
Merged-In: If1754dec4c5b6845323c508aec8706dc88bf3ba6
Change-Id: If1754dec4c5b6845323c508aec8706dc88bf3ba6
2024-04-10 18:00:26 +00:00
Matías Hernández
aee6cfe1c2
Merge "Update notification settings OWNERS" into main am: b5d874d9eb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3036696
Change-Id: Iccf37784f85f46ea7c4f8fec2d5ca9331eebbfb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-10 15:47:55 +00:00
Matías Hernández
b5d874d9eb
Merge "Update notification settings OWNERS" into main
2024-04-10 15:28:38 +00:00