diff options
| author | 2017-09-11 18:17:03 +0000 | |
|---|---|---|
| committer | 2017-09-11 18:17:03 +0000 | |
| commit | 95fe8c1312c9611ca03e286ae01ed0b4279f6f09 (patch) | |
| tree | 5c812db7dc9b5faeb73a5baffccd43247885ea75 | |
| parent | 922fa98bd0372c886107cd6fba37dce38d6c4a61 (diff) | |
| parent | 447b7c49fc602269c87e6b28dba51453face23e8 (diff) | |
Merge "Un-hide TelephonyManager.getSignalStrength()" am: 3e884ce13c
am: 447b7c49fc
Change-Id: I5c1738fca4a43b0e8c1ddd0041a00f96d32142e8
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 39f0c4e7d7e7..48fd86f4113a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -40078,6 +40078,7 @@ package android.telephony { method public int getPhoneCount(); method public int getPhoneType(); method public android.telephony.ServiceState getServiceState(); + method public android.telephony.SignalStrength getSignalStrength(); method public java.lang.String getSimCountryIso(); method public java.lang.String getSimOperator(); method public java.lang.String getSimOperatorName(); diff --git a/api/system-current.txt b/api/system-current.txt index 0fd91c0ab098..57405bce81ac 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -43551,6 +43551,7 @@ package android.telephony { method public int getPhoneCount(); method public int getPhoneType(); method public android.telephony.ServiceState getServiceState(); + method public android.telephony.SignalStrength getSignalStrength(); method public java.lang.String getSimCountryIso(); method public java.lang.String getSimOperator(); method public java.lang.String getSimOperatorName(); diff --git a/api/test-current.txt b/api/test-current.txt index 909161c1fa2b..43e90cd6bbeb 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -40302,6 +40302,7 @@ package android.telephony { method public int getPhoneCount(); method public int getPhoneType(); method public android.telephony.ServiceState getServiceState(); + method public android.telephony.SignalStrength getSignalStrength(); method public java.lang.String getSimCountryIso(); method public java.lang.String getSimOperator(); method public java.lang.String getSimOperatorName(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index d545f13c5aa7..c0241deb8be7 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -6799,7 +6799,6 @@ public class TelephonyManager { * Get the most recent SignalStrength information reported by the modem. Due * to power saving this information may not always be current. * @return the most recent cached signal strength info from the modem - * @hide */ @Nullable public SignalStrength getSignalStrength() { |