Commit Graph

123967 Commits

Author SHA1 Message Date
TreeHugger Robot
607547541a Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3 am: 3a5719aae0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I2685760376c98a438191ca4f5c051cfc24262f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:10:19 +00:00
TreeHugger Robot
b02de2eb5c Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3 am: 89b497a051
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I11844659c7c294c3bcbb99df425c02db747a6df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:05:26 +00:00
TreeHugger Robot
89b497a051 Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I46d36e32cdb36b47eaa3c62005e65666c9fe94bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 06:26:29 +00:00
TreeHugger Robot
3a5719aae0 Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I9cd1fcc11e76da716b44faf5994b61eda78f0a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 06:22:10 +00:00
TreeHugger Robot
52d2daf3b3 Merge "Fixed unable to enable hotspot with Security None" into udc-dev 2023-05-26 05:43:02 +00:00
Weng Su
f7d8f0481d Fixed unable to enable hotspot with Security None
- Due to the design adjustment, the default value of SoftApConfiguration is not Security None, so the update of Security None cannot be omitted.

Bug: 283762826
Test: Manual test
atest -c WifiTetherSettingsTest

Change-Id: I07d18b8f73ab8190152332c01814a4bd72cf28d6
2023-05-26 12:26:31 +08:00
Tom Hsu
a754427874 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4 am: f0fa79dc18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Ic09ee4ea3bf4b9ab6dfde001bf0393b4c0ef16b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 03:30:18 +00:00
Tom Hsu
8cd034ae72 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4 am: 86db37ddcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Ic7d3565555f54a259a647f614370381c9563d3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 03:25:33 +00:00
Tom Hsu
86db37ddcc Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Id715f0645548dc225cfcc1a3396e0e81bd06fbdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 02:46:16 +00:00
Tom Hsu
f0fa79dc18 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Ie10308abc3b2ba08bfc5801ced15dc7132466d9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 02:41:59 +00:00
Tom Hsu
69caf6fbe4 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev 2023-05-26 02:08:13 +00:00
Yuxin Hu
fe2ed9c453 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: 75b784fcd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: Ib0b2225ea16febddde345c2edc0fef1fd18e4e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:49:13 +00:00
Yuxin Hu
1af33f713b Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: f783947615
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: Ifdca402cee4f367a73952887663685478bcffabb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:46:15 +00:00
Viesturs Zarins
e6a708e0a6 Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238

Change-Id: I6801b2b87bad63dad61a739025e99dd3425180c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:44:48 +00:00
Yuxin Hu
75b784fcd0 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I9f456a0b676c188c61e0ae4002d57a0d7f6c3dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:03:06 +00:00
Yuxin Hu
f783947615 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I55082fed74d343f8c1daab93e7fb73d093853d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:02:31 +00:00
Viesturs Zarins
8e9955a4f3 Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev 2023-05-25 18:49:59 +00:00
Yuxin Hu
67c72c01cb Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev 2023-05-25 18:08:10 +00:00
tom hsu
06c3ae5e82 [Settings] Avoid settings crash from NPE of TelephonyManager.
Bug: 233783567
Test: atest passed
Change-Id: Ie0ed8fa3b87b8e130396cf4d918295403ae43501
2023-05-25 14:37:51 +00:00
Viesturs Zarins
ac347eddd9 Fix missing Activity embedding allowlisting for Assistant.
The normal settings fragments are already allowlisted via SubSettingActivity.
ManageApplications fragment based activities are not compatible with that however.

The ManageApplications fragment has several modes that are selected by the activity name, hence cannot use the SpringboardSettings activity to launch just the fragment.

For more context, see
go/conversational-care-activity-embedding-allowlisting

BUG: 282921726

Change-Id: I65872b574ce6272fbd33ab7bd100504a6536f340
2023-05-25 08:43:07 +00:00
Treehugger Robot
e2aea57de4 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 48355b8b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I3b4ef57a77546a6078e62eb696fae80363b90d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:32:19 +00:00
Chaohui Wang
6d2caf2e52 Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: f976ff3f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ia7b7be32a800e70aa117f43717e04cddbadb3370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:32:05 +00:00
Treehugger Robot
2299f35385 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Ied812c9a81d5945d7a1c3157ef345e359b8c0c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:27:45 +00:00
Chaohui Wang
85365bf381 Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ic4f862141920da6b3d392c48158fd94eadf1758e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:27:38 +00:00
Treehugger Robot
0d065f7913 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I46331c040344bcf47c7ce59f37a8ce5378eee961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:45:29 +00:00
Chaohui Wang
a9a229665b Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ieb36ee51360a0406d62fa500e518be0b4e6dddd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:45:21 +00:00
Treehugger Robot
48355b8b24 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I68dd6ae9bd91519b126cbacb8cba1fb4909524a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:41:09 +00:00
Chaohui Wang
f976ff3f06 Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: I271981812af20ac9d666465edea064fba0a2642e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:40:44 +00:00
Treehugger Robot
1fd77775cb Merge "[Settings] Use background thread to get VoNr state." into udc-dev 2023-05-25 06:25:55 +00:00
Chaohui Wang
5b042e2feb Merge "Fix crash of PictureInPicture" into udc-dev 2023-05-25 06:02:59 +00:00
tom hsu
97a1fc643e [Settings] Use background thread to get VoNr state.
- TelephonyManager#isVoNrEnabled may not send back the result in time,
   so use different thread and timer to prevent ANR.

Bug: 282876876
Test: atest passed
Change-Id: Ie6cc0f8a459f5ebed930e457dacb9b742df70fad
2023-05-25 10:56:03 +08:00
Diya Bera
e204664790 Fingerprint Error Dialog am: 71dd391e4d am: 87cba95c68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I9a0be0d0788e3bba3329074d5f97334c4aa0ba1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:59:26 +00:00
Diya Bera
f868f3fdda Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Iea6e58fda55aadc31aef0aca6736f874e9c9ed1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:56:45 +00:00
Diya Bera
87cba95c68 Fingerprint Error Dialog am: 71dd391e4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Idf0e083fe7702e63ce899f6976c7c713be2078b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:15:48 +00:00
Diya Bera
565ce9eaae Fingerprint Error Dialog am: 71dd391e4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I614f3cbc3845d463c83605bb62c007180408834d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:14:53 +00:00
Bill Yi
57f926c95d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723

Change-Id: I5e59db548a7277241a9ccaec754033b90cf954cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:36:00 +00:00
Bill Yi
b531e765fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723

Change-Id: I36cb7805f09e36dd5faeef7c0def750a198a1428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:35:58 +00:00
Bill Yi
9ed3697c68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720

Change-Id: I03ac3e0b8dd7c4a99bc9d357f23257097b081776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:35:52 +00:00
Bill Yi
bc52047a0d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720

Change-Id: I8dddffd8855e1ddd235305cb8153054fe388475f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:35:16 +00:00
Bill Yi
d54daa1c26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719

Change-Id: I5815e44184fc69caea51ebbe8944af8b4990fb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:34:53 +00:00
Bill Yi
d9d4ed48e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719

Change-Id: I899acc4c367de63c7d2cdc0b38c9ee17c4d22c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:34:34 +00:00
Diya Bera
71dd391e4d Fingerprint Error Dialog
Add "Try Again" for UNABLE_TO_PROCESS error. Change default title
string. Custom strings for Settings and Setup.

Bug: 280786940
Test: Try to enroll fingerprint, trigger a corresponding error and check
the error dialog

Change-Id: I5975d169e1d33cff87f58fb8882261bb1bd3520e
2023-05-24 10:15:52 -07:00
Bill Yi
dc4c6cf07c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-24 17:14:01 +00:00
Bill Yi
5ee6cbb95c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-24 17:14:01 +00:00
Bill Yi
62106c3d13 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-24 17:14:01 +00:00
Chaohui Wang
ce56dcc30b Fix crash of PictureInPicture
This follows change I3115cf1b99a305efef192a0dcf3e809eb7903d0a

PackageManager.getPackageInfoAsUser() will throw exceptions when the
package is too large which is a known issue to PackageManager but very
low priority given resourcing constraints. As per the PackageManager
team suggestion, catch the exception on the app side to alleviate the
impact to the PictureInPicture & App info page.

Fix: 283076353
Fix: 283354211
Test: Unit test
Change-Id: Iad2bf9fbfca6ee7f604fec1c4afa1b9382f6ec7e
2023-05-24 19:41:20 +08:00
SongFerng Wang
19b516807e Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 535a91afff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I2d0a079035df588cce647a713416f04895bc6b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:53:19 +00:00
Treehugger Robot
c7d954bff8 Merge "Owners updates" am: b2b16851ef am: 340fde1f0f am: b41ce7e248 am: 3b3b66ec0e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

Change-Id: Ic64ffaa973a503f6654e82c8bb4f9d26f573d012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:36:24 +00:00
SongFerng Wang
29c01f1357 Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 75dd8a0a91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I00756b8f15758d3c6217114036cf14d9d1eaf3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:36:00 +00:00
SongFerng Wang
535a91afff Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I5480462b9262f5d8ee51f23a97d3bde7ab39082c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:14:58 +00:00