Commit Graph

15798 Commits

Author SHA1 Message Date
Weng Su
c4d0597373 Check multiple security types for Wi-Fi NetworkRequest
- The WifiEntry already support multiple security types simultaneously from framework

- For backward compatibility, WifiEntry supports both getSecurity and getSecurityTypes methods

- However, the getSecurity method can only return one type of security, causing NetworkRequest to fail to match another type of security
  - WifiEntry:      getSecurity:WPA2   // getSecurityTypes:{WPA2, WPA3}
  - ReqeustNetwork: getSecurity:WPA3

- Need to use getSecurityTypes to check for matching WifiEntry

Bug: 205943818
Bug: 249713442
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Merged-In: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
Change-Id: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
(cherry picked from commit a88c064842)
2022-12-07 18:15:44 +00:00
TreeHugger Robot
642a0a74a4 Merge "Check multiple security types for Wi-Fi NetworkRequest" 2022-12-07 14:25:58 +00:00
Bonian Chen
7b06d5f0e1 [Settings] BT and WiFi reset menu might covers VPN
VPN would be reset by BT and WiFi reset menu under device without a SIM
available.

Bug: 260034791
Test: local and auto
Change-Id: I3c66cd629977cc11172758ebbe314167b5220419
2022-12-07 13:45:51 +00:00
Rupesh Bansal
bc255db77a Remove VR features from apps
Bug: 260555143
Test: atest com.android.server.power
Change-Id: I7d1938363dacb06f93cea69672a710ccbb76012e
2022-12-07 12:30:30 +00:00
Weng Su
a88c064842 Check multiple security types for Wi-Fi NetworkRequest
- The WifiEntry already support multiple security types simultaneously from framework

- For backward compatibility, WifiEntry supports both getSecurity and getSecurityTypes methods

- However, the getSecurity method can only return one type of security, causing NetworkRequest to fail to match another type of security
  - WifiEntry:      getSecurity:WPA2   // getSecurityTypes:{WPA2, WPA3}
  - ReqeustNetwork: getSecurity:WPA3

- Need to use getSecurityTypes to check for matching WifiEntry

Bug: 205943818
Bug: 249713442
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Change-Id: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
2022-12-07 20:09:28 +08:00
Zhenwei Chen
89ad53e3cb Merge "Fix batteryInfo unit test" into tm-qpr-dev am: 47fa893358
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20638347

Change-Id: I8d1993dea1435d4f6679e682be99025a9a0daa30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 09:29:07 +00:00
Zhenwei Chen
47fa893358 Merge "Fix batteryInfo unit test" into tm-qpr-dev 2022-12-07 08:31:44 +00:00
Zhenwei Chen
36c1e7dc20 Fix incorrect dock defender banner icon.
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png

Bug: 261156455
Test: Unit tests passed and manual test on the device
Merged-In: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 52323128dc)
2022-12-07 05:46:57 +00:00
Bonian Chen
0a3438c194 Merge "[Settings] Add BT and WiFi reset option" 2022-12-06 16:08:32 +00:00
TreeHugger Robot
ccc77bf359 Merge "[Battery usage U] Show battery usage info immediately up till as close to the current moment as possible." 2022-12-06 14:56:29 +00:00
Vania Januar
33419410ea Merge "Toggle for disabling stylus buttons." 2022-12-06 14:24:06 +00:00
Bonian Chen
dc6877f2ef [Settings] Add BT and WiFi reset option
Add an BT and WiFi reset option into factory reset menu.

Bug: 260034791
Test: local
Change-Id: I9031765cd5a012e3216971a3302176a96c2fbd23
2022-12-06 13:08:46 +00:00
Chaohui Wang
b62b890b71 Merge "Migrate AppPermissionSummaryTest to AndroidJUnit4" 2022-12-06 13:00:03 +00:00
Wesley Wang
dbd95eb47b Merge "Fix incorrect dock defender banner icon." 2022-12-06 11:57:23 +00:00
Tsung-Mao Fang
71f2d83688 FRP bypass defense in the settings app
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-06 11:45:08 +00:00
Tsung-Mao Fang
22869d9019 FRP bypass defense in the settings app
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-06 11:44:29 +00:00
PETER LIANG
14f145181f Merge "Fix the preview should keep the same layer after font or display size change." 2022-12-06 09:47:59 +00:00
Zhenwei Chen
52323128dc Fix incorrect dock defender banner icon.
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png

Bug: 261156455
Test: Unit tests passed and manual test on the device
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-12-06 09:40:50 +00:00
Zaiyue Xue
3d7b8b3bfe [Battery usage U] Show battery usage info immediately up till as close to the current moment as possible.
screen_record: https://drive.google.com/file/d/1Wdm8Wpn39k6E9Yo4bbTENf5VANP337QA/view?usp=share_link&resourcekey=0-1LNmaTaZI13DUmjNfkBehQ

Bug: 252407178
Fix: 252407178
Test: maunal
Change-Id: Ia08dea791bb72113719fd1316e8e9587a96eaef1
2022-12-06 17:36:55 +08:00
Tsung-Mao Fang
1cf31d17aa FRP bypass defense in the settings app
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-06 09:27:45 +00:00
Bonian Chen
a1e8760494 Merge "[Settings] Code refactor - SIM slot UI preference key" 2022-12-06 08:30:50 +00:00
Betty Chang
6ef041d366 Merge "[LE Audio] Add broadcast icon when device is broadcasting but LE device is disconnected" 2022-12-06 08:03:59 +00:00
Zhenwei Chen
b41e06a5fb Fix batteryInfo unit test
Bug:261139453
Test: Unit test passed
Merged-In: I8f94f984dc1bf833653ae49557fdd02f736b365c
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 54615b3bec)
2022-12-06 06:22:38 +00:00
Chaohui Wang
681b519b80 Migrate AppPermissionSummaryTest to AndroidJUnit4
Bug: 260441791
Test: Unit test
Change-Id: I72a63f9247ae370dbfcb0ff2babbfdfc95bd60a2
2022-12-06 13:28:39 +08:00
Bonian Chen
09bd704c45 [Settings] Code refactor - SIM slot UI preference key
Avoid from controlling Preference key separately in different places.

Bug: 261374879
Test: local & auto
Change-Id: I0a777c3f2511a25e8f619deba964bc343183c3cc
2022-12-06 05:12:19 +00:00
Zaiyue Xue
00fb008e9c Support App and System tabs for battery usage breakdown.
design_doc: go/usage-frontend-dd

screen_record: https://drive.google.com/file/d/1I8dnoMf7y9KUg0eVeqLJpHqGGOtaX6_0/view?usp=share_link&resourcekey=0-Mte0-LKN1LULRssg9t7zGg

Bug b/260786962 is also fixed in this cl.

Bug: 258123381
Bug: 260786962
Fix: 258123381
Fix: 260786962
Test: manual
Change-Id: Ifd337331d02dc10c3234c594b2e142bcd459c00f
2022-12-06 11:23:27 +08:00
Kuan Wang
ec1c9d94f2 Remove foreground_service_usage_time_in_ms field which has been merged
into background_usage_time_in_ms in the BatteryUsageStats (b/257392992).

Test: make RunSettingsRoboTests + manual
Bug: 258124768
Bug: 253553141
Change-Id: I0967eec0cbe6d0cb7a0535d744a1046dec1d267b
2022-12-06 01:04:48 +00:00
Ale Nijamkin
b2cce522f8 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538 am: 092de727b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875

Change-Id: I31b55e7a8e83c948b1aa7d64e0f7f135f1d95698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:26:36 +00:00
Ale Nijamkin
092de727b9 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875

Change-Id: Ib2cfda862a53c9093db4b21de3c4ebbf32d33a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 20:00:02 +00:00
Florian Mayer
3c0a0b82da Merge "[MTE] support force_on for device_control override" 2022-12-05 18:38:50 +00:00
David Gutierrez
0ee3c4b0bf Merge "Dead code removal" 2022-12-05 15:58:09 +00:00
Peter Liang
f5c7c52ca1 Fix the preview should keep the same layer after font or display size change.
Bug: 259213786
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreviewPreferenceTest
Change-Id: Ifc0047e47806662174712bb8628193bee906b384
2022-12-05 22:51:17 +08:00
Zhenwei Chen
7d0a7f14c3 Merge "Fix batteryInfo unit test" 2022-12-05 11:09:49 +00:00
Zhenwei Chen
54615b3bec Fix batteryInfo unit test
Bug:261139453
Test: Unit test passed
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-12-05 09:10:39 +00:00
Bonian Chen
39b4cbbc1a Merge "[Settings] Code refactor - apply BasePreferenceController" 2022-12-05 08:23:20 +00:00
Bonian Chen
3c9a6e294f Merge "[Settings] Code refactor for SIM change detection" 2022-12-05 08:22:42 +00:00
changbetty
81ff62f0dd [LE Audio] Add broadcast icon when device is broadcasting but LE device
is disconnected

Bug: 260173555
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I9e8117d5c885953ab7931833de81ceab63273d43
2022-12-05 07:24:29 +00:00
Bonian Chen
8a439d0a02 [Settings] Code refactor for SIM change detection
Code refactor for maintainance:
  Move subscription change monitor out of ResetnetworkConfirm

Bug: 259611847
Test: local test, auto testing
Change-Id: I97a251ced4435d0cc390b40028edef07fd71e24f
2022-12-05 05:42:11 +00:00
Betty Chang
32591bfb96 Merge "[LE Audio] To remove the broadcast source item that created by receive state" 2022-12-05 03:42:06 +00:00
TreeHugger Robot
cbe52e6b1c Merge "Add minimum TLS version for Wi-Fi EAP network" 2022-12-05 03:33:42 +00:00
changbetty
a6d532cdba [LE Audio] To remove the broadcast source item that created by receive
state

    - When the user clicks another broadcast source and wants to join,
      we will remove the previous item that created by getAllSource().
      And trigger the search again.

Bug: 242267719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothBroadcastSourcePreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothFindBroadcastsFragmentTest
Change-Id: I416f0a39e31276876e63360664555f99dd7297c9
2022-12-04 13:52:10 +00:00
Florian Mayer
cd68fe78a0 [MTE] support force_on for device_control override
driveby: remove period for force_off message.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=MemtagHelperTest
Bug: 245624194
Change-Id: I1c56af377925fd58c90bb346d9d003249c5e547c
2022-12-03 02:27:29 +00:00
Alejandro Nijamkin
f31108f11a Specifies nav destination when opening shortcuts.
Doing this will open the correct screen when clicking on "Shortcuts"
under Settings > Display > Lock screen.

Fix: 258471384
Test: manually verified that clicking on it opens the wallpaper picker
experience with the correct page showing.

Change-Id: I627bcb9c9fac7a834f1c9d9cb36b73a6c8817af5
2022-12-02 16:08:32 -08:00
Bonian Chen
967bc7b044 [Settings] Code refactor - apply BasePreferenceController
Apply BasePreferenceController for better compatible with existing
softawre architecture.

Bug: 260540995
Test: local
Change-Id: I6d69ff878a062299b4d8478f6c0341b37a28532d
2022-12-02 17:23:38 +00:00
David Gutierrez
be120eca3e Dead code removal
Test: on-device testing
Change-Id: I96e7e4d5306d468dd32a9affad28bd8c3f90bb75
2022-12-02 16:10:13 +00:00
TreeHugger Robot
2eb121ce3f Merge "Revert "Move the auto data switch preference into DDS sim"" 2022-12-02 06:41:39 +00:00
Ale Nijamkin
c184a471bf Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am: d81ae0a645 am: 2a557b75fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20590947

Change-Id: Iefe3c423fae6c6eb720b1b816af196736089067f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 03:27:05 +00:00
Kuan Wang
bc4548b29e Add BugReportContentProvider to support new battery usage architecture.
Test: make RunSettingsRoboTests + manually
Bug: 256123932
Change-Id: I8cc48f5c66e5cbd958bdd73ff8e7d6e555bd9c3b
2022-12-02 02:53:13 +00:00
Weng Su
c5ec83f1bd Add minimum TLS version for Wi-Fi EAP network
- Remove "TLS v1.3" if device does not support it

Bug: 258372351
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test

Change-Id: If7e41e8c404b4fbf92268afddd92bc6553e60576
2022-12-02 07:06:20 +08:00
Jack Yu
64511c4934 Revert "Move the auto data switch preference into DDS sim"
This reverts commit 28ce6b9057.

Reason for revert: b/253698164 was not approved by the UX team and discussed with the telephony team.

Change-Id: Ia02b3fb204fad83fee40ee05b908ad8ea56820a3
2022-12-01 22:28:52 +00:00