diff options
| author | 2020-01-21 19:40:34 -0800 | |
|---|---|---|
| committer | 2020-02-07 23:07:30 +0000 | |
| commit | c27a3f37b1477afb73ce0412434547cfcf7bb334 (patch) | |
| tree | 2d3cb8660d636030838bc0c80a6192837d900a27 | |
| parent | 7c5e8239655cb215f80779d1ce15eb0b8fbb8904 (diff) | |
Expose RESULT_RECEIVER_CONTROLLER_KEY as @SystemApi.
It's used by a @SystemApi as key of it's return bundule. So we
should expose it. Also it's currently linked to BatteryStats.
RESULT_RECEIVER_CONTROLLER_KEY which makes no sense as they are
functionally independent and BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY
is @hide. So also make it a hardcoded String.
Bug: 148116922
Test: build
Change-Id: I7099048c126e88f75cf5bd7e779ddfe923cc1c02
Merged-In: I7099048c126e88f75cf5bd7e779ddfe923cc1c02
| -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 f69a99eafb9e..0551c6c37be4 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9733,6 +9733,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 d5eb547958e0..6908ab8de403 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -51,7 +51,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; @@ -163,8 +162,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 @@ -10058,7 +10057,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 |