Merge commit 'd91f193' into merge2 (eb864d40) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -18768,6 +18768,7 @@ package android.net.wifi {

		public static final class WifiEnterpriseConfig.Eap {
		field public static final int AKA = 5; // 0x5
		field public static final int AKA_PRIME = 6; // 0x6
		field public static final int NONE = -1; // 0xffffffff
		field public static final int PEAP = 0; // 0x0
		field public static final int PWD = 3; // 0x3

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -6327,6 +6327,7 @@ package android.bluetooth {
		method public android.bluetooth.BluetoothDevice getRemoteDevice(byte[]);
		method public int getScanMode();
		method public int getState();
		method public boolean isBleScanAlwaysAvailable();
		method public boolean isDiscovering();
		method public boolean isEnabled();
		method public boolean isMultipleAdvertisementSupported();
		@@ -6343,6 +6344,7 @@ package android.bluetooth {
		field public static final java.lang.String ACTION_DISCOVERY_FINISHED = "android.bluetooth.adapter.action.DISCOVERY_FINISHED";
		field public static final java.lang.String ACTION_DISCOVERY_STARTED = "android.bluetooth.adapter.action.DISCOVERY_STARTED";
		field public static final java.lang.String ACTION_LOCAL_NAME_CHANGED = "android.bluetooth.adapter.action.LOCAL_NAME_CHANGED";
		field public static final java.lang.String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE = "android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE";
		field public static final java.lang.String ACTION_REQUEST_DISCOVERABLE = "android.bluetooth.adapter.action.REQUEST_DISCOVERABLE";
		field public static final java.lang.String ACTION_REQUEST_ENABLE = "android.bluetooth.adapter.action.REQUEST_ENABLE";
		field public static final java.lang.String ACTION_SCAN_MODE_CHANGED = "android.bluetooth.adapter.action.SCAN_MODE_CHANGED";
		@@ -20461,6 +20463,7 @@ package android.net.wifi {

		public static final class WifiEnterpriseConfig.Eap {
		field public static final int AKA = 5; // 0x5
		field public static final int AKA_PRIME = 6; // 0x6
		field public static final int NONE = -1; // 0xffffffff
		field public static final int PEAP = 0; // 0x0
		field public static final int PWD = 3; // 0x3

core/java/android/bluetooth/BluetoothAdapter.java

+34 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.bluetooth;

		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.bluetooth.le.BluetoothLeAdvertiser;
		import android.bluetooth.le.BluetoothLeScanner;
		import android.bluetooth.le.ScanCallback;
		@@ -205,6 +206,23 @@ 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 user to enable BLE scans even when
		* Bluetooth is turned off.<p>
		*
		* Notification of result of this activity is posted using
		* {@link android.app.Activity#onActivityResult}. The <code>resultCode</code> will be
		* {@link android.app.Activity#RESULT_OK} if BLE scan always available setting is turned on or
		* {@link android.app.Activity#RESULT_CANCELED} if the user has rejected the request or an
		* error occurred.
		*
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE =
		"android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE";

		/**
		* Broadcast Action: Indicates the Bluetooth scan mode of the local Adapter
		* has changed.
		@@ -915,6 +933,22 @@ public final class BluetoothAdapter {
		return false;
		}

		/**
		* Returns {@code true} if BLE scan is always available, {@code false} otherwise. <p>
		*
		* If this returns {@code true}, application can issue {@link BluetoothLeScanner#startScan} and
		* fetch scan results even when Bluetooth is turned off.<p>
		*
		* To change this setting, use {@link #ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE}.
		*
		* @hide
		*/
		@SystemApi
		public boolean isBleScanAlwaysAvailable() {
		// TODO: implement after Settings UI change.
		return false;
		}

		/**
		* Returns whether peripheral mode is supported.
		*

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -6374,6 +6374,14 @@ public final class Settings {
		public static final String WIFI_SCAN_ALWAYS_AVAILABLE =
		"wifi_scan_always_enabled";

		/**
		* Settings to allow BLE scans to be enabled even when Bluetooth is turned off for
		* connectivity.
		* @hide
		*/
		public static final String BLE_SCAN_ALWAYS_AVAILABLE =
		"ble_scan_always_enabled";

		/**
		* Used to save the Wifi_ON state prior to tethering.
		* This state will be checked to restore Wifi after

core/res/res/values/config.xml

+12 −0

Original line number	Diff line number	Diff line
		@@ -471,6 +471,18 @@
		<!-- Wifi driver supports batched scan -->
		<bool translatable="false" name="config_wifi_batched_scan_supported">false</bool>

		<!-- Idle Receive current for wifi radio. 0 by default-->
		<integer translatable="false" name="config_wifi_idle_receive_cur_ma">1</integer>

		<!-- Rx current for wifi radio. 0 by default-->
		<integer translatable="false" name="config_wifi_active_rx_cur_ma">2</integer>

		<!-- Tx current for wifi radio. 0 by default-->
		<integer translatable="false" name="config_wifi_tx_cur_ma">3</integer>

		<!-- Operating volatage for wifi radio. 0 by default-->
		<integer translatable="false" name="config_wifi_operating_voltage_mv">4</integer>

		<!-- Flag indicating whether the we should enable the automatic brightness in Settings.
		Software implementation will be used if config_hardware_auto_brightness_available is not set -->
		<bool name="config_automatic_brightness_available">false</bool>