Commit Graph

17161 Commits

Author SHA1 Message Date
TreeHugger Robot
7f32697692 Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400

Change-Id: I65697bb252fe44e18cbca6ca1a7b74e8d66f18ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 17:47:32 +00:00
Weng Su
dc4ad09291 Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
2022-08-17 07:07:17 +00:00
Robert Luo
c6d8ef82c4 Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev am: 63aca8e131
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491096

Change-Id: Id56424de408fca4a14807e29560a5694c4a63705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 04:58:02 +00:00
Robert Luo
63aca8e131 Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev 2022-08-17 04:28:08 +00:00
Jason Hsu
cd76ba8821 Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev am: f21593c870
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569012

Change-Id: Iaa33b5b62f4940559c8fc630022456971f8fae11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 03:32:25 +00:00
Jason Hsu
f21593c870 Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev 2022-08-17 02:43:47 +00:00
Tsung-Mao Fang
5e785a2d99 Wi-Fi panel doesn't need to check permission
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-17 02:43:03 +00:00
Julia Reynolds
80e1ca7c54 Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197

Change-Id: Iffe89254913fab91b02e3e5db18939912204de40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 19:55:23 +00:00
Julia Reynolds
dbaa419226 Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev 2022-08-16 17:07:18 +00:00
Hugh Chen
2358afae79 RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature am: 1311019b9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622

Change-Id: I3dd165a645a1bb63613d541453e32d7c943df776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 04:37:06 +00:00
TreeHugger Robot
ea3f9f337e Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev 2022-08-16 04:03:12 +00:00
Tsung-Mao Fang
d2c372450c Wi-Fi panel doesn't need to check permission
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-16 03:59:56 +00:00
Julia Reynolds
2a61b3656b Update Bridged app link when NLS access changes
Test: BridgedAppsLinkPreferenceControllerTest
Test: manual; turn an NLS on/off, verify correct disabled state for fields
Fixes: 240461761
Change-Id: Ib5a5365f7477c2a8d620ced2af96ace364b292e2
2022-08-15 17:50:49 +00:00
Weng Su
911573f2e1 [RESTRICT AUTOMERGE] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
(cherry picked from commit 2732be59e5)
2022-08-15 13:31:52 +00:00
Weng Su
028c8f3dbc Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID
- Because the wifiConfiguration save the carrier ID only for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- To avoid user confusion, show one SIM only when dual SIMs have the same carrier ID

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

Change-Id: I56f956d20053d314f082ba185d661d8e0a0ef3cb
Merged-In: I56f956d20053d314f082ba185d661d8e0a0ef3cb
2022-08-15 13:25:47 +00:00
TreeHugger Robot
5ab0a976de Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev 2022-08-12 10:00:55 +00:00
Zaiyue Xue
2e7957727f Fix import of anyLong in BatteryChartPreferenceControllerTest.
This is to fix the merge conflicts within tm-qpr-dev,
tm-qpr-dev-plus-aosp and master.

Bug: 236101166
Test: manual
Change-Id: I2f4531ccc7c59b279d14bc5c0bd6c1fe51dd475d
Merged-In: I52547d10f0579fddb21091b641925910db17ef38
2022-08-12 13:57:53 +08:00
Treehugger Robot
bf0cb88417 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a am: 62fa667b26
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: If86acd9982d50238c1ed31f78735ef805857bc9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 04:02:56 +00:00
Treehugger Robot
62fa667b26 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I49eb01dd9ecf0f6bb606c778bbd0acbc99b11a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 03:47:12 +00:00
Treehugger Robot
e194aa42eb Merge "Fix permissions for internal links." am: 24f45fbd63
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I633c22a73b0d160c0fbf662768a92e4f0dfac85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 03:03:53 +00:00
TreeHugger Robot
79bdae659c Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev am: 0077129094
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590401

Change-Id: Ic53e1282db41bf8c8c66e8d750179189b3b1af1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 02:46:52 +00:00
TreeHugger Robot
0077129094 Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev 2022-08-12 02:27:36 +00:00
Betty Chang
0c2a3ead2b Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: Ia2f4ab79a90b7733d0ad23b3573b55a527da84df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 01:40:05 +00:00
TreeHugger Robot
d208da6546 Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dcdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19553474

Change-Id: Ib8bb80d10095f4de2d14bbe4facd1534977e0b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 01:39:40 +00:00
Betty Chang
9c0904acde Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev 2022-08-12 01:29:01 +00:00
TreeHugger Robot
2cd733dcdb Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev 2022-08-12 01:19:01 +00:00
Prabal Singh
94e073ce33 Merge "Hide work policy info if safety center is enabled" into tm-qpr-dev am: aaa6f7ef31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562169

Change-Id: I54cb53c03d3b56aef294f64d32d5666e671b4e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 22:18:31 +00:00
Robert Luo
36d320a8de Allow advanced VPN to manage connection status via its UI
Bug: 238641532
Test: atest -c VpnSettingsTest
Change-Id: Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f
Merged-In: Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f
2022-08-12 05:47:44 +08:00
Hugh Chen
1311019b9a RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature
- This CL will check whether advanced VPN apk is exist or not,
  and if so then show the preference of advanced VPN in the
  "Settings > Network & internet > VPN".

Bug: 239984274
Test: atest -c VpnSettingsTest
Change-Id: I8c11c7f2079d6ebec6c691b8bf2fb26dfc450663
2022-08-11 23:33:30 +08:00
Tsung-Mao Fang
a71907e873 Wi-Fi panel doesn't need to check permission
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the caller is set as sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package of list as our
calling package, then it could fail to pass
permission check since that package could not
a calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
this Wi-Fi Panel problem since Wi-Fi panel running
on settings process and also promise the security
issue at the same time.

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-11 12:21:08 +00:00
changbetty
d55a7067aa [LE Audio] To fix the condition of the broadcast icon display
- The broadcast icon will be displayed when the device is connected to
   the LE Audio device.

 - The broadcast option dialog will show the "Broadcast" option when the
   media is streaming. Otherwise, it will not show.

Bug: 235923182
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: Ib225d185b6f15463f4fae809e0cdaa25920d52af
2022-08-11 02:01:55 +00:00
Bob Badour
11411e187b Fix permissions for internal links.
Test: m droid dist

Change-Id: If872d5e91a78d8f407e618a2c655c8cf4ac7d7fc
2022-08-10 14:21:47 -07:00
Julia Reynolds
33710fd9e2 Revert^2 "Improve App notification loading"
c5f1cb11e0

Change-Id: I5a6d39e0a5f2b7bd30bcc12e207b8bb23857c6d8
2022-08-10 13:41:22 -04:00
Prabal Singh
b31624d406 Hide work policy info if safety center is enabled
Fix: b/241747812
Test: Manually
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=WorkPolicyInfoPreferenceControllerTest

Change-Id: I23d68dd80d91ec9df80dd2542355ecc964583d39
2022-08-10 09:56:14 +01:00
jasonwshsu
7880aee855 Add pair button in bluetooth details page for hearing aid device
Root Cause: Users can not connect another ear again after they cancel
the pairing dialog in Accessibility -> hearing aids entry

Solution: Add pair button in bluetooth details page for hearing aid
device

Bug: 233038449
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest

Change-Id: I6a7af1c2c2263476b040233edb072cc64a2927b0
2022-08-10 07:20:56 +00:00
Milton Wu
98239c0da6 Add FLAG_SECURE for ChooseLockPassword and Pattern
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.

Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
      SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
2022-08-09 04:12:10 +00:00
Omer Osman
c0209a6e7a Merge "Add support for selection of Opus in Developer Options" into tm-qpr-dev am: cb930bc0ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17901372

Change-Id: I5f3658d3d580858c502c8b44ff540723118c2021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 19:00:13 +00:00
Omer Osman
b61e129f35 Add support for selection of Opus in Developer Options
Stub implementation for LC3 is added due to the interfaces being
present. The BT stack does not currently implement LC3 over A2DP.

Bug: 226441860
Test: BluetoothCodecDialogPreferenceControllerTest

Change-Id: I40546c97370872b37c0258d10e67a3871f9d9af5
2022-07-29 05:23:55 +00:00
Julia Reynolds
197091ca8a Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev am: 45bcb214da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19416082

Change-Id: Ie0c44628c38787a16cf055bf5a92c60071f7eaae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 13:19:58 +00:00
Julia Reynolds
45bcb214da Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev 2022-07-27 13:11:50 +00:00
Weng Su
17070ee0c4 Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev am: b4ad581fe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394734

Change-Id: If5fbf81277d74626b246338d0e9f3d010805262f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 04:42:53 +00:00
Weng Su
b4ad581fe7 Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev 2022-07-27 04:31:05 +00:00
Julia Reynolds
397c885c46 Merge "Revert "Improve App notification loading"" into tm-qpr-dev am: 6a110b91f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19419547

Change-Id: Ib22e2fc711b81772e7ddbafd786181bf694b46d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 15:13:06 +00:00
Julia Reynolds
6a110b91f8 Merge "Revert "Improve App notification loading"" into tm-qpr-dev 2022-07-26 14:56:20 +00:00
Bill Lin
008f70c249 Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev am: 483c9b7206
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394732

Change-Id: Ib149edd918076d46f98d657169e13bc2d34cdef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 01:17:02 +00:00
Bill Lin
483c9b7206 Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev 2022-07-26 00:45:37 +00:00
TreeHugger Robot
6a8f459e6c Merge "Send metric intent back to SUW" into tm-qpr-dev am: 587da7dfc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19378812

Change-Id: If60a5eacd90ba186423183da0883d1252309d825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 22:41:04 +00:00
TreeHugger Robot
587da7dfc3 Merge "Send metric intent back to SUW" into tm-qpr-dev 2022-07-25 22:18:04 +00:00
Neha Jain
c5f1cb11e0 Revert "Improve App notification loading"
Revert "Fix binder error when an app has many channels"

Revert submission 19290255-jr-bind-flicker

Reason for revert: b/240100577
Reverted Changes:
I9a1c96f75:Improve App notification loading
I391ce0b10:Fix binder error when an app has many channels

Change-Id: Iaae40de74d135a79c18201ec17e00f3d9d5f0f3b
2022-07-25 22:16:16 +00:00
Julia Reynolds
e4dc6c972f Only show the channel toast if users expressly ask for it
Test: NotificationChannelWarningsPreferenceControllerTest.java
Bug: 231150048
Change-Id: I4797a2184561ae3dcd03e62bfb78a90686458c6b
2022-07-25 19:39:49 +00:00