Merge "Listener to tether state change on Network & internet page." into oc-dev am: 1dead24890

am: be520a5f34

Change-Id: I31036a30605036e957b421727833b3a9830e4584
This commit is contained in:
Doris Ling
2017-05-25 02:37:59 +00:00
committed by android-build-merger
2 changed files with 58 additions and 0 deletions

View File

@@ -18,7 +18,10 @@ package com.android.settings.network;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.database.ContentObserver;
import android.net.ConnectivityManager;
import android.net.Uri;
@@ -67,6 +70,7 @@ public class TetherPreferenceController extends PreferenceController
private SettingObserver mAirplaneModeObserver;
private Preference mPreference;
private TetherBroadcastReceiver mTetherReceiver;
@VisibleForTesting(otherwise = VisibleForTesting.NONE)
TetherPreferenceController() {
@@ -131,6 +135,11 @@ public class TetherPreferenceController extends PreferenceController
if (mAirplaneModeObserver == null) {
mAirplaneModeObserver = new SettingObserver();
}
if (mTetherReceiver == null) {
mTetherReceiver = new TetherBroadcastReceiver();
}
mContext.registerReceiver(
mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
mContext.getContentResolver()
.registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver);
}
@@ -140,6 +149,9 @@ public class TetherPreferenceController extends PreferenceController
if (mAirplaneModeObserver != null) {
mContext.getContentResolver().unregisterContentObserver(mAirplaneModeObserver);
}
if (mTetherReceiver != null) {
mContext.unregisterReceiver(mTetherReceiver);
}
}
@Override
@@ -238,4 +250,14 @@ public class TetherPreferenceController extends PreferenceController
}
}
}
@VisibleForTesting
class TetherBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
updateSummary();
}
}
}