diff options
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2020-01-22 19:29:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-22 19:29:21 +0000 |
| commit | 8697e36b55749ee910841384524826c800e69e26 (patch) | |
| tree | a2c080fcd4aa989a9a97cbc36ddadc9e7541ec11 | |
| parent | c6cf3a4dc50d3b1d2354e1778cc5ec52ed7e6dd6 (diff) | |
| parent | 012223b36601043e4ac2f56ae4d74fdf572daf08 (diff) | |
Merge "Expose RESULT_RECEIVER_CONTROLLER_KEY as @SystemApi."
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index c1f6e943a9f6..bdb5eac71b9e 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -12060,6 +12060,7 @@ package android.telephony { field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff field public static final int KEY_TYPE_EPDG = 1; // 0x1 field public static final int KEY_TYPE_WLAN = 2; // 0x2 + field public static final String MODEM_ACTIVITY_RESULT_KEY = "controller_activity"; field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index ee81737c1d05..391b01104e93 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -50,7 +50,6 @@ import android.net.ConnectivityManager; import android.net.NetworkStats; import android.net.Uri; import android.os.AsyncTask; -import android.os.BatteryStats; import android.os.Binder; import android.os.Build; import android.os.Bundle; @@ -161,8 +160,8 @@ public class TelephonyManager { * into the ResultReceiver Bundle. * @hide */ - public static final String MODEM_ACTIVITY_RESULT_KEY = - BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY; + @SystemApi + public static final String MODEM_ACTIVITY_RESULT_KEY = "controller_activity"; /** * The process name of the Phone app as well as many other apps that use this process name, such @@ -10206,7 +10205,8 @@ public class TelephonyManager { * Requests the modem activity info. The recipient will place the result * in `result`. * @param result The object on which the recipient will send the resulting - * {@link android.telephony.ModemActivityInfo} object. + * {@link android.telephony.ModemActivityInfo} object with key of + * {@link #MODEM_ACTIVITY_RESULT_KEY}. * @hide */ @SystemApi |