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

Merge "Refactor tether logic for reuse" into oc-mr1-dev am: 705a9e7e85

Browse Source 
am: 401156da7d

Change-Id: I5bb7958452aa24c1b75dfb63b4a5a86a3c7373cc
This commit is contained in:
Salvador Martinez
2017-08-08 19:06:03 +00:00
committed by android-build-merger
parent 0372e3f258 401156da7d
commit 9c6b2fabb5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,8 +88,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
public TetherPreferenceController(Context context, Lifecycle lifecycle) { public TetherPreferenceController(Context context, Lifecycle lifecycle) {
super(context); super(context);
mBluetoothPan = new AtomicReference<>(); mBluetoothPan = new AtomicReference<>();
mAdminDisallowedTetherConfig = checkIfRestrictionEnforced( mAdminDisallowedTetherConfig = isTetherConfigDisallowed(context);
mContext, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null;
mConnectivityManager = mConnectivityManager =
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -170,6 +169,11 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
} }
} }
public static boolean isTetherConfigDisallowed(Context context) {
return checkIfRestrictionEnforced(
context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null;
}
@VisibleForTesting @VisibleForTesting
void updateSummary() { void updateSummary() {
if (mPreference == null) { if (mPreference == null) {