Merge "Fix memory leaks in Settings" (db6d667e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/BatteryUtils.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -24,18 +24,12 @@ import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.os.BatteryStats;
		import android.os.Bundle;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Process;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.os.UserManager;
		import androidx.annotation.IntDef;
		import androidx.annotation.Nullable;
		import androidx.annotation.StringRes;
		import androidx.annotation.VisibleForTesting;
		import androidx.annotation.WorkerThread;
		import android.text.TextUtils;
		import android.text.format.DateUtils;
		import android.util.Log;
		import android.util.SparseLongArray;
		@@ -48,7 +42,6 @@ import com.android.settings.fuelgauge.anomaly.Anomaly;
		import com.android.settings.fuelgauge.batterytip.AnomalyInfo;
		import com.android.settings.fuelgauge.batterytip.StatsManagerConfig;
		import com.android.settings.overlay.FeatureFactory;

		import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
		import com.android.settingslib.utils.PowerUtil;

		@@ -58,6 +51,12 @@ import java.util.Collections;
		import java.util.Comparator;
		import java.util.List;

		import androidx.annotation.IntDef;
		import androidx.annotation.Nullable;
		import androidx.annotation.StringRes;
		import androidx.annotation.VisibleForTesting;
		import androidx.annotation.WorkerThread;

		/**
		* Utils for battery operation
		*/
		@@ -93,14 +92,14 @@ public class BatteryUtils {

		public static BatteryUtils getInstance(Context context) {
		if (sInstance == null \|\| sInstance.isDataCorrupted()) {
		sInstance = new BatteryUtils(context);
		sInstance = new BatteryUtils(context.getApplicationContext());
		}
		return sInstance;
		}

		@VisibleForTesting
		BatteryUtils(Context context) {
		mContext = context.getApplicationContext();
		mContext = context;
		mPackageManager = context.getPackageManager();
		mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
		mPowerUsageFeatureProvider = FeatureFactory.getFactory(

src/com/android/settings/overlay/FeatureFactoryImpl.java

+21 −14

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.net.ConnectivityManager;
		import android.os.UserManager;
		import androidx.annotation.Keep;

		import com.android.settings.accounts.AccountFeatureProvider;
		import com.android.settings.accounts.AccountFeatureProviderImpl;
		@@ -54,6 +53,8 @@ import com.android.settings.users.UserFeatureProvider;
		import com.android.settings.users.UserFeatureProviderImpl;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

		import androidx.annotation.Keep;

		/**
		* {@link FeatureFactory} implementation for AOSP Settings.
		*/
		@@ -93,7 +94,8 @@ public class FeatureFactoryImpl extends FeatureFactory {
		@Override
		public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
		if (mPowerUsageFeatureProvider == null) {
		mPowerUsageFeatureProvider = new PowerUsageFeatureProviderImpl(context);
		mPowerUsageFeatureProvider = new PowerUsageFeatureProviderImpl(
		context.getApplicationContext());
		}
		return mPowerUsageFeatureProvider;
		}
		@@ -101,7 +103,8 @@ public class FeatureFactoryImpl extends FeatureFactory {
		@Override
		public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
		if (mDashboardFeatureProvider == null) {
		mDashboardFeatureProvider = new DashboardFeatureProviderImpl(context);
		mDashboardFeatureProvider = new DashboardFeatureProviderImpl(
		context.getApplicationContext());
		}
		return mDashboardFeatureProvider;
		}
		@@ -117,10 +120,11 @@ public class FeatureFactoryImpl extends FeatureFactory {
		@Override
		public ApplicationFeatureProvider getApplicationFeatureProvider(Context context) {
		if (mApplicationFeatureProvider == null) {
		mApplicationFeatureProvider = new ApplicationFeatureProviderImpl(context,
		context.getPackageManager(),
		final Context appContext = context.getApplicationContext();
		mApplicationFeatureProvider = new ApplicationFeatureProviderImpl(appContext,
		appContext.getPackageManager(),
		AppGlobals.getPackageManager(),
		(DevicePolicyManager) context
		(DevicePolicyManager) appContext
		.getSystemService(Context.DEVICE_POLICY_SERVICE));
		}
		return mApplicationFeatureProvider;
		@@ -137,12 +141,14 @@ public class FeatureFactoryImpl extends FeatureFactory {
		@Override
		public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
		if (mEnterprisePrivacyFeatureProvider == null) {
		mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(context,
		(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE),
		context.getPackageManager(),
		UserManager.get(context),
		(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE),
		context.getResources());
		final Context appContext = context.getApplicationContext();
		mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(appContext,
		(DevicePolicyManager) appContext.getSystemService(
		Context.DEVICE_POLICY_SERVICE),
		appContext.getPackageManager(),
		UserManager.get(appContext),
		(ConnectivityManager) appContext.getSystemService(Context.CONNECTIVITY_SERVICE),
		appContext.getResources());
		}
		return mEnterprisePrivacyFeatureProvider;
		}
		@@ -171,7 +177,8 @@ public class FeatureFactoryImpl extends FeatureFactory {
		@Override
		public SuggestionFeatureProvider getSuggestionFeatureProvider(Context context) {
		if (mSuggestionFeatureProvider == null) {
		mSuggestionFeatureProvider = new SuggestionFeatureProviderImpl(context);
		mSuggestionFeatureProvider = new SuggestionFeatureProviderImpl(
		context.getApplicationContext());
		}
		return mSuggestionFeatureProvider;
		}
		@@ -179,7 +186,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
		@Override
		public UserFeatureProvider getUserFeatureProvider(Context context) {
		if (mUserFeatureProvider == null) {
		mUserFeatureProvider = new UserFeatureProviderImpl(context);
		mUserFeatureProvider = new UserFeatureProviderImpl(context.getApplicationContext());
		}
		return mUserFeatureProvider;
		}

src/com/android/settings/sound/AudioSwitchPreferenceController.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -37,9 +37,6 @@ import android.media.MediaRouter;
		import android.media.MediaRouter.Callback;
		import android.os.Handler;
		import android.os.Looper;
		import androidx.preference.ListPreference;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;
		import android.text.TextUtils;
		import android.util.FeatureFlagUtils;
		import android.util.Log;
		@@ -64,6 +61,10 @@ import java.util.List;
		import java.util.concurrent.ExecutionException;
		import java.util.concurrent.FutureTask;

		import androidx.preference.ListPreference;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		/**
		* Abstract class for audio switcher controller to notify subclass
		* updating the current status of switcher entry. Subclasses must overwrite
		@@ -74,7 +75,7 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
		implements Preference.OnPreferenceChangeListener, BluetoothCallback,
		LifecycleObserver, OnStart, OnStop {

		private static final String TAG = "AudioSwitchPreferenceController";
		private static final String TAG = "AudioSwitchPrefCtrl";
		private static final int INVALID_INDEX = -1;

		protected final List<BluetoothDevice> mConnectedDevices;

tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.os.Build;
		import android.os.UserManager;
		import androidx.preference.Preference;

		import com.android.settings.R;
		import com.android.settings.testutils.FakeFeatureFactory;
		@@ -50,6 +49,8 @@ import org.robolectric.RobolectricTestRunner;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		import androidx.preference.Preference;

		@RunWith(RobolectricTestRunner.class)
		@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowFragment.class})
		public class BackgroundActivityPreferenceControllerTest {
		@@ -89,6 +90,7 @@ public class BackgroundActivityPreferenceControllerTest {

		mShadowContext = RuntimeEnvironment.application;
		FakeFeatureFactory.setupForTest();
		when(mContext.getApplicationContext()).thenReturn(mContext);
		when(mContext.getPackageManager()).thenReturn(mPackageManager);
		when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
		when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);