From 22632be393c1f484892eb819981d67c7c1164524 Mon Sep 17 00:00:00 2001 From: Zhen Zhang Date: Thu, 4 Jan 2024 10:30:22 -0600 Subject: [PATCH] Rename method name Renamed checkIfMeteredDataRestricted() to checkIfMeteredDataUsageUserControllerDisabled() to relect its actual usage. Test: built successfully Bug: 317265503 Change-Id: I76189da1da510067d5a715c5a34b6a18e53544fc --- src/com/android/settings/datausage/AppDataUsage.java | 5 +++-- .../datausage/UnrestrictedDataAccessPreference.java | 6 +++--- .../UnrestrictedDataAccessPreferenceController.java | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index fb28d6850c6..dbc0bc76ce2 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -289,8 +289,9 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC return; } setBackPreferenceListAnimatorIfLoaded(); - final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted( - mContext, mPackageName, UserHandle.getUserId(mAppItem.key)); + final EnforcedAdmin admin = RestrictedLockUtilsInternal + .checkIfMeteredDataUsageUserControlDisabled(mContext, mPackageName, + UserHandle.getUserId(mAppItem.key)); if (mRestrictBackground != null) { mRestrictBackground.setChecked(!restrictBackground); mRestrictBackground.setDisabledByAdmin(admin); diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java index 347c237fbb5..7a7eb8cc189 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java @@ -13,7 +13,7 @@ */ 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.graphics.drawable.Drawable; @@ -56,8 +56,8 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem mApplicationsState = applicationsState; mDataSaverBackend = dataSaverBackend; mParentFragment = parentFragment; - setDisabledByAdmin(checkIfMeteredDataRestricted(context, entry.info.packageName, - UserHandle.getUserId(entry.info.uid))); + setDisabledByAdmin(checkIfMeteredDataUsageUserControlDisabled( + context, entry.info.packageName, UserHandle.getUserId(entry.info.uid))); updateState(); setKey(generateKey(mEntry)); diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java index 0fb6e5067d0..fd2fcda71e1 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java @@ -13,7 +13,7 @@ */ 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.settings.SettingsEnums; @@ -149,7 +149,7 @@ public class UnrestrictedDataAccessPreferenceController extends BasePreferenceCo preference.setOnPreferenceChangeListener(this); mScreen.addPreference(preference); } else { - preference.setDisabledByAdmin(checkIfMeteredDataRestricted(mContext, + preference.setDisabledByAdmin(checkIfMeteredDataUsageUserControlDisabled(mContext, entry.info.packageName, UserHandle.getUserId(entry.info.uid))); preference.updateState(); }