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

am: 447b7c49fc

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

View File

@@ -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();

View File

@@ -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();

View File

@@ -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();

View File

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