Merge "Expose SignalStrength.CREATOR" am: b0546af594 am: 9ca0d16b2e

Change-Id: Ie785dcbdbe287ad6c4c7ecf94a2bb412bbce1408
This commit is contained in:
Automerger Merge Worker
2020-01-07 01:20:38 +00:00
2 changed files with 9 additions and 9 deletions

View File

@@ -45088,6 +45088,7 @@ package android.telephony {
method public int getLevel();
method @Deprecated public boolean isGsm();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.SignalStrength> CREATOR;
field public static final int INVALID = 2147483647; // 0x7fffffff
}

View File

@@ -332,17 +332,16 @@ public class SignalStrength implements Parcelable {
/**
* {@link Parcelable.Creator}
*
* @hide
*/
@UnsupportedAppUsage
public static final @android.annotation.NonNull Parcelable.Creator<SignalStrength> CREATOR = new Parcelable.Creator() {
public SignalStrength createFromParcel(Parcel in) {
return new SignalStrength(in);
}
public static final @android.annotation.NonNull Parcelable.Creator<SignalStrength> CREATOR =
new Parcelable.Creator<SignalStrength>() {
public SignalStrength createFromParcel(Parcel in) {
return new SignalStrength(in);
}
public SignalStrength[] newArray(int size) {
return new SignalStrength[size];
}
public SignalStrength[] newArray(int size) {
return new SignalStrength[size];
}
};
/**