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

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