Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 306df3be authored by Zhen Zhang's avatar Zhen Zhang Committed by Android (Google) Code Review
Browse files

Merge "Rename method name" into main

parents 180a686a 22632be3

src/com/android/settings/datausage/AppDataUsage.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java

+3 −3
Original line number Diff line number Diff line
@@ -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));

src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

            }