Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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."

Browse Source
This commit is contained in:
Vasu Nori
2015-12-11 20:25:01 +00:00
committed by Android (Google) Code Review
parent c76179193d 1d89a19207
commit 3cafcba67e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/AirplaneModeVoiceActivity.java
View File

@@ -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");
}