Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b0dc085 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "No QS hotspot unless supported" into nyc-dev am: 93e742b5 

am: f7d92853

* commit 'f7d92853':
  No QS hotspot unless supported

Change-Id: I902c3a6ca0e63a6aaa5189add2902c62a4a24a5e
parents 69e299d9 f7d92853

packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,11 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { 
        mController = host.getHotspotController();

        mController = host.getHotspotController();

    }

    }





    @Override

    public boolean isAvailable() {

        return mController.isHotspotSupported();

    }



    @Override

    @Override

    protected void handleDestroy() {

    protected void handleDestroy() {

        super.handleDestroy();

        super.handleDestroy();

packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ public interface HotspotController { 
    void removeCallback(Callback callback);

    void removeCallback(Callback callback);

    boolean isHotspotEnabled();

    boolean isHotspotEnabled();

    void setHotspotEnabled(boolean enabled);

    void setHotspotEnabled(boolean enabled);

    boolean isHotspotSupported();





    public interface Callback {

    public interface Callback {

        void onHotspotChanged(boolean enabled);

        void onHotspotChanged(boolean enabled);

packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,12 @@ public class HotspotControllerImpl implements HotspotController { 
                Context.CONNECTIVITY_SERVICE);

                Context.CONNECTIVITY_SERVICE);

    }

    }





    @Override

    public boolean isHotspotSupported() {

        return mConnectivityManager.isTetheringSupported()

                && mConnectivityManager.getTetherableWifiRegexs().length != 0;

    }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("HotspotController state:");

        pw.println("HotspotController state:");

        pw.print("  mHotspotEnabled="); pw.println(stateToString(mHotspotState));

        pw.print("  mHotspotEnabled="); pw.println(stateToString(mHotspotState));