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

Commit 244252af authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "QuickSettings: Use connectivity manager for airplane mode." into lmp-preview-dev

parents b72b09cb 6627ff6d

packages/SystemUI/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />

    <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" />

    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />





    <!-- Physical hardware -->

    <uses-permission android:name="android.permission.MANAGE_USB" />

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

+4 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.net.ConnectivityManager;

import android.provider.Settings.Global;



import com.android.systemui.R;
@@ -52,10 +53,9 @@ public class AirplaneModeTile extends QSTile<QSTile.BooleanState> { 
    }



    private void setEnabled(boolean enabled) {

        mSetting.setValue(enabled ? 1 : 0);

        final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);

        intent.putExtra("state", enabled);

        mContext.sendBroadcast(intent);

        final ConnectivityManager mgr =

                (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);

        mgr.setAirplaneMode(enabled);

    }



    @Override