Merge "Un-hide TelephonyManager.getSignalStrength()"

This commit is contained in:
nharold
2017-09-11 17:44:34 +00:00
committed by Gerrit Code Review
4 changed files with 3 additions and 1 deletions

View File

@@ -40111,6 +40111,7 @@ package android.telephony {
method public int getPhoneCount(); method public int getPhoneCount();
method public int getPhoneType(); method public int getPhoneType();
method public android.telephony.ServiceState getServiceState(); method public android.telephony.ServiceState getServiceState();
method public android.telephony.SignalStrength getSignalStrength();
method public java.lang.String getSimCountryIso(); method public java.lang.String getSimCountryIso();
method public java.lang.String getSimOperator(); method public java.lang.String getSimOperator();
method public java.lang.String getSimOperatorName(); method public java.lang.String getSimOperatorName();

View File

@@ -43583,6 +43583,7 @@ package android.telephony {
method public int getPhoneCount(); method public int getPhoneCount();
method public int getPhoneType(); method public int getPhoneType();
method public android.telephony.ServiceState getServiceState(); method public android.telephony.ServiceState getServiceState();
method public android.telephony.SignalStrength getSignalStrength();
method public java.lang.String getSimCountryIso(); method public java.lang.String getSimCountryIso();
method public java.lang.String getSimOperator(); method public java.lang.String getSimOperator();
method public java.lang.String getSimOperatorName(); method public java.lang.String getSimOperatorName();

View File

@@ -40333,6 +40333,7 @@ package android.telephony {
method public int getPhoneCount(); method public int getPhoneCount();
method public int getPhoneType(); method public int getPhoneType();
method public android.telephony.ServiceState getServiceState(); method public android.telephony.ServiceState getServiceState();
method public android.telephony.SignalStrength getSignalStrength();
method public java.lang.String getSimCountryIso(); method public java.lang.String getSimCountryIso();
method public java.lang.String getSimOperator(); method public java.lang.String getSimOperator();
method public java.lang.String getSimOperatorName(); method public java.lang.String getSimOperatorName();

View File

@@ -6760,7 +6760,6 @@ public class TelephonyManager {
* Get the most recent SignalStrength information reported by the modem. Due * Get the most recent SignalStrength information reported by the modem. Due
* to power saving this information may not always be current. * to power saving this information may not always be current.
* @return the most recent cached signal strength info from the modem * @return the most recent cached signal strength info from the modem
* @hide
*/ */
@Nullable @Nullable
public SignalStrength getSignalStrength() { public SignalStrength getSignalStrength() {