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

Commit 3cafcba6 authored by Vasu Nori's avatar Vasu Nori Committed by Android (Google) Code Review
Browse files

Merge "When Airplane mode is changed due to Voice Intent, use the system... 

Merge "When Airplane mode is changed due to Voice Intent, use the system provided ConnectionManager method to do that, instead of changing it directly using Settings.Global.putInt() - because that doesn't case ACTION_AIRPLANE_MODE_CHANGED intent to be broadcast. This breaks Google Search App (GSA) code that relies on the above broadcast to do a variety of things."
parents c7617919 1d89a192

src/com/android/settings/AirplaneModeVoiceActivity.java

+6 −3
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


package com.android.settings;



import android.content.Context;

import android.content.Intent;

import android.net.ConnectivityManager;

import android.provider.Settings;

import android.util.Log;
@@ -31,9 +33,10 @@ public class AirplaneModeVoiceActivity extends VoiceSettingsActivity { 


    protected boolean onVoiceSettingInteraction(Intent intent) {

        if (intent.hasExtra(Settings.EXTRA_AIRPLANE_MODE_ENABLED)) {

            Settings.Global.putInt(getContentResolver(),

                    Settings.Global.AIRPLANE_MODE_ON,

                    intent.getBooleanExtra(Settings.EXTRA_AIRPLANE_MODE_ENABLED, false) ? 1 : 0);

            ConnectivityManager mgr = (ConnectivityManager) getSystemService(

                    Context.CONNECTIVITY_SERVICE);

            mgr.setAirplaneMode(intent.getBooleanExtra(

                    Settings.EXTRA_AIRPLANE_MODE_ENABLED, false));

        } else {

            Log.v(TAG, "Missing airplane mode extra");

        }