| commit | 93e742b58818b3c8130c6cf7ccaba2d0a77d3a72 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Tue Apr 19 15:19:45 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 19 15:19:46 2016 +0000 |
| tree | 3713f0a148180632ad94074cc86b846f49324280 | |
| parent | 95a127cbf49f8fb6496e4b81b2f0d716d7f8cfbc [diff] | |
| parent | 28680c61c9b4a617c3a9470e630179b861f0bc20 [diff] |
Merge "No QS hotspot unless supported" into nyc-dev
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index bf5b22c..25a3eff 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
@@ -43,6 +43,11 @@ } @Override + public boolean isAvailable() { + return mController.isHotspotSupported(); + } + + @Override protected void handleDestroy() { super.handleDestroy(); }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java index 047f14d..4622ea4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java
@@ -21,6 +21,7 @@ void removeCallback(Callback callback); boolean isHotspotEnabled(); void setHotspotEnabled(boolean enabled); + boolean isHotspotSupported(); public interface Callback { void onHotspotChanged(boolean enabled);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java index c6b1cdf..9041341 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
@@ -46,6 +46,12 @@ Context.CONNECTIVITY_SERVICE); } + @Override + public boolean isHotspotSupported() { + return mConnectivityManager.isTetheringSupported() + && mConnectivityManager.getTetherableWifiRegexs().length != 0; + } + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println("HotspotController state:"); pw.print(" mHotspotEnabled="); pw.println(stateToString(mHotspotState));