Merge "Un-hide TelephonyManager.getSignalStrength()" am: 3e884ce13c am: 447b7c49fc

am: 95fe8c1312

Change-Id: I514d635abcb039efa1cc218fe28ba0ed979b9bf7
This commit is contained in:
nharold
2017-09-11 18:27:48 +00:00
committed by android-build-merger
4 changed files with 3 additions and 1 deletions

View File

@@ -40271,6 +40271,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();

View File

@@ -43787,6 +43787,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();

View File

@@ -40542,6 +40542,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();

View File

@@ -6872,7 +6872,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() {