Android Build Coastguard Worker
12ea1a89e5
Merge cherrypicks of ['googleplex-android-review.googlesource.com/33140168'] into 25Q2-release.
...
Change-Id: I667898a56b609288d7778cec0dc8351889e10560
2025-04-21 19:29:02 -07:00
tom hsu
edcb16bde3
Improve potential NPE problem
...
- Move CarrierConfigCache initialization to make sure the instance
created.
Flag: EXEMPT bug fix
Fix: b/409841639
Test: atest pass
(cherry picked from commit 00ab92f97f2c04ca9f604f282542ffd9680f27fc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c2c6745859027b54628bea81a153856e2d8c753 )
Merged-In: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed
Change-Id: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed
2025-04-21 19:27:43 -07:00
Android Build Coastguard Worker
08e0488ee2
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32950184', 'googleplex-android-review.googlesource.com/32952319', 'googleplex-android-review.googlesource.com/33000561'] into 25Q2-release.
...
Change-Id: I2b7939e1a11a9ba5856365582e6f2826c62bb8b8
2025-04-12 12:47:05 -07:00
Bill Yi
d27d4d0a87
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 408276020
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1fd9d49502f3022819250d4f7b071105a487afb8 )
Merged-In: I8cb5cfdb20be049154127cb51d8f9c2d449efaa1
Change-Id: I8cb5cfdb20be049154127cb51d8f9c2d449efaa1
2025-04-12 12:33:38 -07:00
Bill Yi
d2a3eb3a91
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 408276020
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fb6e003c12031ec5a006e9823027127dca586386 )
Merged-In: I9936898bcefdabe144efb3368d7eebe9c7a44f6a
Change-Id: I9936898bcefdabe144efb3368d7eebe9c7a44f6a
2025-04-12 12:33:26 -07:00
Bill Yi
e3192b4216
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 408276020
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bf65f030c604c1e37979de8f5879d59d94c8b35 )
Merged-In: Idb362ec0402a802fffc104243ed0bafe3bd50df7
Change-Id: Idb362ec0402a802fffc104243ed0bafe3bd50df7
2025-04-12 12:33:10 -07:00
Android Build Coastguard Worker
bbb340f8ea
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32887373'] into 25Q2-release.
...
Change-Id: Ia413b76ff8767e69f8a757e39d65c5aeb709b2c7
2025-04-07 20:05:00 -07:00
Florian Mayer
92e1b25a29
Fix crash if device policy disables MTE
...
Flag: EXEMPT bugfix
Test: set device policy using TestDPC, observe crash is gone
Bug: 407990172
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec6b4842bef8f6f29989bb370d44499a70d6172e )
Merged-In: Ib5f01cb5bb3296ee0b5909a1a730e9dad040902b
Change-Id: Ib5f01cb5bb3296ee0b5909a1a730e9dad040902b
2025-04-07 20:00:34 -07:00
Android Build Coastguard Worker
294b12a39b
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32835485', 'googleplex-android-review.googlesource.com/32836107', 'googleplex-android-review.googlesource.com/32836113'] into 25Q2-release.
...
Change-Id: I8c3ca8cef3574248052d0cf5a25211a2afc5767b
2025-04-02 19:49:13 -07:00
Bill Yi
8aee29c53e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 406841318
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:439726a415d603de90517871de285661018db5d3 )
Merged-In: I808ce1ffe3b38350d50e049cdfb5bedd2812e1f5
Change-Id: I808ce1ffe3b38350d50e049cdfb5bedd2812e1f5
2025-04-02 19:38:21 -07:00
Bill Yi
07e7d29473
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 406841318
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a273b927dd2b7be164abb1145ca00e8b92bc5e41 )
Merged-In: I8f4075e67060fcb7220d230b9a8e6e5063877edd
Change-Id: I8f4075e67060fcb7220d230b9a8e6e5063877edd
2025-04-02 19:38:04 -07:00
Bill Yi
9165802054
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 406841318
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce58acd615ac53dc476a87c9e4ed1f9441c2c4aa )
Merged-In: I5fdbe6b236274b7a005f8378a6bedd2f7f750897
Change-Id: I5fdbe6b236274b7a005f8378a6bedd2f7f750897
2025-04-02 19:37:46 -07:00
Android Build Coastguard Worker
2b76145529
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32649929'] into 25Q2-release.
...
Change-Id: I9335e3e4e9d90c255d17b9a8bdd7d46e87189bf8
2025-04-01 20:54:39 -07:00
Steve Statia
1127cfb00f
Fix hidden menu not showing phone information 100% of the time when opening.
...
The function that sends the special code is sending intents to all
users, which is creating an activity for both the work profile and the
system user. Whichever intent is received last will be the activity on
top and displayed to the user, and since the work profile's hidden menu does not include the 'Phone
information' option it creates this 'randomness' observed with opening the menu.
This change ag/29101523 started sending the broadcast as UserHandle.ALL, instead of just from the current user causing the reception of more than one intent.
This fix checks for the work profile and returns out of the function without starting another TestingSettings activity.
Flag: EXEMPT bug fix
Bug: 406016005
Test: manual test opening hidden menu, and opening after reboots
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:170fcaf31628d3faf689ce1b525bfba33052d877 )
Merged-In: I5a7937ba484afd3ba81c55e66bc53c217a778d18
Change-Id: I5a7937ba484afd3ba81c55e66bc53c217a778d18
2025-04-01 20:42:13 -07:00
Android Build Coastguard Worker
c8c292cede
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32650559', 'googleplex-android-review.googlesource.com/32797479'] into 25Q2-release.
...
Change-Id: I675d8e59031d99c15c86135c9ecd8797f66deea9
2025-03-31 20:55:39 -07:00
tom hsu
c8b730509d
[Satellite] Restrict requestIsSupported only in Manual type
...
- SatelliteManager#requestIsSupported only can be used in Manual
conneciton type. Hence add a type check with this API for the
condition check
Flag: EXEMPT bug fix
Fix: b/395811260
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d033f603b819c5b1264d116648c9f6f00b061320 )
Merged-In: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
Change-Id: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
2025-03-31 20:54:29 -07:00
tom hsu
e9e45b4a01
[Satellite] Refactor API usage to Util class.
...
Flag: EXEMPT refactor
Fix: b/403149290
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8916db934fb3d7dc1f94f67c7b409beeff2c6ac6 )
Merged-In: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
Change-Id: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
2025-03-31 20:54:17 -07:00
Android Build Coastguard Worker
94029d5c7c
Snap for 13264465 from 0773c4d93f
to 25Q2-release
...
Change-Id: I1ce8a575e4f55decafe0d4417744842b723774b2
2025-03-24 18:42:58 -07:00
Yuri Lin
0773c4d93f
Merge "Merge bundle global & type preference controllers." into main
2025-03-24 12:13:24 -07:00
Bill Yi
06be21bc9c
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2025-03-24 11:00:12 -07:00
Bill Yi
7cf2266074
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2025-03-24 11:00:12 -07:00
Chun Zhang
c6aa5cb8cb
Merge "Check client null before calling and closing." into main
2025-03-24 10:16:18 -07:00
Chun Zhang
e4ff8c403c
Check client null before calling and closing.
...
Bug: 404955994
Test: TreeHugger
Test: manual
Test: atest SafetySourceBroadcastReceiverTest
Test: atest LockScreenSafetySourceTest
Test: atest ActiveUnlockStatusUtilsTest
Test: atest WearSafetySourceTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I34085b90fe41283e484d3b2235426676d886e69c
2025-03-24 15:11:24 +00:00
Treehugger Robot
dc01092e3b
Merge "Customize Fingerprint Enroll FindSensor Activity" into main
2025-03-24 07:21:29 -07:00
Milton Wu
08b35a8729
Customize Fingerprint Enroll FindSensor Activity
...
Provide an interface for ODM/OEM to override fingerprint enrollment
findSensor page
Bug: 394232846
Flag: EXEMPT interface change
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL
--ez skip_intro true
Change-Id: Iff61f0be49faf3581fa2b26e364ac8c8d61bdbf3
2025-03-24 02:12:54 -07:00
Zhibin Liu
32bc5aab59
Merge "Add support to configure state of operator name in status bar [2/2]" into main am: 7c598253ff
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3516771
Change-Id: Icbafc5ffafb3181412e181800505c3d8be6ae5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-24 00:57:43 -07:00
Zhibin Liu
7c598253ff
Merge "Add support to configure state of operator name in status bar [2/2]" into main
2025-03-24 00:15:24 -07:00
Android Build Coastguard Worker
bf78382d8c
Snap for 13259233 from c7d2bc8cb4
to 25Q2-release
...
Change-Id: Ife57419a3417ee6028c8c3e6a62026d0160963e8
2025-03-23 17:00:16 -07:00
Jacky Wang
4dc8d32603
[Catalyst] Wi-fi calling is missing from PreferenceService
...
Bug: 388420844
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I7809ddba84805af52c9234f5f51d093c285db74a
2025-03-24 07:34:46 +08:00
Vilas Bhat
c7d2bc8cb4
Merge "Increase 16 KB test timeout, to see how it affects flakes." into main
2025-03-23 14:45:17 -07:00
Android Build Coastguard Worker
3f7ef8ce2a
Snap for 13256841 from 081fab1330
to 25Q2-release
...
Change-Id: I36755cf3e7b0e6de77eb961c135989c6cca80050
2025-03-21 20:22:28 -07:00
Steven Moreland
a9de5ee4ce
Increase 16 KB test timeout, to see how it affects flakes.
...
Bug: 405230142
Test: N/A
Change-Id: I6370880160eb6024afa505ed1e42542184940d91
2025-03-21 17:54:38 -07:00
Shawn Willden
fb2d3b7abb
Catch security exception on isOemUnlockAllowed
...
As of Android 15, devices with FRP active will throw an exception when loading developer options attempts to update the OEM unlock state, which causes the app to crash. This CL just catches the exception and reports that OEM unlock is not, in fact, settable.
A full fix should probably tell the user that OEM unlock may not be set because FRP is active, rather than just quietly failing and logging the situation, but because GMS Core is soon going to begin blocking access to the Android UI when FRP is active, meaning that developer options won't even be reachable and the user will be informed about FRP state by GMS Core, the effort that would require isn't justified.
Note that this CL does not add a test for this change because it is not possible for CTS to put the device in FRP-active state to test the relevant case. Manual testing is required.
Test: SettingsUnitTests
Flag: EXEMPT bugfix
Bug: 405023810
Change-Id: Ic43de93a4208bbc17f2e287d52f9baf281cd678c
2025-03-21 15:46:11 -07:00
Yvonne Jiang
081fab1330
Merge "Update "Manage PIN" entry point." into main
2025-03-21 15:05:09 -07:00
Treehugger Robot
cb489635ad
Merge "Add resume and pause animation strings" into main
2025-03-21 13:19:12 -07:00
Yvonne Jiang
2887142833
Update "Manage PIN" entry point.
...
- Updates default icon to outlined version
- Makes availability conditional on existence of supervising credential
- Does not disable entry point when the main switch is disabled
Bug: 405159398
Test: atest SupervisionPinManagementScreenTest
Test: atest SupervisionDashboardScreenTest
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Change-Id: I764a6b767019007a93aacf29ecf47677e16cb058
2025-03-21 12:10:30 -07:00
Austin Delgado
4822156c9b
Add resume and pause animation strings
...
Bug: 400627671
Test: Verified manually
Flag: EXEMPT bugfix
Change-Id: I064768ec1784d8eebe3260119ce0201f28943e80
2025-03-21 11:36:38 -07:00
Treehugger Robot
bf2a6a4c95
Merge "Ignore test to avoid test failed" into main
2025-03-21 10:08:55 -07:00
tom hsu
ef8acb4757
Ignore test to avoid test failed
...
- This is a work around to avoid test failed then take time to look
into the root cause.
Flag: EXEMPT bug fix
Bug: b/405279842
Test: atest pass
Change-Id: Idfbf606ed3edf0d7bc4a48b4498e8bdf5a0984c8
2025-03-21 15:58:45 +00:00
tom hsu
8be6d98b1f
[Satelllite] Avoid using "add ESIM page"
...
- When user clicks preference UI, show a dialog to nofity user
satellite session.
Flag: EXEMPT bug fix
Fix: b/402544816
Test: atest pass
Test: Manual test
Change-Id: Ifeff9368fed906bc56abcc8eb23748a71f79ee4d
2025-03-21 13:48:21 +00:00
Yiyi Shen
14fe4f0f01
Merge "Add logs to debug anr issues" into main
2025-03-21 03:03:53 -07:00
Bill Yi
9e5e1602ca
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I133943a7713d47689079a9f06df6caf72ac61e96
2025-03-21 10:03:02 +00:00
Bill Yi
1ed0c766c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie3c3aad6a190f6b842474a555f56937c8558dd20
2025-03-21 10:00:04 +00:00
Yuanru Qian
6728a8380a
Merge "Log connected devices entrypoint for analytics" into main
2025-03-21 02:55:18 -07:00
Haijie Hong
93a4eaa4b2
Merge "Don't show footer for headset when bonding loss" into main
2025-03-21 02:52:39 -07:00
Treehugger Robot
af3a006b2a
Merge "Add context to FingerprintExtPreferencesProvider" into main
2025-03-21 02:23:39 -07:00
Treehugger Robot
dc34cabee1
Merge "Show hearing device pairing intro according to the device's supported status" into main
2025-03-21 01:55:57 -07:00
Yiyi Shen
1ea2a2c10d
Add logs to debug anr issues
...
Test: atest
Bug: 404470387
Flag: EXEMPT add log
Change-Id: Ide2b7dd730c21bf5da38a0fc7cf721aa969b1959
2025-03-21 16:38:35 +08:00
yqian
c96b555141
Log connected devices entrypoint for analytics
...
Test: locally tested
Bug: N/A
Flag: EXEMPT loggings only
Change-Id: I5158a026fecdd19245f7427431563dd754dff2eb
2025-03-21 16:17:14 +08:00
Haijie Hong
026d698a91
Don't show footer for headset when bonding loss
...
Test: local tested
Flag: EXEMPT minor fix
Bug: 380801155
Change-Id: I5bb1bbcb08723a5ac5c8b82d2428df7a7f3e275d
2025-03-21 16:14:50 +08:00