Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev (5b67e453) · Commits · e / os / android_packages_apps_Settings

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ public class AirplaneModePreferenceController extends PreferenceController

		private final Fragment mFragment;
		private final MetricsFeatureProvider mMetricsFeatureProvider;
		private final PackageManager mPackageManager;
		private AirplaneModeEnabler mAirplaneModeEnabler;
		private SwitchPreference mAirplaneModePreference;

		@@ -53,7 +52,6 @@ public class AirplaneModePreferenceController extends PreferenceController
		public AirplaneModePreferenceController(Context context, Fragment hostFragment) {
		super(context);
		mFragment = hostFragment;
		mPackageManager = context.getPackageManager();
		mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
		}

		@@ -88,7 +86,11 @@ public class AirplaneModePreferenceController extends PreferenceController

		@Override
		public boolean isAvailable() {
		return !mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION);
		return isAvailable(mContext);
		}

		public static boolean isAvailable(Context context) {
		return !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION);
		}

		@Override

+3 −4

Original line number	Diff line number	Diff line
		@@ -39,18 +39,17 @@ public class MobileNetworkPreferenceController extends PreferenceController impl

		private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";

		private final UserManager mUserManager;
		private final boolean mIsSecondaryUser;
		private final TelephonyManager mTelephonyManager;
		private Preference mPreference;
		@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
		@VisibleForTesting
		PhoneStateListener mPhoneStateListener;

		public MobileNetworkPreferenceController(Context context) {
		super(context);
		mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
		UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
		mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
		mIsSecondaryUser = !mUserManager.isAdminUser();
		mIsSecondaryUser = !userManager.isAdminUser();
		}

		@Override