Tom Hsu
ec571901be
Merge "Avoid test flaky" into main
2024-10-14 04:13:25 +00:00
Tom Hsu
9832fe9281
Avoid test flaky
...
flag: EXEMPT bugfix
fix: 365673174
Test: atest passed
Change-Id: Id7c3747eafff3410ab899716d0c6e35eb405c76e
Merged-In: Id1290e6979fdafa93ded6f50e49d6b3464a80b50
2024-10-11 05:15:14 +00:00
Android Build Coastguard Worker
2dd7679394
Merge cherrypicks of ['googleplex-android-review.googlesource.com/29755206'] into 24Q4-release.
...
Change-Id: Ic80fb8f08fa10da2944aecc6e14f9ee1f07186dc
2024-10-11 01:04:07 +00:00
James Willcox
a506a48b9f
Don't show default payment component in search if Wallet role is enabled
...
Bug: 372254720
Test: atest PaymentSettingsTest
Flag: android.permission.flags.wallet_role_enabled
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1133353e5df414936d6a69d50dcb6e42ad4d0370 )
Merged-In: I4044d8fcd95db215d4a06b335b3cb96f8a5e3697
Change-Id: I4044d8fcd95db215d4a06b335b3cb96f8a5e3697
2024-10-11 01:01:54 +00:00
hoffc
2545f06558
Fix force close for updating UI after activity destroyed.
...
If activity is finishing or destroyed, getting activity context will return null results in settings app force close.
Directly return if network select activity is finishing or destroyed when handling network scan callback.
Bug: 372123288
Change-Id: Ia8c89569761b66da58cafd0140ceda29ac7d678c
2024-10-08 17:29:45 +08:00
Paul Duffin
aea2622b91
Merge "Fully qualify @attr reference to android.R field" into main am: e61c03648d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3296753
Change-Id: Ic25c2d5d5e0c2ba9a9da492f2bb5be1f1b2bb458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-08 09:00:55 +00:00
Paul Duffin
e61c03648d
Merge "Fully qualify @attr reference to android.R field" into main
2024-10-08 08:31:47 +00:00
Android Build Coastguard Worker
e029aede58
Merge cherrypicks of ['googleplex-android-review.googlesource.com/29693724'] into 24Q4-release.
...
Change-Id: Ib05a6d5713e7571221506fbb262dcda8f2072b9c
2024-10-08 00:13:02 +00:00
Diya Bera
db5761ebed
Avoid using MANDATORY_BIOMETRICS bit if flag is not enabled
...
Flag: android.hardware.biometrics.flags.mandatory_biometrics
Bug: 370757426
Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa322bc4f7211117cd57c559e2e55dae1184752f )
Merged-In: I4e2a72a80f68579d60466e859370b6fd93a8cd23
Change-Id: I4e2a72a80f68579d60466e859370b6fd93a8cd23
2024-10-08 00:09:46 +00:00
Treehugger Robot
3c2d44c3ff
Merge "Fixes for errorprone update" into main am: 28f83ffab0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3297590
Change-Id: If54aa111229245173d625b445cf9e1f10182196d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-07 20:40:21 +00:00
Treehugger Robot
28f83ffab0
Merge "Fixes for errorprone update" into main
2024-10-07 20:25:20 +00:00
Cole Faust
b237fe7e6a
Fixes for errorprone update
...
When updating errorprone from 2.23.0 -> 2.32.0, more issues are found.
Bug: 253827323
Flag: EXEMPT refactor
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Iebb442f5e616861d1f2a2e2dc56a8ac72b18cb95
2024-10-07 11:27:07 -07:00
Paul Duffin
ad48f03f53
Fully qualify @attr reference to android.R field
...
Currently, Metalava has some special handling of '@attr ref R.<field>`
references to make sure that they are fully qualified, i.e.
`@attr ref android.R.<field>`. That special handling complicates
Metalava and is blocking some flagged API work so will be removed.
Before that can be done, the existing incorrect documentation needs to
be cleaned up.
This change cleans up those cases in this repo.
Bug: 371997321
Test: Run `m offline-sdk-docs` before and after to make sure that
there are no differences.
Flag: DOCS_ONLY
Change-Id: Ic97f01b90193d058d65e6d3c6d0a04ce5e55d7c7
2024-10-07 17:10:02 +01:00
Android Build Coastguard Worker
2f978bab51
Merge cherrypicks of ['googleplex-android-review.googlesource.com/29670750', 'googleplex-android-review.googlesource.com/29670755', 'googleplex-android-review.googlesource.com/29670967'] into 24Q4-release.
...
Change-Id: I199bb3bc142b3b8296d9a9c9dcd6382a06c69023
2024-10-04 23:05:15 +00:00
Bill Yi
ae4d661666
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 369418613
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:07ace7dbead393dd3ea374b465280248e675fa20 )
Merged-In: Ia6033936578c17fb13e20953818ffee17c803e99
Change-Id: Ia6033936578c17fb13e20953818ffee17c803e99
2024-10-04 22:52:02 +00:00
Bill Yi
8017f44db4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 369418613
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:66df8ff3274c27a8a913440d9b97593b7eb9b802 )
Merged-In: I499fad471e481b1048377ed78817e73044909593
Change-Id: I499fad471e481b1048377ed78817e73044909593
2024-10-04 22:51:49 +00:00
Bill Yi
3c4b5e80c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 369418613
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d699a865846e7bd329f150e68b15b1e24108ae49 )
Merged-In: I5c23ee62acecedef00383545188882d1694d8a8a
Change-Id: I5c23ee62acecedef00383545188882d1694d8a8a
2024-10-04 22:51:37 +00:00
Android Build Coastguard Worker
b88b8764e6
Merge cherrypicks of ['googleplex-android-review.googlesource.com/29590947'] into 24Q4-release.
...
Change-Id: Iae17a95aabc1bbeea4eedd04f7ffa70c0d31620e
2024-09-30 17:32:46 +00:00
Chaohui Wang
e9964f3c1f
Fix Can't Able to Click Sims
...
The root cause is SubscriptionManager.OnSubscriptionsChangedListener
.onSubscriptionsChanged() not invoked in some cases.
Even the SubscriptionManager.addOnSubscriptionsChangedListener's doc
says the onSubscriptionsChanged() method will also be invoked once
initially when calling it, there still case that the
onSubscriptionsChanged() method is not invoked initially.
For example, when the onSubscriptionsChanged event never happens before,
on a device never ever has any subscriptions.
Adding a .onStart { emit(Unit) } to fix.
Also make the subscriptionsChangedFlow() a shared flow to mitigate the
extra emit cost.
Bug: 369276595
Flag: EXEMPT bug fix
Test: manual - factory reset & no any sim
Test: atest SubscriptionRepositoryTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9969334647b4b9439f549c0c0b2543fb3dec8813 )
Merged-In: Ic32a5666f14373926b5dfedb5dedadb4369acfc7
Change-Id: Ic32a5666f14373926b5dfedb5dedadb4369acfc7
2024-09-30 17:31:39 +00:00
Treehugger Robot
2c3fbda054
Merge "Add a check to ensure that intent data is available before proceeding." into main am: 9a0ba22e79
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3278732
Change-Id: I9964a5759041f686bfe905e10e013ff663c666b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-27 10:13:07 +00:00
Treehugger Robot
9a0ba22e79
Merge "Add a check to ensure that intent data is available before proceeding." into main
2024-09-27 09:54:21 +00:00
Treehugger Robot
5c3c9cbdeb
Merge "Use hasScrollAction in ApnEditPageProviderTest" into main am: 12f2e1cf4f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3283218
Change-Id: I1d66aa2b883c0b8d6375b99b23fda25535820c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-26 11:13:22 +00:00
Treehugger Robot
12f2e1cf4f
Merge "Use hasScrollAction in ApnEditPageProviderTest" into main
2024-09-26 10:54:50 +00:00
Treehugger Robot
840f5a573d
Merge "Protect the Settings application from potential null pointer exceptions." into main am: 6a4fb45e38
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3282054
Change-Id: I1c6daaf44b7be4aeaa65fce50711d7e75f511e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-26 10:47:30 +00:00
Treehugger Robot
6a4fb45e38
Merge "Protect the Settings application from potential null pointer exceptions." into main
2024-09-26 10:30:43 +00:00
Chaohui Wang
bb1cadb916
Use hasScrollAction in ApnEditPageProviderTest
...
Instead of assuming a fixed tree structure in testing.
Fix: 369416630
Flag: EXEMPT gradle only
Test: atest ApnEditPageProviderTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0b530fd405eb95dfedf51bc55bc24bd7d446ead8 )
Merged-In: I0a50e7665d9049e089b5a0877f17d1f736ee3332
Change-Id: I0a50e7665d9049e089b5a0877f17d1f736ee3332
2024-09-26 10:20:38 +00:00
Abdelrahman Daim
996afd17a1
Protect the Settings application from potential null pointer exceptions.
...
Summary: The app bar is not available, causing a null pointer exception.
Test: Successful Build on master branch
Change-Id: I36849606f6587d6e7f004ae21e1a6e6a5206735a
Signed-off-by: Abdelrahman Daim <adaim@meta.com >
2024-09-25 17:02:37 -07:00
Abdelrahman Daim
3be2314fac
Add a check to ensure that intent data is available before proceeding.
...
Summary: There are instances where intent data is absent, leading to a crash while trying to retrieve the schema. This change adds a null check to prevent attempted access when there's no data.
Test: Successful Build on master branch
Change-Id: Ie83bd3243f2c79102061d3fa43d809b3ef3c6c78
Signed-off-by: Abdelrahman Daim <adaim@meta.com >
2024-09-24 12:21:22 -07:00
Android Build Coastguard Worker
12db316e9d
Snap for 12406339 from 658459de9b
to 24Q4-release
...
Change-Id: I01b270ceb3f0850e5043a7401701c117a8766843
2024-09-24 17:55:15 +00:00
Treehugger Robot
658459de9b
Merge "Fix for broken tests in Accessibility Settings" into main
2024-09-24 02:58:07 +00:00
Riley Jones
62449dd61b
Fix for broken tests in Accessibility Settings
...
Updates tests that were broken by the rollout of the standalone_a11y_gesture_enabled flag
Test: atest com.android.settings.accessibility
Bug: 368704597
Flag: android.provider.a11y_standalone_gesture_enabled
Change-Id: Ie90e7495dd4a134538bae6e3e08eea0d02134b14
2024-09-23 23:24:25 +00:00
Android Build Coastguard Worker
2ab50ea80a
Snap for 12404440 from 9cdd1108c3
to 24Q4-release
...
Change-Id: Iaf43ac3fd61ffff035ebf51289ef758f4ca42b47
2024-09-23 23:22:59 +00:00
Maryam Dehaini
6a6a3efe57
Merge "Change "Open by default" setting page selection to radio buttons" into main
2024-09-23 22:45:07 +00:00
Maryam Dehaini
11825b0bc7
Change "Open by default" setting page selection to radio buttons
...
Selection to open page in app or browser needs to be displayed via radio
buttons as discussed here: http://b/346622495#comment14
Bug: 359262490
Test: Open links in app and browser
Flag: EXEMPT small UI change
Change-Id: Ib23084bcc7f899b97b59019775584807e5b70d7e
2024-09-23 14:32:08 -07:00
Jacky Wang
9cdd1108c3
Merge changes from topic "catalyst-firmware-version" into main
...
* changes:
Migrate "Build number" preference
Migrate "Kernel version" preference
Migrate "Baseband version" preference
2024-09-23 15:44:09 +00:00
Adam Bookatz
072d0d84ec
Merge "OnDeviceRecognition shows only profile group" into main
2024-09-23 15:41:41 +00:00
Zoey Chen
bedfb69f67
Merge "[Settings] Fix crash" into main
2024-09-23 13:02:59 +00:00
Matías Hernández
a78f2b834c
Merge "Don't add the "Events" mode anymore, and delete it if disabled" into main
2024-09-23 12:49:05 +00:00
SongFerng Wang
d514d15590
Merge "remove the DSDS dialog" into main
2024-09-23 12:37:01 +00:00
Zoey Chen
bc3f736162
[Settings] Fix crash
...
Bug: 366361808
Change-Id: I3f804685e215ed07b71a5efd51c9da9c5b978279
Test: manual
Flag: EXEMPT bugfix
2024-09-23 11:16:36 +00:00
songferngwang
6960464557
remove the DSDS dialog
...
If the sim onboarding on, then sim should use the sim onboarding flow.
Bug: 362289792
Test: manual test
Flag: EXEMPT bugfix
Change-Id: Ibe22309db9dea5737de5ad351825a046599e6744
2024-09-23 10:42:36 +00:00
Yiyi Shen
7a91f6e7bf
Merge "Rename AudioSharingRetryDialogFragment" into main
2024-09-23 10:03:55 +00:00
Yiyi Shen
676ddc7e95
Merge "Rename AudioSharingLoadingStateDialogFragment and layout" into main
2024-09-23 09:17:49 +00:00
Jacky Wang
9cbb04c5e0
Migrate "Build number" preference
...
Bug: 365886251
Flag: com.android.settings.flags.catalyst_firmware_version
Test: Unit
Change-Id: Iee68b5414713118ad3d1b9b3ec04437729bb2d0b
2024-09-23 16:43:34 +08:00
Jacky Wang
fb349fad1a
Migrate "Kernel version" preference
...
Bug: 365886251
Flag: com.android.settings.flags.catalyst_firmware_version
Test: Unit
Change-Id: Icb50e2d5200f7de40b6f8383c114982cd45d34b5
2024-09-23 16:43:34 +08:00
Jacky Wang
6fe2f89f7c
Migrate "Baseband version" preference
...
Bug: 365886251
Flag: com.android.settings.flags.catalyst_firmware_version
Test: Unit
Change-Id: I8e4f946d01169e8008b8a336d308f5874ee918e6
2024-09-23 16:43:20 +08:00
Yiyi Shen
51fc7a8239
Rename AudioSharingRetryDialogFragment
...
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 362858894
Change-Id: I157b036541e9a7b21205ee45437bfd4562c49118
2024-09-23 16:20:48 +08:00
Yiyi Shen
322e153350
Rename AudioSharingLoadingStateDialogFragment and layout
...
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 362858894
Change-Id: I05e29b248541511daca355f1bbe4a13b17b4d20d
2024-09-23 15:46:27 +08:00
Chaohui Wang
7d22f66e48
Merge "Check canEnterMobileNetworkPage" into main
2024-09-23 07:03:35 +00:00
Yiyi Shen
de7ab402f9
Merge "[Audiosharing] Show retry dialog when error occurs in start sharing" into main
2024-09-23 06:48:39 +00:00