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

* commit '518c0afaea02f9a680f6912bde2d73b0357236ca':
  Fix for the toggle airplane mode hidden API
This commit is contained in:
Yuhao Zheng
2013-09-11 10:38:36 -07:00
committed by Android Git Automerger

View File

@@ -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 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(); final long ident = Binder.clearCallingIdentity();
try { 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); mContext.sendBroadcast(intent);
} finally { } finally {
Binder.restoreCallingIdentity(ident); Binder.restoreCallingIdentity(ident);