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: I7694793ff006a2c677511563b69e411b6ed284f2
This commit is contained in:
Andrew Sapperstein
2017-07-25 23:30:32 +00:00
committed by android-build-merger
parent f854a08c3e 5b67e453bf
commit 1bb9b966ff
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

@@ -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

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

@@ -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