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

Original change: undetermined

Change-Id: I50446d2a4c5feb96e4f7276e026df1a7eba56105
This commit is contained in:
Yuhao Zheng
2021-05-31 06:48:03 +00:00
committed by Automerger Merge Worker

View File

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