Merge changes from topic 'f-radio-toggle' into cw-f-dev (e5592abb) · Commits · e / os / android_frameworks_base

cmds/svc/src/com/android/commands/svc/WifiCommand.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public class WifiCommand extends Svc.Command {
		IWifiManager wifiMgr
		= IWifiManager.Stub.asInterface(ServiceManager.getService(Context.WIFI_SERVICE));
		try {
		wifiMgr.setWifiEnabled(flag);
		wifiMgr.setWifiEnabled("com.android.shell", flag);
		}
		catch (RemoteException e) {
		System.err.println("Wi-Fi operation failed: " + e);

core/java/android/bluetooth/BluetoothAdapter.java

+28 −4

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.app.ActivityThread;
		import android.bluetooth.le.BluetoothLeAdvertiser;
		import android.bluetooth.le.BluetoothLeScanner;
		import android.bluetooth.le.ScanCallback;
		@@ -254,6 +255,29 @@ public final class BluetoothAdapter {
		public static final String ACTION_REQUEST_ENABLE =
		"android.bluetooth.adapter.action.REQUEST_ENABLE";

		/**
		* Activity Action: Show a system activity that allows the user to turn off
		* Bluetooth. This is used only if permission review is enabled which is for
		* apps targeting API less than 23 require a permission review before any of
		* the app's components can run.
		* <p>This system activity will return once Bluetooth has completed turning
		* off, or the user has decided not to turn Bluetooth off.
		* <p>Notification of the result of this activity is posted using the
		* {@link android.app.Activity#onActivityResult} callback. The
		* <code>resultCode</code>
		* will be {@link android.app.Activity#RESULT_OK} if Bluetooth has been
		* turned off or {@link android.app.Activity#RESULT_CANCELED} if the user
		* has rejected the request or an error has occurred.
		* <p>Applications can also listen for {@link #ACTION_STATE_CHANGED}
		* for global notification whenever Bluetooth is turned on or off.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_REQUEST_DISABLE =
		"android.bluetooth.adapter.action.REQUEST_DISABLE";

		/**
		* Activity Action: Show a system activity that allows user to enable BLE scans even when
		* Bluetooth is turned off.<p>
		@@ -772,7 +796,7 @@ public final class BluetoothAdapter {
		return true;
		}
		if (DBG) Log.d(TAG, "enableBLE(): Calling enable");
		return mManagerService.enable();
		return mManagerService.enable(ActivityThread.currentPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		}
		@@ -899,7 +923,7 @@ public final class BluetoothAdapter {
		return true;
		}
		try {
		return mManagerService.enable();
		return mManagerService.enable(ActivityThread.currentPackageName());
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		}
		@@ -931,7 +955,7 @@ public final class BluetoothAdapter {
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		public boolean disable() {
		try {
		return mManagerService.disable(true);
		return mManagerService.disable(ActivityThread.currentPackageName(), true);
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		}
		@@ -949,7 +973,7 @@ public final class BluetoothAdapter {
		public boolean disable(boolean persist) {

		try {
		return mManagerService.disable(persist);
		return mManagerService.disable(ActivityThread.currentPackageName(), persist);
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		}

core/java/android/bluetooth/IBluetoothManager.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,9 +34,9 @@ interface IBluetoothManager
		void registerStateChangeCallback(in IBluetoothStateChangeCallback callback);
		void unregisterStateChangeCallback(in IBluetoothStateChangeCallback callback);
		boolean isEnabled();
		boolean enable();
		boolean enable(String packageName);
		boolean enableNoAutoConnect();
		boolean disable(boolean persist);
		boolean disable(String packageName, boolean persist);
		int getState();
		IBluetoothGatt getBluetoothGatt();

core/res/res/values/config.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -2675,4 +2675,12 @@

		<!-- An array of packages for which notifications cannot be blocked. -->
		<string-array translatable="false" name="config_nonBlockableNotificationPackages" />

		<!-- Specifies whether the permissions needed by a legacy app should be
		reviewed before any of its components can run. A legacy app is one
		with targetSdkVersion < 23, i.e apps using the old permission model.
		If review is not required, permissions are reviewed before the app
		is installed. -->
		<bool name="config_permissionReviewRequired">false</bool>

		</resources>

core/res/res/values/symbols.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -2730,4 +2730,7 @@
		<!-- Screen-size-dependent modes for picker dialogs. -->
		<java-symbol type="integer" name="time_picker_mode" />
		<java-symbol type="integer" name="date_picker_mode" />

		<java-symbol type="bool" name="config_permissionReviewRequired" />

		</resources>