PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev am: ee21072a5e

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

Change-Id: I3e4661df4a20415b44390eb6484811e3073e9f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-28 17:32:08 +00:00
committed by Automerger Merge Worker
parent 215229d8b6 ee21072a5e
commit e7e1f37321
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -1324,6 +1324,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
@VisibleForTesting @VisibleForTesting
void launchConfigNewNetworkFragment(WifiEntry wifiEntry) { void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {
if (mIsRestricted) {
Log.e(TAG, "Can't configure Wi-Fi because NetworkProviderSettings is restricted.");
EventLog.writeEvent(0x534e4554, "246301667", -1 /* UID */, "Fragment is restricted.");
return;
}
final Bundle bundle = new Bundle(); final Bundle bundle = new Bundle();
bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY, bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY,
wifiEntry.getKey()); wifiEntry.getKey());

9
tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
View File

@@ -751,6 +751,15 @@ public class NetworkProviderSettingsTest {
assertThat(keys).contains(NetworkProviderSettings.PREF_KEY_WIFI_TOGGLE); assertThat(keys).contains(NetworkProviderSettings.PREF_KEY_WIFI_TOGGLE);
} }
@Test
public void launchConfigNewNetworkFragment_fragmentIsRestricted_ignoreWifiEntry() {
mNetworkProviderSettings.mIsRestricted = true;
mNetworkProviderSettings.launchConfigNewNetworkFragment(mWifiEntry);
verify(mWifiEntry, never()).getKey();
}
@Implements(PreferenceFragmentCompat.class) @Implements(PreferenceFragmentCompat.class)
public static class ShadowPreferenceFragmentCompat { public static class ShadowPreferenceFragmentCompat {