diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 02:00:43 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 15:44:26 +0000 |
| commit | 90852d4675c9b7df6faf036efb7fe73b5f816293 (patch) | |
| tree | 18ea2755ab5ea68669a7951d5a07daadc4870b0a /src/com/android/settings/HotspotOffReceiver.java | |
| parent | 3dbac3fff036f5a464f6322200c59f9934ebf610 (diff) | |
| parent | 310423e73156dab1c7c8f50dc67fdbc326cd37f7 (diff) | |
| download | packages_apps_Settings-90852d4675c9b7df6faf036efb7fe73b5f816293.tar.gz packages_apps_Settings-90852d4675c9b7df6faf036efb7fe73b5f816293.tar.bz2 packages_apps_Settings-90852d4675c9b7df6faf036efb7fe73b5f816293.zip | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-zh-rCN/strings.xml
res/values/bools.xml
res/values/strings.xml
res/xml/development_prefs.xml
src/com/android/settings/DevelopmentSettings.java
src/com/android/settings/DeviceInfoSettings.java
src/com/android/settings/DisplaySettings.java
Change-Id: I9fd9e793cf6097d950f8a1e30771c8bdf5067906
Diffstat (limited to 'src/com/android/settings/HotspotOffReceiver.java')
| -rw-r--r-- | src/com/android/settings/HotspotOffReceiver.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/settings/HotspotOffReceiver.java b/src/com/android/settings/HotspotOffReceiver.java index 06ced1f62..f3c3feede 100644 --- a/src/com/android/settings/HotspotOffReceiver.java +++ b/src/com/android/settings/HotspotOffReceiver.java @@ -5,6 +5,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.net.wifi.WifiManager; +import android.util.Log; import com.android.settingslib.TetherUtil; @@ -14,11 +15,15 @@ import com.android.settingslib.TetherUtil; */ public class HotspotOffReceiver extends BroadcastReceiver { + private static final String TAG = "HotspotOffReceiver"; + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + @Override public void onReceive(Context context, Intent intent) { if (WifiManager.WIFI_AP_STATE_CHANGED_ACTION.equals(intent.getAction())) { WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); if (wifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_DISABLED) { + if (DEBUG) Log.d(TAG, "TetherService.cancelRecheckAlarmIfNecessary called"); // The hotspot has been turned off, we don't need to recheck tethering. TetherService.cancelRecheckAlarmIfNecessary(context, TetherUtil.TETHERING_WIFI); } |