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

Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4

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

Change-Id: I6e8bb778a0c9a7e45965bebe6605bac76915aad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-14 12:28:49 +00:00
committed by Automerger Merge Worker
parent 2a6553b122 3494d09de4
commit 03b39bc5d3
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/tether/TetherSettings.java
View File

@@ -148,12 +148,13 @@ public class TetherSettings extends RestrictedSettingsFragment
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
// Even when the UI is restricted, addPreferencesFromResource cannot be omitted.
addPreferencesFromResource(R.xml.tether_prefs);
setIfOnlyAvailableForAdmins(true); setIfOnlyAvailableForAdmins(true);
if (isUiRestricted()) { if (isUiRestricted()) {
return; return;
} }
addPreferencesFromResource(R.xml.tether_prefs);
mContext = getContext(); mContext = getContext();
mDataSaverBackend = new DataSaverBackend(mContext); mDataSaverBackend = new DataSaverBackend(mContext);
mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled(); mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();

2
tests/robotests/src/com/android/settings/network/tether/TetherSettingsTest.java
View File

@@ -131,10 +131,12 @@ public class TetherSettingsTest {
@Test @Test
@Config(shadows = ShadowRestrictedSettingsFragment.class) @Config(shadows = ShadowRestrictedSettingsFragment.class)
public void onCreate_isUiRestricted_doNotSetupViewModel() { public void onCreate_isUiRestricted_doNotSetupViewModel() {
doNothing().when(mTetherSettings).addPreferencesFromResource(anyInt());
when(mTetherSettings.isUiRestricted()).thenReturn(true); when(mTetherSettings.isUiRestricted()).thenReturn(true);
mTetherSettings.onCreate(null); mTetherSettings.onCreate(null);
verify(mTetherSettings).addPreferencesFromResource(anyInt());
verify(mTetherSettings, never()).setupViewModel(); verify(mTetherSettings, never()).setupViewModel();
} }