Jakub Rotkiewicz (xWF)
bc86ae0553
Merge "24Q4: Removal of a2dp_offload_codec_extensibility_settings" into main
2025-01-15 01:17:48 -08:00
Jakub Rotkiewicz (xWF)
096a2fb990
Merge "developer settings: remove unused a2dp Preference" into main am: b896665a32
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3451857
Change-Id: I2ebc9eb5d0b571be8838e0a2a77d7ed53f7ea7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-15 01:08:40 -08:00
Jakub Rotkiewicz (xWF)
b896665a32
Merge "developer settings: remove unused a2dp Preference" into main
2025-01-15 00:43:50 -08:00
Jakub Rotkiewicz
1dda4f5526
24Q4: Removal of a2dp_offload_codec_extensibility_settings
...
Bug: 323319530
Fix: 323319530
Flag: EXEMPT removing com.android.settings.development.a2dp_offload_codec_extensibility_settings
Test: atest SettingsRoboTests
Merged-In: If9c710c0aaed7326b32dd2e7d5f3109de4047b97
Change-Id: I3fad2d0b5b356afd3524ef9ddc0cf1ccbaed9eb4
2025-01-15 07:52:37 +00:00
Jakub Rotkiewicz
672fcd51ab
developer settings: remove unused a2dp Preference
...
Bug: 329809288
Flag: EXEMPT - unused code
Test: m -j
Merged-In: Ibd526fffddf5ea545afc437a5daee12bb1cf8746
Change-Id: Ie219247e1fd0fd92407c04d5d775a685a13467c4
2025-01-15 07:49:22 +00:00
Treehugger Robot
2da834d44e
Merge "Align ownership between Connectivity and settings" into main am: 2826098a66
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3446592
Change-Id: Iaff7452eb851c28c97e9b4715383a7050085e1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-10 16:14:23 -08:00
Treehugger Robot
2826098a66
Merge "Align ownership between Connectivity and settings" into main
2025-01-10 15:54:50 -08:00
Maciej Żenczykowski
551fa0d4d6
Align ownership between Connectivity and settings
...
(using core_networking_xts, not core_networking because it's a better match for the allowed set of folks)
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Ie8192fd06b0d5507884e083eaf6d6614c40ff2ea
2025-01-10 11:57:55 -08:00
Treehugger Robot
e96beeeb46
Merge "Removing upstream flag as it is now the default. Also moving to internal robolectric projects to no longer use the _upstream suffix." into main am: 7aa0ef4049
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3443580
Change-Id: Ia834fda59f1beba933dc92abffcdf4d680863f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-09 10:07:35 -08:00
Treehugger Robot
7aa0ef4049
Merge "Removing upstream flag as it is now the default. Also moving to internal robolectric projects to no longer use the _upstream suffix." into main
2025-01-09 09:42:36 -08:00
Joy Babafemi
70d953b3da
Merge "Update owners for account settings" into main am: aaa8896873
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3441082
Change-Id: I59388fb599bf2f91dcdcafc828476274c37a1683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 20:06:39 -08:00
Joy Babafemi
aaa8896873
Merge "Update owners for account settings" into main
2025-01-08 19:35:45 -08:00
Joy Babafemi
9c13abdc68
Update owners for account settings
...
Change-Id: I2fe4cf47509aa806e1dfbbd23cea690805c980fa
2025-01-08 14:50:11 -08:00
Rex Hoffman
3d508d0d12
Removing upstream flag as it is now the default.
...
Also moving to internal robolectric projects to no longer use the _upstream suffix.
Test: CI
Bug: 386652866
Change-Id: Ic4376619f01834a97ec10c33c283fd7cab45900f
2025-01-08 21:05:34 +00:00
Rex Hoffman
9b18787489
Merge "Removing Dead Flag Test: CI Bug: 386652866" into main am: ccf197b366
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3434134
Change-Id: Ic4e6ff898dd4811bb41dd0b71a7d78b9b50fe1ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 12:31:12 -08:00
Rex Hoffman
ccf197b366
Merge "Removing Dead Flag Test: CI Bug: 386652866" into main
2025-01-08 12:17:27 -08:00
Treehugger Robot
066efe6c55
Merge "Fix sim status details not updated after sim hotswap" into main am: e9bc1949a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3431560
Change-Id: I7cdc3dfb7051d2c5fdae20deb8617c09620284cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-08 03:44:52 -08:00
Treehugger Robot
e9bc1949a9
Merge "Fix sim status details not updated after sim hotswap" into main
2025-01-08 03:15:55 -08:00
Christoffer Adamsen
bc97628dd5
Explicitly keep default constructor in rules without members
...
R8 implicitly keeps the default constructor when no member rules are specified. Future versions of R8 will require apps to explicitly keep the default constructors that are required for the build to work.
This conservatively changes all keep rules that currently keep the default constructor to explicitly keep the default constructor.
Future work will attempt to tighten up the rules that do not require the default constructor to be kept.
Bug: 373579455
Test: existing
Change-Id: I58cf6b4286f696ea38290d888f20c8dcf18b9ede
2025-01-08 00:15:31 -08:00
hoffc
39d16d7bfb
Fix sim status details not updated after sim hotswap
...
Telephony callback may be removed in onPause during sim hotswap, but they are not re-registered in onResume for sub info still null.
Listen sub info change and re-register telephony callback when need.
Test: function test pass and SimStatusDialogControllerTest unit test pass.
Change-Id: I17e60c9e3441fc593107048494f830408c37ae61
Bug: 384643359
2025-01-08 11:53:26 +08:00
Rex Hoffman
f4290c1d03
Removing Dead Flag
...
Test: CI
Bug: 386652866
Change-Id: Ib8a48063738f6362342957b39451a7c352a9a9d5
2025-01-07 14:01:21 -08:00
Treehugger Robot
64eec09358
Merge "[Thread] update the link for "Learn More about Thread"" into main am: b2a5ee5b76
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3438420
Change-Id: Ie7c1fe6415a528acff18a1130e0b53b5f337ffb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-01-06 23:12:39 -08:00
Treehugger Robot
b2a5ee5b76
Merge "[Thread] update the link for "Learn More about Thread"" into main
2025-01-06 22:42:26 -08:00
Kangping Dong
cc22175481
[Thread] update the link for "Learn More about Thread"
...
The latest link to the help center doc is finalized in b/387356147
Bug: 387356147
Change-Id: Ia3caf2dc78b4cd41d9d046cb072268ac63cdd65e
2025-01-07 13:35:44 +08:00
SongFerng Wang
ddd033762b
Merge "Encounter unknown error in test" into main am: 45d7ae68e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3434137
Change-Id: I0850e5911b50a00f0c6e3f52cb09f34912229b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-29 19:25:21 -08:00
SongFerng Wang
45d7ae68e4
Merge "Encounter unknown error in test" into main
2024-12-29 18:58:12 -08:00
SongFerng Wang
14f0d7e7d0
Encounter unknown error in test
...
When atest on aosp_cf_x86_64_only_phone-trunk_staging-userdebug,
it said the "java.lang.NoSuchMethodError: No static method getCurrentCarrierNameForDisplay(Landroid/content/Context;)Ljava/lang/CharSequence; in class Lcom/android/settings/network/telephony/MobileNetworkUtils;"
Bug: 370884447
Bug: 370425683
Test: atest MobileNetworkUtilsTest
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dd7e4d27aed0b456ab0254ff821ff568fe335f61 )
Merged-In: I76bfc4c1cabaf569d74309e9e9ad6612f5649d9b
Change-Id: I76bfc4c1cabaf569d74309e9e9ad6612f5649d9b
2024-12-29 18:44:18 -08:00
Treehugger Robot
bf33cb8c33
Merge "Hide Linux terminal if VM isn't supported" into main am: c8e78dc149
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3428339
Change-Id: Ia01961126082fbbce594715ae90e02181e49183a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-28 07:42:04 -08:00
Treehugger Robot
c8e78dc149
Merge "Hide Linux terminal if VM isn't supported" into main
2024-12-28 07:11:08 -08:00
Treehugger Robot
e310b7ac55
Merge "Show GSM settings with CDMA phone type" into main am: 9e1b206016
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3387241
Change-Id: I4a9fb12ab6cac10d9545df6eaf9ab1d0ebe76768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-25 13:08:40 -08:00
Treehugger Robot
9e1b206016
Merge "Show GSM settings with CDMA phone type" into main
2024-12-25 12:38:11 -08:00
Treehugger Robot
7b45904c6b
Merge "Reduce the Terminal app storage requirement from 128GB to 64GB." into main am: d16d627a71
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3404569
Change-Id: I7c537930bb0d05d81c10feb99a0b7e8d0e7cc583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-23 10:52:27 -08:00
Treehugger Robot
d16d627a71
Merge "Reduce the Terminal app storage requirement from 128GB to 64GB." into main
2024-12-23 10:20:45 -08:00
Qiang Chen
7abc384e33
Show GSM settings with CDMA phone type
...
Phone type may be changed to CDMA if no SIM is in this sub and will not
show GSM settings in current design, so remove sub info check for
showing GSM settings.
Show GSM settings if the current radio can support both 3GPP and 3GPP2
radio technologies at the same time.
Bug: 278178437
Test: Manaul
Change-Id: I4f8cbfcdcff8f74944e2ba9a79b0945be6dd6ebd
2024-12-22 17:46:53 +05:30
Kyle Zhang
8d7fc7232b
Merge "Fix force L3 preference unit test" into main am: 3874c11b94
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3426487
Change-Id: I534c0a3f718ae7197c7a043f4c1709aa5e73014c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-20 15:02:22 -08:00
Kyle Zhang
3874c11b94
Merge "Fix force L3 preference unit test" into main
2024-12-20 14:18:22 -08:00
Jaewan Kim
614074e5c7
Hide Linux terminal if VM isn't supported
...
Bug: 385216798
Test: atest
Flag: Build.RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES
Change-Id: I06fe52cf877deb3cd9ebc61af1579931b97d7766
2024-12-21 00:31:55 +09:00
Kyle Zhang
3d84ccf8a2
Fix force L3 preference unit test
...
Bug: 385101776
Change-Id: I898b7855d3922636c09c99414cdaefee236fc71f
2024-12-19 16:02:45 -08:00
SongFerng Wang
bb4a442684
Merge "Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE" into main am: 51769c2ed4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3405179
Change-Id: If5614a4e728ea949b8fa07a7c5a90aa506a6093b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-19 03:41:41 -08:00
SongFerng Wang
51769c2ed4
Merge "Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE" into main
2024-12-19 02:56:12 -08:00
Treehugger Robot
3464d757ff
Merge "Fix the NPE in the tryToFetchUsageData() method" into main am: 250101cd8f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3424441
Change-Id: I7376d3e498ebca9eeaa90244d8b2da6b6ad7d658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-18 14:50:31 -08:00
Treehugger Robot
250101cd8f
Merge "Fix the NPE in the tryToFetchUsageData() method" into main
2024-12-18 14:30:37 -08:00
YK Hung
7ea9d15853
Fix the NPE in the tryToFetchUsageData() method
...
Test: atest
Bug: 371490669
Fix: 371490669
Flag: EXEMPT for simple fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:291e92d6493b9640bc87bc787b58daa0936bae8e )
Merged-In: I4167becf373a6279135261bbaff44ef0888728fa
Change-Id: I4167becf373a6279135261bbaff44ef0888728fa
2024-12-18 13:35:29 -08:00
Henri Chataing
bde00faa0c
Merge "Update the cache of a2dp config before writing config." into main am: 18eac4ef27
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3350514
Change-Id: I56c1fe945677d5eac84756cf87aab233724ef01d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-18 08:50:14 -08:00
Henri Chataing
18eac4ef27
Merge "Update the cache of a2dp config before writing config." into main
2024-12-18 08:17:34 -08:00
Owner Cleanup Bot
9e69628bd3
[owners] Remove saumyap@google.com from src/com/android/settings/privatespace/OWNERS
...
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote the lowest CR value
(i.e. reject the CL) and the bot will abandon it. Vote the highest CR to
approve this change. You may also abandon this change.
See the owner's recent activity for context:
https://android-review.googlesource.com/q/saumyap@google.com
To report an issue, file a bug in the Infra>Codereview component.
Change-Id: Ic88239b24aa075ab2c475498648fd204036f72df
2024-12-17 09:17:45 -08:00
Wei-Hong Hsu
c02f0aa033
Merge "nfc: allow the nfc quick toggle title to be searchable" into main am: 5565b51402
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3414601
Change-Id: I7bf83da36439231e011e5462161867d78c278043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-16 18:50:24 -08:00
Wei-Hong Hsu
5565b51402
Merge "nfc: allow the nfc quick toggle title to be searchable" into main
2024-12-16 18:24:24 -08:00
Wei-Hong Hsu
250f5cade5
nfc: allow the nfc quick toggle title to be searchable
...
allow the nfc quick toggle title to be searchable
Bug: 374853887
Test: search NFC in the settings search.
Change-Id: I1115b1705b91eb9f40acbef83ed92b9aee11dd3d
2024-12-16 05:52:31 +00:00
Xin Li
9ee5de3b2f
[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: b1c96fcf83
-s ours
...
am skip reason: Merged-In I2c1246a4b34c6b09a42c05153c0e3f015d475df1 with SHA-1 c47df6271a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3413682
Change-Id: Idc093e7db9c7ba2c8529651fe643c4b85c8d3481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-13 19:42:09 -08:00