Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "signalstrength_ctr" am: 4d8ff9fca7 am: 32c817a654

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505251

Change-Id: I904408f82cba6b95fb01a6dd87572a63129d981e
This commit is contained in:
Sarah Chin
2020-11-20 00:19:37 +00:00
committed by Automerger Merge Worker
parent 80fbbe764a 32c817a654
commit 8e619d81c1
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -46095,6 +46095,7 @@ package android.telephony {
}
public class SignalStrength implements android.os.Parcelable {
ctor public SignalStrength(@NonNull android.telephony.SignalStrength);
method public int describeContents();
method @Deprecated public int getCdmaDbm();
method @Deprecated public int getCdmaEcio();

4
core/api/system-current.txt
View File

@@ -9880,10 +9880,6 @@ package android.telephony {
field public static final int ROAMING_TYPE_UNKNOWN = 1; // 0x1
}
public class SignalStrength implements android.os.Parcelable {
ctor public SignalStrength(@NonNull android.telephony.SignalStrength);
}
public final class SmsCbCmasInfo implements android.os.Parcelable {
ctor public SmsCbCmasInfo(int, int, int, int, int, int);
method public int describeContents();

3
telephony/java/android/telephony/SignalStrength.java
View File

@@ -18,7 +18,6 @@ package android.telephony;
import android.annotation.ElapsedRealtimeLong;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage;
import android.os.Build;
import android.os.Bundle;
@@ -291,9 +290,7 @@ public class SignalStrength implements Parcelable {
* This constructor is used to create a copy of an existing SignalStrength object.
*
* @param s Source SignalStrength
* @hide
*/
@SystemApi
public SignalStrength(@NonNull SignalStrength s) {
copyFrom(s);
}