Commit Graph

15442 Commits

Author SHA1 Message Date
SongFerng Wang
f5e2d52f43 Merge "Revert "Device do network scan after user rotates NetworkSelection page"" 2021-11-17 06:24:53 +00:00
Gary Jian
13a0a175f2 Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev am: 7f809bda12 am: 782506f61c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259269

Change-Id: I20b4111b21ea17e7502745974b5bc93710d79c43
2021-11-17 02:02:33 +00:00
Gary Jian
782506f61c Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev am: 7f809bda12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259269

Change-Id: I1de09d91f66438c4ac521ac7624eae41e9b54b34
2021-11-17 01:46:25 +00:00
Kevin Chyn
156db33a56 Disable combined controller only if all modalities require consent
Additionally, ensure that consent is only requested for modalities
that have not been previously consented to. We retrieve the consent
requirement (which come from DPM) in onActivityResult instead of
onCreate, since the signal may not be ready immediately.

Fixes: 196060286
Fixes: 204592495
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricStatusPreferenceControllerTest

Change-Id: I984e61f28ffbf957c16cac4ea84f40b6ad7d8ae9
2021-11-16 12:32:56 -08:00
Sandeep Jawalkar
8bd3afc334 Merge "eSIM deprecated API test Refactoring" 2021-11-16 16:46:04 +00:00
SongFerng Wang
fd81a18b8e Merge "Lost the registered cellinfo item after the aggregation" 2021-11-16 10:20:32 +00:00
Gary Jian
68b861930a Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status
Bug: 205809218
Test: atest NrAdvancedCallingPreferenceControllerTest
Change-Id: I45ac1e95d669801c2d37f49943d7c16cfb7adae3
2021-11-16 04:40:08 +00:00
SongFerngWang
f0575366c4 Lost the registered cellinfo item after the aggregation
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I163ab8e966de57ddff7939a46fc47b05bea029e3
2021-11-16 11:39:44 +08:00
SongFerngWang
4d00bce2b2 Lost the registered cellinfo item after the aggregation
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I8a1af6eadd5852788a5455dd637e1c63316bb802
Merged-In: I163ab8e966de57ddff7939a46fc47b05bea029e3
2021-11-16 11:38:22 +08:00
Ronish Kalia
0b30679a2c Merge changes from topic "qr-code-and"
* changes:
  Add tests for QRCodeScannerPreferenceController
  Add a new setting for QR Code Scanner button on lockscreen
2021-11-15 16:35:45 +00:00
sandeepjs
40ffe69a3e eSIM deprecated API test Refactoring
Test: build
Bug: 159354974
Change-Id: Iedeb90f186ab9f82894e2fecef86d339c8989542
2021-11-15 05:44:54 +00:00
SongFerng Wang
3c9580d573 Revert "Device do network scan after user rotates NetworkSelection page"
This reverts commit f54ead1f94.

Reason for revert: using another way. ag/16259258

Change-Id: I4ae695237cb3417cb3d08fcbb3354dc649681aab
2021-11-15 04:50:25 +00:00
Kevin Han
4b59b75c59 Merge "Unhibernate an app when a user exempts it" 2021-11-12 21:09:07 +00:00
Xin Li
bf45599d43 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I9ac05f5da437030e1b5db082ddaf7959f82acccd
Change-Id: Iaf8ebc4877a8276672354b45db0dd502c0f71bd3
2021-11-11 16:54:23 +00:00
SongFerng Wang
990b4c4662 Merge "Device do network scan after user rotates NetworkSelection page" 2021-11-11 11:51:24 +00:00
SongFerngWang
f54ead1f94 Device do network scan after user rotates NetworkSelection page
Add the networkSelectSettings fragment into new activity, and set
the activity's android:configChanges as
"orientation|keyboard|keyboardHidden|screenSize|screenLayout
|smallestScreenSize".

Bug: 204039043
Test: atest AutoSelectPreferenceControllerTest (pass)
atest OpenNetworkSelectPagePreferenceControllerTest (pass)
atest NetworkSelectSettingsTest (pass)

Change-Id: Ic933c2294401bc50e105ddcfd2a17886d0bbefc3
2021-11-11 18:16:23 +08:00
Julia Reynolds
c320ef338e Merge "Properly show conversation settings" 2021-11-10 21:13:45 +00:00
Julia Reynolds
a1c0dc75cd Properly show conversation settings
... when the backing shortcut is missing, so users can change
notification settings when the shortcut hasn't yet been recreated by the
app when setting up a new device

Test: Robotests (confirmed that the 2 controllers that used
mConversationInfo already tested for null), manual
Fixes: 203991823

Change-Id: I477c6b0aef0d978767788cbfc1bfadea4d36cda8
2021-11-10 14:16:42 -05:00
Etienne Ruffieux
e004eaa51b Make BluetoothCodecConfig and BluetoothCodecStatus public
Tag: #feature
Bug: 200202780
Test: make RunSettingsRoboTests
Change-Id: I2a81216de050b143cee5c537d899a699d5012330
2021-11-10 10:12:51 +00:00
YUKAI HUNG
a7412b33b2 Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6e12a31e5f am: a1d72c11c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221114

Change-Id: I4c9d5265d8abd4a73a19df2afc5c718d8827ddab
2021-11-10 10:10:05 +00:00
YUKAI HUNG
a1d72c11c5 Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6e12a31e5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221114

Change-Id: I2d78a4287aa740f1e583c8f570d52c2dc8d90bf7
2021-11-10 09:50:59 +00:00
ykhung
101dc6878a Fix incorrect usage for the logging method to cause no data in WW
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged  into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only

Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I9f1d157c77df9bd74f441105318790a2505a9c01
2021-11-10 15:39:30 +08:00
TreeHugger Robot
1961f6ac3e Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev am: 5afb04e1b8 am: 0f6c95d4fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220939

Change-Id: If0c770aabefcc0644045ec272a32a1bfae022182
2021-11-10 02:37:04 +00:00
TreeHugger Robot
0f6c95d4fd Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev am: 5afb04e1b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220939

Change-Id: I38c253e43ca1165916550503b13276bcf23b672a
2021-11-10 02:18:39 +00:00
Kevin Han
424319371c Unhibernate an app when a user exempts it
When an app is exempted from hibernation, we unhibernate as well. This
prevents confusing situations where a user may return to the "Unused
Apps" page and sees that the app is still there even after exemption.

Bug: 205641871
Test: atest HibernationSwitchPreferenceControllerTest
Change-Id: I4f98a2212eefdb6c456a0de36d428021b262cca3
2021-11-09 16:47:35 -08:00
Julia Reynolds
6c43335181 Merge "Add ability to force rebuild list" 2021-11-09 16:34:10 +00:00
ykhung
64e49a9393 Fix "battery saver" not in the top seaching result for indexing
Bug: 204964119
Test: make SettingsRoboTests
Change-Id: Ifbbf979abe9e96e7af66ec20173e996793d2703e
2021-11-10 00:11:09 +08:00
TreeHugger Robot
907cbb2129 Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6f6149c7ba am: 22b763486d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220930

Change-Id: I47be5b62b5a7b407698ba4815415e1abd5a9bd4e
2021-11-09 15:44:26 +00:00
TreeHugger Robot
22b763486d Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6f6149c7ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220930

Change-Id: Iefc9f1b9719bd1cc57bf79d7d8d873a4f4dbc995
2021-11-09 15:22:38 +00:00
ykhung
48c3533cd0 Fix incorrect usage for the logging method to cause no data in WW
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged  into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only

Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I0ca87ca96647f025adbd23f9f93a3cbd5f7d8579
2021-11-09 21:01:40 +08:00
Hugh Chen
4640a2a077 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: b1adf980a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16144999

Change-Id: Ieb2beb22a55230c7e7f283f6886b340b7821d67f
2021-11-09 07:27:19 +00:00
Hugh Chen
be094163b8 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 58d81fbbb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956

Change-Id: I6572efe48fb0ad0159e0177459d1929aaa4f86ce
2021-11-09 07:24:27 +00:00
TreeHugger Robot
8072964193 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev 2021-11-09 06:58:39 +00:00
Julia Reynolds
b106377155 Add ability to force rebuild list
So that you can change between filters that
have the same sort order.

Test: robotests, manually switch between notifications (off) to
notifications (all)
Fixes: 169943424

Change-Id: I62bbe90f30abada2ec342487a1fa420e451b3caf
2021-11-08 15:47:51 -05:00
TreeHugger Robot
bf6c779caa Merge "Fix broken tests" 2021-11-08 17:16:46 +00:00
TreeHugger Robot
7e94a9ff62 Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd am: cd467e99d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: Ib57d1de7591e1429440f746839078594fd97dfef
2021-11-08 16:50:47 +00:00
TreeHugger Robot
cd467e99d8 Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: I670cde971b45484e54b951a90e507acc7ef0c1dc
2021-11-08 16:34:32 +00:00
Julia Reynolds
dc18e85e41 Fix broken tests
Remove group conditions - we don't have a group page
and so don't need to test what its header would be

Test: this
Fixes: 201021319
Change-Id: I22049bc7ea2153a574ed5aa5428a5dfb295447a5
2021-11-08 16:16:48 +00:00
Julia Reynolds
42896d7fe1 Check if pref is disabled by admin
Test: robotests
Fixes: 137638270
Change-Id: I39953d5b7466281cff7a9a7ffaeb5ba99ab12934
2021-11-05 18:07:58 +00:00
TreeHugger Robot
a63e7c7141 Merge "Revert "[Settings] Ignore failed test case"" 2021-11-05 13:47:20 +00:00
YUKAI HUNG
8d70e92bff Revert "[Settings] Ignore failed test case"
This reverts commit 7cc1c69db5.

Reason for revert: test whether is can be passed or not

Change-Id: I08c538f1b5be0a5cfe299d1c9c0affb801b34dc2
2021-11-04 22:12:19 +00:00
Weng Su
a27167dbd8 Remove ACCESS_COARSE_LOCATION permission checking
- The calling package needs ACCESS_FINE_LOCATION permission to get WiFi
result data.

- The ACCESS_COARSE_LOCATION permission is not allowed.

Bug: 185126813
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: I2c9013a74d173066270b422ae2179b0d1018f2d7
2021-11-05 01:36:13 +08:00
TreeHugger Robot
a6566fe3d7 Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29 am: ac476ff63b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: Icf3de5a331dc58c0a815e8a0602b8fc69ccd3615
2021-11-04 04:48:27 +00:00
TreeHugger Robot
ac476ff63b Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: I89ae3ac6b59ff776e745c5885f03ff529f9c7677
2021-11-04 04:25:46 +00:00
TreeHugger Robot
8118b9ff29 Merge "Remove the text for untethered bt device" into sc-v2-dev 2021-11-04 04:08:45 +00:00
TreeHugger Robot
a5bae59374 Merge "Add package name check for the calling app" into sc-v2-dev am: 12b7fd54ec am: 631c67dc8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062219

Change-Id: I7322c5f293cb90e50c5f402004113777119361cc
2021-11-04 03:24:33 +00:00
TreeHugger Robot
f34c14d147 Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev am: 3b84fd462f am: d7bd386313
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062214

Change-Id: I42bb1bc4fcfe2d964935f5fe1ccaa5d1409aac77
2021-11-04 03:24:26 +00:00
TreeHugger Robot
631c67dc8e Merge "Add package name check for the calling app" into sc-v2-dev am: 12b7fd54ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062219

Change-Id: I248616eaed0c9c3d19612d702b97e851f1847e2a
2021-11-04 03:07:48 +00:00
TreeHugger Robot
d7bd386313 Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev am: 3b84fd462f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062214

Change-Id: Iec793d2d8f629bcb5d92cccf889e919db6450f54
2021-11-04 03:07:40 +00:00
TreeHugger Robot
12b7fd54ec Merge "Add package name check for the calling app" into sc-v2-dev 2021-11-04 03:01:33 +00:00