Merge "Remove more wrappers" into pi-dev (483ad780) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ResetNetworkConfirm.java

+5 −8

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.settings;

		import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

		import android.app.AlertDialog;
		import android.bluetooth.BluetoothAdapter;
		import android.bluetooth.BluetoothManager;
		@@ -27,6 +29,7 @@ import android.net.Uri;
		import android.net.wifi.WifiManager;
		import android.os.AsyncTask;
		import android.os.Bundle;
		import android.os.RecoverySystem;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.support.annotation.VisibleForTesting;
		@@ -41,13 +44,9 @@ import android.widget.Toast;
		import com.android.ims.ImsManager;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
		import com.android.settings.wrapper.RecoverySystemWrapper;
		import com.android.settings.core.InstrumentedFragment;
		import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.utils.ThreadUtils;

		import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

		/**
		* Confirm and execute a reset of the network settings to a clean "just out of the box"
		@@ -65,7 +64,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
		private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		@VisibleForTesting boolean mEraseEsim;
		@VisibleForTesting EraseEsimAsyncTask mEraseEsimTask;
		@VisibleForTesting static RecoverySystemWrapper mRecoverySystem;

		/**
		* Async task used to erase all the eSIM profiles from the phone. If error happens during
		@@ -82,7 +80,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {

		@Override
		protected Boolean doInBackground(Void... params) {
		return mRecoverySystem.wipeEuiccData(mContext, mPackageName);
		return RecoverySystem.wipeEuiccData(mContext, mPackageName);
		}

		@Override
		@@ -218,7 +216,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		mEraseEsim = args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
		}
		mRecoverySystem = new RecoverySystemWrapper();
		}

		@Override

src/com/android/settings/applications/appinfo/PictureInPictureSettings.java

+1 −18

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import com.android.settings.R;
		import com.android.settings.applications.AppInfoBase;
		import com.android.settings.notification.EmptyTextSettings;
		import com.android.settings.widget.AppPreference;
		import com.android.settings.wrapper.ActivityInfoWrapper;
		import com.android.settings.wrapper.UserManagerWrapper;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		@@ -96,25 +95,9 @@ public class PictureInPictureSettings extends EmptyTextSettings {
		* @return true if the package has any activities that declare that they support
		* picture-in-picture.
		*/

		public static boolean checkPackageHasPictureInPictureActivities(String packageName,
		ActivityInfo[] activities) {
		ActivityInfoWrapper[] wrappedActivities = null;
		if (activities != null) {
		wrappedActivities = new ActivityInfoWrapper[activities.length];
		for (int i = 0; i < activities.length; i++) {
		wrappedActivities[i] = new ActivityInfoWrapper(activities[i]);
		}
		}
		return checkPackageHasPictureInPictureActivities(packageName, wrappedActivities);
		}

		/**
		* @return true if the package has any activities that declare that they support
		* picture-in-picture.
		*/
		@VisibleForTesting
		static boolean checkPackageHasPictureInPictureActivities(String packageName,
		ActivityInfoWrapper[] activities) {
		// Skip if it's in the ignored list
		if (IGNORE_PACKAGE_LIST.contains(packageName)) {
		return false;

src/com/android/settings/development/qstile/DevelopmentTiles.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.view.WindowManagerGlobal;
		import android.widget.Toast;

		import com.android.internal.app.LocalePicker;
		import com.android.settings.wrapper.IWindowManagerWrapper;
		import com.android.settingslib.development.SystemPropPoker;

		public abstract class DevelopmentTiles extends TileService {
		@@ -150,14 +149,13 @@ public abstract class DevelopmentTiles extends TileService {
		@VisibleForTesting
		static final int SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE = 1026;
		private IBinder mSurfaceFlinger;
		private IWindowManagerWrapper mWindowManager;
		private IWindowManager mWindowManager;
		private Toast mToast;

		@Override
		public void onCreate() {
		super.onCreate();
		mWindowManager = new IWindowManagerWrapper(WindowManagerGlobal
		.getWindowManagerService());
		mWindowManager = WindowManagerGlobal.getWindowManagerService();
		mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
		Context context = getApplicationContext();
		CharSequence text = "Trace files written to /data/misc/wmtrace";

src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java

+11 −18

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ import android.text.format.DateUtils;
		import android.util.KeyValueListParser;
		import android.util.Log;

		import com.android.settings.wrapper.KeyValueListParserWrapper;

		import java.util.Arrays;
		import java.util.Set;
		import java.util.stream.Collectors;
		@@ -118,37 +116,32 @@ public class AnomalyDetectionPolicy {
		*/
		public final long bluetoothScanThreshold;

		private final KeyValueListParserWrapper mParserWrapper;
		private final KeyValueListParser mParser;

		public AnomalyDetectionPolicy(Context context) {
		this(context, new KeyValueListParserWrapper(new KeyValueListParser(',')));
		}

		@VisibleForTesting
		AnomalyDetectionPolicy(Context context, KeyValueListParserWrapper parserWrapper) {
		mParserWrapper = parserWrapper;
		mParser = new KeyValueListParser(',');
		final String value = Settings.Global.getString(context.getContentResolver(),
		Settings.Global.ANOMALY_DETECTION_CONSTANTS);

		try {
		mParserWrapper.setString(value);
		mParser.setString(value);
		} catch (IllegalArgumentException e) {
		Log.e(TAG, "Bad anomaly detection constants");
		}

		anomalyDetectionEnabled =
		mParserWrapper.getBoolean(KEY_ANOMALY_DETECTION_ENABLED, false);
		mParser.getBoolean(KEY_ANOMALY_DETECTION_ENABLED, false);
		wakeLockDetectionEnabled =
		mParserWrapper.getBoolean(KEY_WAKELOCK_DETECTION_ENABLED,false);
		mParser.getBoolean(KEY_WAKELOCK_DETECTION_ENABLED,false);
		wakeupAlarmDetectionEnabled =
		mParserWrapper.getBoolean(KEY_WAKEUP_ALARM_DETECTION_ENABLED,false);
		bluetoothScanDetectionEnabled = mParserWrapper.getBoolean(
		mParser.getBoolean(KEY_WAKEUP_ALARM_DETECTION_ENABLED,false);
		bluetoothScanDetectionEnabled = mParser.getBoolean(
		KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
		wakeLockThreshold = mParserWrapper.getLong(KEY_WAKELOCK_THRESHOLD,
		wakeLockThreshold = mParser.getLong(KEY_WAKELOCK_THRESHOLD,
		DateUtils.HOUR_IN_MILLIS);
		wakeupAlarmThreshold = mParserWrapper.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 10);
		wakeupAlarmThreshold = mParser.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 10);
		wakeupBlacklistedTags = parseStringSet(KEY_WAKEUP_BLACKLISTED_TAGS, null);
		bluetoothScanThreshold = mParserWrapper.getLong(KEY_BLUETOOTH_SCAN_THRESHOLD,
		bluetoothScanThreshold = mParser.getLong(KEY_BLUETOOTH_SCAN_THRESHOLD,
		30 * DateUtils.MINUTE_IN_MILLIS);
		}

		@@ -170,7 +163,7 @@ public class AnomalyDetectionPolicy {
		}

		private Set<String> parseStringSet(final String key, final Set<String> defaultSet) {
		final String value = mParserWrapper.getString(key, null);
		final String value = mParser.getString(key, null);
		if (value != null) {
		return Arrays.stream(value.split(":"))
		.map(String::trim).map(Uri::decode).collect(Collectors.toSet());

src/com/android/settings/network/MobileNetworkPreferenceController.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import android.telephony.ServiceState;
		import android.telephony.TelephonyManager;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.wrapper.RestrictedLockUtilsWrapper;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.RestrictedPreference;
		import com.android.settingslib.Utils;
		import com.android.settingslib.core.AbstractPreferenceController;
		@@ -74,9 +74,8 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl
		}

		public boolean isUserRestricted() {
		final RestrictedLockUtilsWrapper wrapper = new RestrictedLockUtilsWrapper();
		return mIsSecondaryUser \|\|
		wrapper.hasBaseUserRestriction(
		RestrictedLockUtils.hasBaseUserRestriction(
		mContext,
		DISALLOW_CONFIG_MOBILE_NETWORKS,
		myUserId());