Only show restricted apps that belong to the user.
Filter out the restricted apps that not belong to the correct user, in this way secondary user cannot see what apps been restricted by primary user. Bug: 74076658 Test: RunSettingsRoboTests Change-Id: I8471f07be747c177f8611cdc1973a8420dc41296
This commit is contained in:
@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batterytip;
|
||||
|
||||
import android.app.AppOpsManager;
|
||||
import android.content.Context;
|
||||
import android.os.UserManager;
|
||||
import android.provider.Settings;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
@@ -35,12 +36,14 @@ public class BatteryManagerPreferenceController extends BasePreferenceController
|
||||
private static final int ON = 1;
|
||||
private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
|
||||
private AppOpsManager mAppOpsManager;
|
||||
private UserManager mUserManager;
|
||||
|
||||
public BatteryManagerPreferenceController(Context context) {
|
||||
super(context, KEY_BATTERY_MANAGER);
|
||||
mPowerUsageFeatureProvider = FeatureFactory.getFactory(
|
||||
context).getPowerUsageFeatureProvider(context);
|
||||
mAppOpsManager = context.getSystemService(AppOpsManager.class);
|
||||
mUserManager = context.getSystemService(UserManager.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -51,7 +54,7 @@ public class BatteryManagerPreferenceController extends BasePreferenceController
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
super.updateState(preference);
|
||||
final int num = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager).size();
|
||||
final int num = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager).size();
|
||||
final String setting = mPowerUsageFeatureProvider.isSmartBatterySupported()
|
||||
? Settings.Global.APP_STANDBY_ENABLED
|
||||
: Settings.Global.APP_AUTO_RESTRICTION_ENABLED;
|
||||
|
||||
Reference in New Issue
Block a user