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

Rename method name

Browse Source 
Renamed checkIfMeteredDataRestricted() to
checkIfMeteredDataUsageUserControllerDisabled() to relect its actual
usage.

Test: built successfully
Bug: 317265503
Change-Id: I76189da1da510067d5a715c5a34b6a18e53544fc
This commit is contained in:
Zhen Zhang
2024-01-04 10:30:22 -06:00
parent ced0c1d038
commit 22632be393
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -289,8 +289,9 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
return; return;
} }
setBackPreferenceListAnimatorIfLoaded(); setBackPreferenceListAnimatorIfLoaded();
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted( final EnforcedAdmin admin = RestrictedLockUtilsInternal
mContext, mPackageName, UserHandle.getUserId(mAppItem.key)); .checkIfMeteredDataUsageUserControlDisabled(mContext, mPackageName,
UserHandle.getUserId(mAppItem.key));
if (mRestrictBackground != null) { if (mRestrictBackground != null) {
mRestrictBackground.setChecked(!restrictBackground); mRestrictBackground.setChecked(!restrictBackground);
mRestrictBackground.setDisabledByAdmin(admin); mRestrictBackground.setDisabledByAdmin(admin);

6
src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
View File

@@ -13,7 +13,7 @@
*/ */
package com.android.settings.datausage; package com.android.settings.datausage;
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataRestricted; import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataUsageUserControlDisabled;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -56,8 +56,8 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
mApplicationsState = applicationsState; mApplicationsState = applicationsState;
mDataSaverBackend = dataSaverBackend; mDataSaverBackend = dataSaverBackend;
mParentFragment = parentFragment; mParentFragment = parentFragment;
setDisabledByAdmin(checkIfMeteredDataRestricted(context, entry.info.packageName, setDisabledByAdmin(checkIfMeteredDataUsageUserControlDisabled(
UserHandle.getUserId(entry.info.uid))); context, entry.info.packageName, UserHandle.getUserId(entry.info.uid)));
updateState(); updateState();
setKey(generateKey(mEntry)); setKey(generateKey(mEntry));

4
src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
View File

@@ -13,7 +13,7 @@
*/ */
package com.android.settings.datausage; package com.android.settings.datausage;
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataRestricted; import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataUsageUserControlDisabled;
import android.app.Application; import android.app.Application;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
@@ -149,7 +149,7 @@ public class UnrestrictedDataAccessPreferenceController extends BasePreferenceCo
preference.setOnPreferenceChangeListener(this); preference.setOnPreferenceChangeListener(this);
mScreen.addPreference(preference); mScreen.addPreference(preference);
} else { } else {
preference.setDisabledByAdmin(checkIfMeteredDataRestricted(mContext, preference.setDisabledByAdmin(checkIfMeteredDataUsageUserControlDisabled(mContext,
entry.info.packageName, UserHandle.getUserId(entry.info.uid))); entry.info.packageName, UserHandle.getUserId(entry.info.uid)));
preference.updateState(); preference.updateState();
} }