Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32c817a6 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge changes from topic "signalstrength_ctr" am: 4d8ff9fc 

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

Change-Id: I9b53a6e29b296639b5af56662421e0f9fbf91d9b
parents b0ed9bd7 4d8ff9fc

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

























core/api/system-current.txt



+0
−4




























Original line number
Diff line number
Diff line








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

























telephony/java/android/telephony/SignalStrength.java



+0
−3




























Original line number
Diff line number
Diff line








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















    }