Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'd91f193' into merge2

Browse Source
This commit is contained in:
Etan Cohen
2015-04-01 09:31:43 -07:00
parent 227542a3d1 d91f19354d
commit eb864d4000
11 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

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

3
api/system-current.txt
View File

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

34
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -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.
*

8
core/java/android/provider/Settings.java
View File

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

12
core/res/res/values/config.xml
View File

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

4
core/res/res/values/symbols.xml
View File

@@ -328,6 +328,10 @@
<java-symbol type="integer" name="config_wifi_framework_current_network_boost" />
<java-symbol type="string" name="config_wifi_random_mac_oui" />
<java-symbol type="integer" name="config_wifi_network_switching_blacklist_time" />
<java-symbol type="integer" name="config_wifi_idle_receive_cur_ma" />
<java-symbol type="integer" name="config_wifi_active_rx_cur_ma" />
<java-symbol type="integer" name="config_wifi_tx_cur_ma" />
<java-symbol type="integer" name="config_wifi_operating_voltage_mv" />
<java-symbol type="bool" name="editable_voicemailnumber" />

2
telephony/java/com/android/ims/ImsCallProfile.java
View File

@@ -270,7 +270,7 @@ public class ImsCallProfile implements Parcelable {
return "{ serviceType=" + mServiceType +
", callType=" + mCallType +
", restrictCause=" + mRestrictCause +
", callExtras=" + mCallExtras.toString() +
//", callExtras=" + mCallExtras.toString() +
", mediaProfile=" + mMediaProfile.toString() + " }";
}

5
telephony/java/com/android/ims/internal/IImsUt.aidl
View File

@@ -79,12 +79,13 @@ interface IImsUt {
/**
* Updates the configuration of the call forward.
*/
int updateCallForward(int action, int condition, String number, int timeSeconds);
int updateCallForward(int action, int condition, String number,
int serviceClass, int timeSeconds);
/**
* Updates the configuration of the call waiting.
*/
int updateCallWaiting(boolean enable);
int updateCallWaiting(boolean enable, int serviceClass);
/**
* Updates the configuration of the CLIR supplementary service.

1
wifi/java/android/net/wifi/WifiActivityEnergyInfo.java
View File

@@ -141,6 +141,7 @@ public final class WifiActivityEnergyInfo implements Parcelable {
return (int)mControllerIdleTimeMs;
}
/**
* product of current(mA), voltage(V) and time(ms)
* @return energy used

5
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -235,8 +235,10 @@ public class WifiEnterpriseConfig implements Parcelable {
public static final int SIM = 4;
/** EAP-Authentication and Key Agreement */
public static final int AKA = 5;
/** EAP-Authentication and Key Agreement Prime */
public static final int AKA_PRIME = 6;
/** @hide */
public static final String[] strings = { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA" };
public static final String[] strings = { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA", "AKA'" };
/** Prevent initialization */
private Eap() {}
@@ -286,6 +288,7 @@ public class WifiEnterpriseConfig implements Parcelable {
case Eap.TTLS:
case Eap.SIM:
case Eap.AKA:
case Eap.AKA_PRIME:
mFields.put(EAP_KEY, Eap.strings[eapMethod]);
mFields.put(OPP_KEY_CACHING, "1");
break;

10
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -861,6 +861,14 @@ public class WifiManager {
public static final int WIFI_FEATURE_TDLS_OFFCHANNEL = 0x2000; // Support for TDLS off channel
/** @hide */
public static final int WIFI_FEATURE_EPR = 0x4000; // Enhanced power reporting
/** @hide */
public static final int WIFI_FEATURE_AP_STA = 0x8000; // Support for AP STA Concurrency
/** @hide */
public static final int WIFI_FEATURE_LINK_LAYER_STATS = 0x10000; // Link layer stats collection
/** @hide */
public static final int WIFI_FEATURE_LOGGER = 0x20000; // WiFi Logger
/** @hide */
public static final int WIFI_FEATURE_HAL_EPNO = 0x40000; // WiFi PNO enhanced
private int getSupportedFeatures() {
try {
@@ -972,7 +980,7 @@ public class WifiManager {
* @return true if this adapter supports advanced power/performance counters
*/
public boolean isEnhancedPowerReportingSupported() {
return isFeatureSupported(WIFI_FEATURE_EPR);
return isFeatureSupported(WIFI_FEATURE_LINK_LAYER_STATS);
}
/**