From 239a3b22f1dd5cb253042e899c3bd268691933da Mon Sep 17 00:00:00 2001
From: Yuhao Zheng <yuhaozheng@google.com>
Date: Wed, 11 Sep 2013 09:36:41 -0700
Subject: [PATCH] Fix for the toggle airplane mode hidden API

Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:10653570

Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90
---
 services/java/com/android/server/ConnectivityService.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 4e3faca51a..1af7cc89a9 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -4684,12 +4684,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
     @Override
     public void setAirplaneMode(boolean enable) {
         enforceConnectivityInternalPermission();
-        final ContentResolver cr = mContext.getContentResolver();
-        Settings.Global.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, enable ? 1 : 0);
-        Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
-        intent.putExtra("state", enable);
         final long ident = Binder.clearCallingIdentity();
         try {
+            final ContentResolver cr = mContext.getContentResolver();
+            Settings.Global.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, enable ? 1 : 0);
+            Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+            intent.putExtra("state", enable);
             mContext.sendBroadcast(intent);
         } finally {
             Binder.restoreCallingIdentity(ident);