Merge changes from topic 'mwd-merge-040115' (36711e0e) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -18802,6 +18802,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
		@@ -6333,6 +6333,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();
		@@ -6349,6 +6350,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";
		@@ -20499,6 +20501,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-mcc310-mnc260/strings.xml

+7 −3

Original line number	Diff line number	Diff line
		@@ -25,9 +25,13 @@
		<string-array name="wfcOperatorErrorCodes" translatable="false">
		<item>REG09</item>
		</string-array>
		<!-- WFC Operator Error Messages -->
		<string-array name="wfcOperatorErrorMessages">
		<item>Wi-Fi Calling isn\'t available. Contact your carrier to enable Wi-Fi Calling.</item>
		<!-- WFC Operator Error Messages showed as alerts -->
		<string-array name="wfcOperatorErrorAlertMessages">
		<item>To make calls and send messages over Wi-Fi, first ask your carrier to set up this service. Then turn on Wi-Fi calling again from Settings.</item>
		</string-array>
		<!-- WFC Operator Error Messages showed as notifications -->
		<string-array name="wfcOperatorErrorNotificationMessages">
		<item>Register with your carrier</item>
		</string-array>
		<!-- Template for showing cellular network operator name while WFC is active -->
		<string name="wfcSpnFormat">%s Wi-Fi Calling</string>