PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev

Browse Source 
am: 5b67e453bf

Change-Id: I7454c59679ad05711f8923b35138fd27b6d36061
This commit is contained in:
Andrew Sapperstein
2017-07-25 23:34:03 +00:00
committed by android-build-merger
parent 205857726a 5b67e453bf
commit fba88cc7c0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -46,7 +46,6 @@ public class AirplaneModePreferenceController extends AbstractPreferenceControll
private final Fragment mFragment; private final Fragment mFragment;
private final MetricsFeatureProvider mMetricsFeatureProvider; private final MetricsFeatureProvider mMetricsFeatureProvider;
private final PackageManager mPackageManager;
private AirplaneModeEnabler mAirplaneModeEnabler; private AirplaneModeEnabler mAirplaneModeEnabler;
private SwitchPreference mAirplaneModePreference; private SwitchPreference mAirplaneModePreference;
@@ -54,7 +53,6 @@ public class AirplaneModePreferenceController extends AbstractPreferenceControll
public AirplaneModePreferenceController(Context context, Fragment hostFragment) { public AirplaneModePreferenceController(Context context, Fragment hostFragment) {
super(context); super(context);
mFragment = hostFragment; mFragment = hostFragment;
mPackageManager = context.getPackageManager();
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
} }
@@ -89,7 +87,11 @@ public class AirplaneModePreferenceController extends AbstractPreferenceControll
@Override @Override
public boolean isAvailable() { 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 @Override

7
src/com/android/settings/network/MobileNetworkPreferenceController.java
View File

@@ -40,18 +40,17 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl
private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings"; private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
private final UserManager mUserManager;
private final boolean mIsSecondaryUser; private final boolean mIsSecondaryUser;
private final TelephonyManager mTelephonyManager; private final TelephonyManager mTelephonyManager;
private Preference mPreference; private Preference mPreference;
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) @VisibleForTesting
PhoneStateListener mPhoneStateListener; PhoneStateListener mPhoneStateListener;
public MobileNetworkPreferenceController(Context context) { public MobileNetworkPreferenceController(Context context) {
super(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); mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
mIsSecondaryUser = !mUserManager.isAdminUser(); mIsSecondaryUser = !userManager.isAdminUser();
} }
@Override @Override