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

Commit c726dcb8 authored by Yuhao Zheng's avatar Yuhao Zheng Committed by Android Git Automerger
Browse files

am 05e7e345: am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev 

* commit '05e7e345':
  Fix for the toggle airplane mode hidden API
parents 965c4790 05e7e345

services/java/com/android/server/ConnectivityService.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -4684,12 +4684,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    @Override

    @Override

    public void setAirplaneMode(boolean enable) {

    public void setAirplaneMode(boolean enable) {

        enforceConnectivityInternalPermission();

        enforceConnectivityInternalPermission();

        final long ident = Binder.clearCallingIdentity();

        try {

            final ContentResolver cr = mContext.getContentResolver();

            final ContentResolver cr = mContext.getContentResolver();

            Settings.Global.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, enable ? 1 : 0);

            Settings.Global.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, enable ? 1 : 0);

            Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);

            Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);

            intent.putExtra("state", enable);

            intent.putExtra("state", enable);

        final long ident = Binder.clearCallingIdentity();

        try {

            mContext.sendBroadcast(intent);

            mContext.sendBroadcast(intent);

        } finally {

        } finally {

            Binder.restoreCallingIdentity(ident);

            Binder.restoreCallingIdentity(ident);