Merge "Add restrict app detail page"
This commit is contained in:
24
res/xml/restricted_apps_detail.xml
Normal file
24
res/xml/restricted_apps_detail.xml
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2018 The Android Open Source Project
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<PreferenceScreen
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:title="@string/restricted_app_title">
|
||||||
|
|
||||||
|
<PreferenceCategory
|
||||||
|
android:key="restrict_app_list"/>
|
||||||
|
|
||||||
|
</PreferenceScreen>
|
@@ -54,9 +54,10 @@ public class BackgroundActivityPreferenceController extends AbstractPreferenceCo
|
|||||||
private final int mUid;
|
private final int mUid;
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
DevicePolicyManagerWrapper mDpm;
|
DevicePolicyManagerWrapper mDpm;
|
||||||
|
@VisibleForTesting
|
||||||
|
BatteryUtils mBatteryUtils;
|
||||||
private Fragment mFragment;
|
private Fragment mFragment;
|
||||||
private String mTargetPackage;
|
private String mTargetPackage;
|
||||||
private boolean mIsPreOApp;
|
|
||||||
private PowerWhitelistBackend mPowerWhitelistBackend;
|
private PowerWhitelistBackend mPowerWhitelistBackend;
|
||||||
|
|
||||||
public BackgroundActivityPreferenceController(Context context, Fragment fragment,
|
public BackgroundActivityPreferenceController(Context context, Fragment fragment,
|
||||||
@@ -77,7 +78,7 @@ public class BackgroundActivityPreferenceController extends AbstractPreferenceCo
|
|||||||
mUid = uid;
|
mUid = uid;
|
||||||
mFragment = fragment;
|
mFragment = fragment;
|
||||||
mTargetPackage = packageName;
|
mTargetPackage = packageName;
|
||||||
mIsPreOApp = isLegacyApp(packageName);
|
mBatteryUtils = BatteryUtils.getInstance(context);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -109,12 +110,7 @@ public class BackgroundActivityPreferenceController extends AbstractPreferenceCo
|
|||||||
* activity for this package
|
* activity for this package
|
||||||
*/
|
*/
|
||||||
public void setUnchecked(Preference preference) {
|
public void setUnchecked(Preference preference) {
|
||||||
if (mIsPreOApp) {
|
mBatteryUtils.setForceAppStandby(mUid, mTargetPackage, AppOpsManager.MODE_IGNORED);
|
||||||
mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage,
|
|
||||||
AppOpsManager.MODE_IGNORED);
|
|
||||||
}
|
|
||||||
mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage,
|
|
||||||
AppOpsManager.MODE_IGNORED);
|
|
||||||
((SwitchPreference) preference).setChecked(false);
|
((SwitchPreference) preference).setChecked(false);
|
||||||
updateSummary(preference);
|
updateSummary(preference);
|
||||||
}
|
}
|
||||||
@@ -133,30 +129,11 @@ public class BackgroundActivityPreferenceController extends AbstractPreferenceCo
|
|||||||
dialogFragment.show(mFragment.getFragmentManager(), TAG);
|
dialogFragment.show(mFragment.getFragmentManager(), TAG);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (mIsPreOApp) {
|
mBatteryUtils.setForceAppStandby(mUid, mTargetPackage, AppOpsManager.MODE_ALLOWED);
|
||||||
mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, mUid, mTargetPackage,
|
|
||||||
AppOpsManager.MODE_ALLOWED);
|
|
||||||
}
|
|
||||||
mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage,
|
|
||||||
AppOpsManager.MODE_ALLOWED);
|
|
||||||
updateSummary(preference);
|
updateSummary(preference);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
|
||||||
boolean isLegacyApp(final String packageName) {
|
|
||||||
try {
|
|
||||||
ApplicationInfo info = mPackageManager.getApplicationInfo(packageName,
|
|
||||||
PackageManager.GET_META_DATA);
|
|
||||||
|
|
||||||
return info.targetSdkVersion < Build.VERSION_CODES.O;
|
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
|
||||||
Log.e(TAG, "Cannot find package: " + packageName, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
void updateSummary(Preference preference) {
|
void updateSummary(Preference preference) {
|
||||||
if (mPowerWhitelistBackend.isWhitelisted(mTargetPackage)) {
|
if (mPowerWhitelistBackend.isWhitelisted(mTargetPackage)) {
|
||||||
|
@@ -398,6 +398,19 @@ public class BatteryUtils {
|
|||||||
return timeMs * 1000;
|
return timeMs * 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setForceAppStandby(int uid, String packageName,
|
||||||
|
int mode) {
|
||||||
|
final boolean isPreOApp = isLegacyApp(packageName);
|
||||||
|
if (isPreOApp) {
|
||||||
|
// Control whether app could run in the background if it is pre O app
|
||||||
|
mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, uid, packageName,
|
||||||
|
mode);
|
||||||
|
}
|
||||||
|
// Control whether app could run jobs in the background
|
||||||
|
mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, uid, packageName,
|
||||||
|
mode);
|
||||||
|
}
|
||||||
|
|
||||||
public void initBatteryStatsHelper(BatteryStatsHelper statsHelper, Bundle bundle,
|
public void initBatteryStatsHelper(BatteryStatsHelper statsHelper, Bundle bundle,
|
||||||
UserManager userManager) {
|
UserManager userManager) {
|
||||||
statsHelper.create(bundle);
|
statsHelper.create(bundle);
|
||||||
@@ -481,5 +494,18 @@ public class BatteryUtils {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isLegacyApp(final String packageName) {
|
||||||
|
try {
|
||||||
|
ApplicationInfo info = mPackageManager.getApplicationInfo(packageName,
|
||||||
|
PackageManager.GET_META_DATA);
|
||||||
|
|
||||||
|
return info.targetSdkVersion < Build.VERSION_CODES.O;
|
||||||
|
} catch (PackageManager.NameNotFoundException e) {
|
||||||
|
Log.e(TAG, "Cannot find package: " + packageName, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -20,9 +20,11 @@ package com.android.settings.fuelgauge;
|
|||||||
import android.app.AppOpsManager;
|
import android.app.AppOpsManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.support.annotation.VisibleForTesting;
|
import android.support.annotation.VisibleForTesting;
|
||||||
|
import android.support.v14.preference.PreferenceFragment;
|
||||||
import android.support.v7.preference.Preference;
|
import android.support.v7.preference.Preference;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.SettingsActivity;
|
||||||
import com.android.settings.applications.LayoutPreference;
|
import com.android.settings.applications.LayoutPreference;
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
|
||||||
@@ -37,12 +39,21 @@ public class RestrictAppPreferenceController extends BasePreferenceController {
|
|||||||
|
|
||||||
private AppOpsManager mAppOpsManager;
|
private AppOpsManager mAppOpsManager;
|
||||||
private List<AppOpsManager.PackageOps> mPackageOps;
|
private List<AppOpsManager.PackageOps> mPackageOps;
|
||||||
|
private SettingsActivity mSettingsActivity;
|
||||||
|
private PreferenceFragment mPreferenceFragment;
|
||||||
|
|
||||||
public RestrictAppPreferenceController(Context context) {
|
public RestrictAppPreferenceController(Context context) {
|
||||||
super(context, KEY_RESTRICT_APP);
|
super(context, KEY_RESTRICT_APP);
|
||||||
mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
|
mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public RestrictAppPreferenceController(SettingsActivity settingsActivity,
|
||||||
|
PreferenceFragment preferenceFragment) {
|
||||||
|
this(settingsActivity.getApplicationContext());
|
||||||
|
mSettingsActivity = settingsActivity;
|
||||||
|
mPreferenceFragment = preferenceFragment;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return AVAILABLE;
|
return AVAILABLE;
|
||||||
@@ -51,13 +62,27 @@ public class RestrictAppPreferenceController extends BasePreferenceController {
|
|||||||
@Override
|
@Override
|
||||||
public void updateState(Preference preference) {
|
public void updateState(Preference preference) {
|
||||||
super.updateState(preference);
|
super.updateState(preference);
|
||||||
|
|
||||||
mPackageOps = mAppOpsManager.getPackagesForOps(
|
mPackageOps = mAppOpsManager.getPackagesForOps(
|
||||||
new int[]{AppOpsManager.OP_RUN_ANY_IN_BACKGROUND});
|
new int[]{AppOpsManager.OP_RUN_ANY_IN_BACKGROUND});
|
||||||
final int num = mPackageOps != null ? mPackageOps.size() : 0;
|
final int num = mPackageOps != null ? mPackageOps.size() : 0;
|
||||||
|
|
||||||
|
// Enable the preference if some apps already been restricted, otherwise disable it
|
||||||
|
preference.setEnabled(num > 0);
|
||||||
preference.setSummary(
|
preference.setSummary(
|
||||||
mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
|
mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
|
||||||
num));
|
num));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||||
|
if (getPreferenceKey().equals(preference.getKey())) {
|
||||||
|
// start fragment
|
||||||
|
RestrictedAppDetails.startRestrictedAppDetails(mSettingsActivity, mPreferenceFragment,
|
||||||
|
mPackageOps);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.handlePreferenceTreeClick(preference);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
147
src/com/android/settings/fuelgauge/RestrictedAppDetails.java
Normal file
147
src/com/android/settings/fuelgauge/RestrictedAppDetails.java
Normal file
@@ -0,0 +1,147 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.fuelgauge;
|
||||||
|
|
||||||
|
import android.app.AppOpsManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.pm.ApplicationInfo;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.graphics.drawable.Drawable;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.os.UserHandle;
|
||||||
|
import android.support.v14.preference.PreferenceFragment;
|
||||||
|
import android.support.v14.preference.SwitchPreference;
|
||||||
|
import android.support.v7.preference.CheckBoxPreference;
|
||||||
|
import android.support.v7.preference.Preference;
|
||||||
|
import android.support.v7.preference.PreferenceGroup;
|
||||||
|
import android.util.IconDrawableFactory;
|
||||||
|
|
||||||
|
import com.android.internal.annotations.VisibleForTesting;
|
||||||
|
import com.android.internal.logging.nano.MetricsProto;
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.SettingsActivity;
|
||||||
|
import com.android.settings.Utils;
|
||||||
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
|
import com.android.settings.fuelgauge.anomaly.Anomaly;
|
||||||
|
import com.android.settings.fuelgauge.anomaly.AnomalyDialogFragment;
|
||||||
|
import com.android.settings.fuelgauge.anomaly.AnomalyPreference;
|
||||||
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fragment to show a list of anomaly apps, where user could handle these anomalies
|
||||||
|
*/
|
||||||
|
public class RestrictedAppDetails extends DashboardFragment {
|
||||||
|
|
||||||
|
public static final String TAG = "RestrictedAppDetails";
|
||||||
|
|
||||||
|
private static final String EXTRA_PACKAGE_OPS_LIST = "package_ops_list";
|
||||||
|
private static final String KEY_PREF_RESTRICTED_APP_LIST = "restrict_app_list";
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
List<AppOpsManager.PackageOps> mPackageOpsList;
|
||||||
|
@VisibleForTesting
|
||||||
|
IconDrawableFactory mIconDrawableFactory;
|
||||||
|
@VisibleForTesting
|
||||||
|
PreferenceGroup mRestrictedAppListGroup;
|
||||||
|
@VisibleForTesting
|
||||||
|
BatteryUtils mBatteryUtils;
|
||||||
|
@VisibleForTesting
|
||||||
|
PackageManager mPackageManager;
|
||||||
|
|
||||||
|
public static void startRestrictedAppDetails(SettingsActivity caller,
|
||||||
|
PreferenceFragment fragment, List<AppOpsManager.PackageOps> packageOpsList) {
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putParcelableList(EXTRA_PACKAGE_OPS_LIST, packageOpsList);
|
||||||
|
|
||||||
|
caller.startPreferencePanelAsUser(fragment, RestrictedAppDetails.class.getName(), args,
|
||||||
|
R.string.restricted_app_title, null /* titleText */,
|
||||||
|
new UserHandle(UserHandle.myUserId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle icicle) {
|
||||||
|
super.onCreate(icicle);
|
||||||
|
final Context context = getContext();
|
||||||
|
|
||||||
|
mRestrictedAppListGroup = (PreferenceGroup) findPreference(KEY_PREF_RESTRICTED_APP_LIST);
|
||||||
|
mPackageOpsList = getArguments().getParcelableArrayList(EXTRA_PACKAGE_OPS_LIST);
|
||||||
|
mPackageManager = context.getPackageManager();
|
||||||
|
mIconDrawableFactory = IconDrawableFactory.newInstance(context);
|
||||||
|
mBatteryUtils = BatteryUtils.getInstance(context);
|
||||||
|
|
||||||
|
refreshUi();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceTreeClick(Preference preference) {
|
||||||
|
|
||||||
|
return super.onPreferenceTreeClick(preference);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getLogTag() {
|
||||||
|
return TAG;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int getPreferenceScreenResId() {
|
||||||
|
return R.xml.restricted_apps_detail;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMetricsCategory() {
|
||||||
|
return MetricsProto.MetricsEvent.FUELGAUGE_RESTRICTED_APP_DETAILS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
void refreshUi() {
|
||||||
|
mRestrictedAppListGroup.removeAll();
|
||||||
|
final Context context = getPrefContext();
|
||||||
|
|
||||||
|
for (int i = 0, size = mPackageOpsList.size(); i < size; i++) {
|
||||||
|
final CheckBoxPreference checkBoxPreference = new CheckBoxPreference(context);
|
||||||
|
final AppOpsManager.PackageOps packageOps = mPackageOpsList.get(i);
|
||||||
|
try {
|
||||||
|
final ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
|
||||||
|
packageOps.getPackageName(), 0 /* flags */);
|
||||||
|
checkBoxPreference.setChecked(true);
|
||||||
|
checkBoxPreference.setTitle(mPackageManager.getApplicationLabel(applicationInfo));
|
||||||
|
checkBoxPreference.setKey(packageOps.getPackageName());
|
||||||
|
checkBoxPreference.setOnPreferenceChangeListener((pref, value) -> {
|
||||||
|
// change the toggle
|
||||||
|
final int mode = (Boolean) value ? AppOpsManager.MODE_IGNORED
|
||||||
|
: AppOpsManager.MODE_ALLOWED;
|
||||||
|
final String packageName = pref.getKey();
|
||||||
|
final int uid = mBatteryUtils.getPackageUid(packageName);
|
||||||
|
mBatteryUtils.setForceAppStandby(uid, packageName, mode);
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
mRestrictedAppListGroup.addPreference(checkBoxPreference);
|
||||||
|
} catch (PackageManager.NameNotFoundException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@@ -19,9 +19,11 @@ package com.android.settings.fuelgauge;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.provider.SearchIndexableResource;
|
import android.provider.SearchIndexableResource;
|
||||||
|
import android.support.v14.preference.PreferenceFragment;
|
||||||
|
|
||||||
import com.android.internal.logging.nano.MetricsProto;
|
import com.android.internal.logging.nano.MetricsProto;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.SettingsActivity;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
import com.android.settingslib.core.AbstractPreferenceController;
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
@@ -63,14 +65,20 @@ public class SmartBatterySettings extends DashboardFragment {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||||
return buildPreferenceControllers(context);
|
return buildPreferenceControllers(context, (SettingsActivity) getActivity(), this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<AbstractPreferenceController> buildPreferenceControllers(
|
private static List<AbstractPreferenceController> buildPreferenceControllers(
|
||||||
Context context) {
|
Context context, SettingsActivity settingsActivity, PreferenceFragment fragment) {
|
||||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||||
controllers.add(new SmartBatteryPreferenceController(context));
|
controllers.add(new SmartBatteryPreferenceController(context));
|
||||||
controllers.add(new RestrictAppPreferenceController(context));
|
if (settingsActivity != null && fragment != null) {
|
||||||
|
controllers.add(
|
||||||
|
new RestrictAppPreferenceController(settingsActivity, fragment));
|
||||||
|
} else {
|
||||||
|
controllers.add(new RestrictAppPreferenceController(context));
|
||||||
|
}
|
||||||
|
|
||||||
return controllers;
|
return controllers;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,7 +100,7 @@ public class SmartBatterySettings extends DashboardFragment {
|
|||||||
@Override
|
@Override
|
||||||
public List<AbstractPreferenceController> getPreferenceControllers(
|
public List<AbstractPreferenceController> getPreferenceControllers(
|
||||||
Context context) {
|
Context context) {
|
||||||
return buildPreferenceControllers(context);
|
return buildPreferenceControllers(context, null, null);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@@ -24,3 +24,4 @@ com.android.settings.wifi.tether.WifiTetherSettings
|
|||||||
com.android.settings.wifi.SavedAccessPointsWifiSettings
|
com.android.settings.wifi.SavedAccessPointsWifiSettings
|
||||||
com.android.settings.notification.ZenModeEventRuleSettings
|
com.android.settings.notification.ZenModeEventRuleSettings
|
||||||
com.android.settings.notification.ZenModeScheduleRuleSettings
|
com.android.settings.notification.ZenModeScheduleRuleSettings
|
||||||
|
com.android.settings.fuelgauge.RestrictedAppDetails
|
||||||
|
@@ -18,6 +18,10 @@ package com.android.settings.fuelgauge;
|
|||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Matchers.any;
|
||||||
|
import static org.mockito.Matchers.anyInt;
|
||||||
|
import static org.mockito.Matchers.anyString;
|
||||||
|
import static org.mockito.Mockito.doNothing;
|
||||||
import static org.mockito.Mockito.never;
|
import static org.mockito.Mockito.never;
|
||||||
import static org.mockito.Mockito.spy;
|
import static org.mockito.Mockito.spy;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
@@ -38,6 +42,7 @@ import android.widget.Button;
|
|||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.TestConfig;
|
import com.android.settings.TestConfig;
|
||||||
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||||
import com.android.settings.testutils.shadow.ShadowFragment;
|
import com.android.settings.testutils.shadow.ShadowFragment;
|
||||||
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
|
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
|
||||||
@@ -94,12 +99,14 @@ public class BackgroundActivityPreferenceControllerTest {
|
|||||||
private BackgroundActivityPreferenceController mController;
|
private BackgroundActivityPreferenceController mController;
|
||||||
private SwitchPreference mPreference;
|
private SwitchPreference mPreference;
|
||||||
private Context mShadowContext;
|
private Context mShadowContext;
|
||||||
|
private BatteryUtils mBatteryUtils;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
|
|
||||||
mShadowContext = RuntimeEnvironment.application;
|
mShadowContext = RuntimeEnvironment.application;
|
||||||
|
FakeFeatureFactory.setupForTest();
|
||||||
when(mContext.getPackageManager()).thenReturn(mPackageManager);
|
when(mContext.getPackageManager()).thenReturn(mPackageManager);
|
||||||
when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
|
when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
|
||||||
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
|
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
|
||||||
@@ -115,21 +122,22 @@ public class BackgroundActivityPreferenceControllerTest {
|
|||||||
mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
|
mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
|
||||||
mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
|
mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
|
||||||
|
|
||||||
|
mBatteryUtils = spy(new BatteryUtils(mShadowContext));
|
||||||
|
doNothing().when(mBatteryUtils).setForceAppStandby(anyInt(), anyString(), anyInt());
|
||||||
|
|
||||||
mPreference = new SwitchPreference(mShadowContext);
|
mPreference = new SwitchPreference(mShadowContext);
|
||||||
mController = spy(new BackgroundActivityPreferenceController(
|
mController = spy(new BackgroundActivityPreferenceController(
|
||||||
mContext, mFragment, UID_LOW_SDK, LOW_SDK_PACKAGE, mPowerWhitelistBackend));
|
mContext, mFragment, UID_LOW_SDK, LOW_SDK_PACKAGE, mPowerWhitelistBackend));
|
||||||
mController.mDpm = mDevicePolicyManagerWrapper;
|
mController.mDpm = mDevicePolicyManagerWrapper;
|
||||||
|
mController.mBatteryUtils = mBatteryUtils;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testOnPreferenceChange_TurnOnCheck_MethodInvoked() {
|
public void testOnPreferenceChange_TurnOnCheck_MethodInvoked() {
|
||||||
mController.onPreferenceChange(mPreference, true);
|
mController.onPreferenceChange(mPreference, true);
|
||||||
|
|
||||||
verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_LOW_SDK,
|
verify(mBatteryUtils).setForceAppStandby(UID_LOW_SDK, LOW_SDK_PACKAGE,
|
||||||
LOW_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
|
AppOpsManager.MODE_ALLOWED);
|
||||||
verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
|
|
||||||
LOW_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
|
|
||||||
|
|
||||||
assertThat(mPreference.getSummary())
|
assertThat(mPreference.getSummary())
|
||||||
.isEqualTo(mShadowContext.getText(R.string.background_activity_summary_on));
|
.isEqualTo(mShadowContext.getText(R.string.background_activity_summary_on));
|
||||||
}
|
}
|
||||||
@@ -138,11 +146,12 @@ public class BackgroundActivityPreferenceControllerTest {
|
|||||||
public void testOnPreferenceChange_TurnOnCheckHighSDK_MethodInvoked() {
|
public void testOnPreferenceChange_TurnOnCheckHighSDK_MethodInvoked() {
|
||||||
mController = new BackgroundActivityPreferenceController(mContext, mFragment, UID_HIGH_SDK,
|
mController = new BackgroundActivityPreferenceController(mContext, mFragment, UID_HIGH_SDK,
|
||||||
HIGH_SDK_PACKAGE, mPowerWhitelistBackend);
|
HIGH_SDK_PACKAGE, mPowerWhitelistBackend);
|
||||||
|
mController.mBatteryUtils = mBatteryUtils;
|
||||||
|
|
||||||
mController.onPreferenceChange(mPreference, true);
|
mController.onPreferenceChange(mPreference, true);
|
||||||
verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_HIGH_SDK,
|
|
||||||
HIGH_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
|
verify(mBatteryUtils).setForceAppStandby(UID_HIGH_SDK, HIGH_SDK_PACKAGE,
|
||||||
verify(mAppOpsManager, never()).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID_HIGH_SDK,
|
AppOpsManager.MODE_ALLOWED);
|
||||||
HIGH_SDK_PACKAGE, AppOpsManager.MODE_ALLOWED);
|
|
||||||
assertThat(mPreference.getSummary())
|
assertThat(mPreference.getSummary())
|
||||||
.isEqualTo(mShadowContext.getText(R.string.background_activity_summary_on));
|
.isEqualTo(mShadowContext.getText(R.string.background_activity_summary_on));
|
||||||
}
|
}
|
||||||
@@ -216,16 +225,6 @@ public class BackgroundActivityPreferenceControllerTest {
|
|||||||
assertThat(mPreference.getSummary()).isEqualTo(expectedSummary);
|
assertThat(mPreference.getSummary()).isEqualTo(expectedSummary);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testIsLegacyApp_SdkLowerThanO_ReturnTrue() {
|
|
||||||
assertThat(mController.isLegacyApp(LOW_SDK_PACKAGE)).isTrue();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testIsLegacyApp_SdkLargerOrEqualThanO_ReturnFalse() {
|
|
||||||
assertThat(mController.isLegacyApp(HIGH_SDK_PACKAGE)).isFalse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testIsAvailable_ReturnTrue() {
|
public void testIsAvailable_ReturnTrue() {
|
||||||
assertThat(mController.isAvailable()).isTrue();
|
assertThat(mController.isAvailable()).isTrue();
|
||||||
|
@@ -103,6 +103,8 @@ public class BatteryUtilsTest {
|
|||||||
private static final double PRECISION = 0.001;
|
private static final double PRECISION = 0.001;
|
||||||
private static final int SDK_VERSION = Build.VERSION_CODES.L;
|
private static final int SDK_VERSION = Build.VERSION_CODES.L;
|
||||||
private static final String PACKAGE_NAME = "com.android.app";
|
private static final String PACKAGE_NAME = "com.android.app";
|
||||||
|
private static final String HIGH_SDK_PACKAGE = "com.android.package.high";
|
||||||
|
private static final String LOW_SDK_PACKAGE = "com.android.package.low";
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private BatteryStats.Uid mUid;
|
private BatteryStats.Uid mUid;
|
||||||
@@ -137,16 +139,18 @@ public class BatteryUtilsTest {
|
|||||||
@Mock
|
@Mock
|
||||||
private ApplicationInfo mApplicationInfo;
|
private ApplicationInfo mApplicationInfo;
|
||||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||||
private Context mContext;
|
|
||||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
|
||||||
private BatteryStatsHelper mBatteryStatsHelper;
|
private BatteryStatsHelper mBatteryStatsHelper;
|
||||||
|
@Mock
|
||||||
|
private ApplicationInfo mHighApplicationInfo;
|
||||||
|
@Mock
|
||||||
|
private ApplicationInfo mLowApplicationInfo;
|
||||||
private BatteryUtils mBatteryUtils;
|
private BatteryUtils mBatteryUtils;
|
||||||
private FakeFeatureFactory mFeatureFactory;
|
private FakeFeatureFactory mFeatureFactory;
|
||||||
private PowerUsageFeatureProvider mProvider;
|
private PowerUsageFeatureProvider mProvider;
|
||||||
private List<BatterySipper> mUsageList;
|
private List<BatterySipper> mUsageList;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() throws PackageManager.NameNotFoundException {
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
|
|
||||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||||
@@ -165,6 +169,14 @@ public class BatteryUtilsTest {
|
|||||||
when(mBatteryStatsHelper.getStats().computeBatteryRealtime(anyLong(), anyInt())).thenReturn(
|
when(mBatteryStatsHelper.getStats().computeBatteryRealtime(anyLong(), anyInt())).thenReturn(
|
||||||
TIME_SINCE_LAST_FULL_CHARGE_US);
|
TIME_SINCE_LAST_FULL_CHARGE_US);
|
||||||
|
|
||||||
|
when(mPackageManager.getApplicationInfo(HIGH_SDK_PACKAGE, PackageManager.GET_META_DATA))
|
||||||
|
.thenReturn(mHighApplicationInfo);
|
||||||
|
when(mPackageManager.getApplicationInfo(LOW_SDK_PACKAGE, PackageManager.GET_META_DATA))
|
||||||
|
.thenReturn(mLowApplicationInfo);
|
||||||
|
mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
|
||||||
|
mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
|
||||||
|
|
||||||
|
|
||||||
mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
|
mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
|
||||||
mNormalBatterySipper.totalPowerMah = TOTAL_BATTERY_USAGE;
|
mNormalBatterySipper.totalPowerMah = TOTAL_BATTERY_USAGE;
|
||||||
|
|
||||||
@@ -501,4 +513,14 @@ public class BatteryUtilsTest {
|
|||||||
assertThat(mBatteryUtils.calculateScreenUsageTime(mBatteryStatsHelper)).isEqualTo(
|
assertThat(mBatteryUtils.calculateScreenUsageTime(mBatteryStatsHelper)).isEqualTo(
|
||||||
TIME_EXPECTED_FOREGROUND);
|
TIME_EXPECTED_FOREGROUND);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testIsLegacyApp_SdkLowerThanO_ReturnTrue() {
|
||||||
|
assertThat(mBatteryUtils.isLegacyApp(LOW_SDK_PACKAGE)).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testIsLegacyApp_SdkLargerOrEqualThanO_ReturnFalse() {
|
||||||
|
assertThat(mBatteryUtils.isLegacyApp(HIGH_SDK_PACKAGE)).isFalse();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -19,13 +19,18 @@ package com.android.settings.fuelgauge;
|
|||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
import static org.mockito.Matchers.any;
|
import static org.mockito.Matchers.any;
|
||||||
|
import static org.mockito.Matchers.eq;
|
||||||
import static org.mockito.Mockito.doReturn;
|
import static org.mockito.Mockito.doReturn;
|
||||||
import static org.mockito.Mockito.spy;
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
|
||||||
import android.app.AppOpsManager;
|
import android.app.AppOpsManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.support.v14.preference.PreferenceFragment;
|
||||||
import android.support.v7.preference.Preference;
|
import android.support.v7.preference.Preference;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.SettingsActivity;
|
||||||
import com.android.settings.TestConfig;
|
import com.android.settings.TestConfig;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
@@ -48,6 +53,10 @@ public class RestrictAppPreferenceControllerTest {
|
|||||||
private AppOpsManager mAppOpsManager;
|
private AppOpsManager mAppOpsManager;
|
||||||
@Mock
|
@Mock
|
||||||
private AppOpsManager.PackageOps mPackageOps;
|
private AppOpsManager.PackageOps mPackageOps;
|
||||||
|
@Mock
|
||||||
|
private SettingsActivity mSettingsActivity;
|
||||||
|
@Mock
|
||||||
|
private PreferenceFragment mFragment;
|
||||||
private List<AppOpsManager.PackageOps> mPackageOpsList;
|
private List<AppOpsManager.PackageOps> mPackageOpsList;
|
||||||
private RestrictAppPreferenceController mRestrictAppPreferenceController;
|
private RestrictAppPreferenceController mRestrictAppPreferenceController;
|
||||||
private Preference mPreference;
|
private Preference mPreference;
|
||||||
@@ -59,9 +68,12 @@ public class RestrictAppPreferenceControllerTest {
|
|||||||
|
|
||||||
mContext = spy(RuntimeEnvironment.application);
|
mContext = spy(RuntimeEnvironment.application);
|
||||||
doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
|
doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
|
||||||
mRestrictAppPreferenceController = new RestrictAppPreferenceController(mContext);
|
doReturn(mContext).when(mSettingsActivity).getApplicationContext();
|
||||||
|
mRestrictAppPreferenceController = new RestrictAppPreferenceController(mSettingsActivity,
|
||||||
|
mFragment);
|
||||||
mPackageOpsList = new ArrayList<>();
|
mPackageOpsList = new ArrayList<>();
|
||||||
mPreference = new Preference(mContext);
|
mPreference = new Preference(mContext);
|
||||||
|
mPreference.setKey(mRestrictAppPreferenceController.getPreferenceKey());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -85,4 +97,22 @@ public class RestrictAppPreferenceControllerTest {
|
|||||||
assertThat(mPreference.getSummary()).isEqualTo("2 apps");
|
assertThat(mPreference.getSummary()).isEqualTo("2 apps");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateState_zeroApp_disabled() {
|
||||||
|
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any());
|
||||||
|
|
||||||
|
mRestrictAppPreferenceController.updateState(mPreference);
|
||||||
|
|
||||||
|
assertThat(mPreference.isEnabled()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testHandlePreferenceTreeClick_startFragment() {
|
||||||
|
mRestrictAppPreferenceController.handlePreferenceTreeClick(mPreference);
|
||||||
|
|
||||||
|
verify(mSettingsActivity).startPreferencePanelAsUser(eq(mFragment),
|
||||||
|
eq(RestrictedAppDetails.class.getName()), any(), eq(R.string.restricted_app_title),
|
||||||
|
any(), any());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,91 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.fuelgauge;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
|
||||||
|
import android.app.AppOpsManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.pm.ApplicationInfo;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.support.v7.preference.Preference;
|
||||||
|
import android.support.v7.preference.PreferenceCategory;
|
||||||
|
import android.support.v7.preference.PreferenceManager;
|
||||||
|
|
||||||
|
import com.android.settings.TestConfig;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Answers;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||||
|
public class RestrictedAppDetailsTest {
|
||||||
|
private static final String PACKAGE_NAME = "com.android.app";
|
||||||
|
private static final String APP_NAME = "app";
|
||||||
|
private static final int UID = 1234;
|
||||||
|
@Mock
|
||||||
|
private PackageManager mPackageManager;
|
||||||
|
@Mock
|
||||||
|
private ApplicationInfo mApplicationInfo;
|
||||||
|
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||||
|
private PreferenceManager mPreferenceManager;
|
||||||
|
private RestrictedAppDetails mFragment;
|
||||||
|
private Context mContext;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
|
||||||
|
mContext = spy(RuntimeEnvironment.application);
|
||||||
|
mFragment = spy(new RestrictedAppDetails());
|
||||||
|
|
||||||
|
doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
|
||||||
|
doReturn(mContext).when(mPreferenceManager).getContext();
|
||||||
|
mFragment.mPackageManager = mPackageManager;
|
||||||
|
mFragment.mPackageOpsList = new ArrayList<>();
|
||||||
|
mFragment.mPackageOpsList.add(
|
||||||
|
new AppOpsManager.PackageOps(PACKAGE_NAME, UID, null /* entries */));
|
||||||
|
mFragment.mRestrictedAppListGroup = spy(new PreferenceCategory(mContext));
|
||||||
|
doReturn(mPreferenceManager).when(mFragment.mRestrictedAppListGroup).getPreferenceManager();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testRefreshUi_displayPreference() throws Exception {
|
||||||
|
doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME, 0);
|
||||||
|
doReturn(APP_NAME).when(mPackageManager).getApplicationLabel(mApplicationInfo);
|
||||||
|
|
||||||
|
mFragment.refreshUi();
|
||||||
|
|
||||||
|
assertThat(mFragment.mRestrictedAppListGroup.getPreferenceCount()).isEqualTo(1);
|
||||||
|
final Preference preference = mFragment.mRestrictedAppListGroup.getPreference(0);
|
||||||
|
assertThat(preference.getKey()).isEqualTo(PACKAGE_NAME);
|
||||||
|
assertThat(preference.getTitle()).isEqualTo(APP_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Reference in New Issue
Block a user