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

Commit 15864feb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make TelephonyManager.getCdmaEriInformation and CdmaEriInformation... 

Merge "Make TelephonyManager.getCdmaEriInformation and CdmaEriInformation hide@" into rvc-dev am: 2785cbd0

Change-Id: Icf5105edb3220e41304c176893bc5dd579ced9de
parents c148e6f4 2785cbd0

api/system-current.txt

+0 −14
Original line number Diff line number Diff line
@@ -10909,19 +10909,6 @@ package android.telephony { 
    method @NonNull public java.util.List<android.telephony.CbGeoUtils.LatLng> getVertices();

  }













  public final class CdmaEriInformation implements android.os.Parcelable {













    method public int describeContents();













    method public int getEriIconIndex();













    method public int getEriIconMode();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CdmaEriInformation> CREATOR;













    field public static final int ERI_FLASH = 2; // 0x2













    field public static final int ERI_ICON_MODE_FLASH = 1; // 0x1













    field public static final int ERI_ICON_MODE_NORMAL = 0; // 0x0













    field public static final int ERI_OFF = 1; // 0x1













    field public static final int ERI_ON = 0; // 0x0













  }



























  public class CellBroadcastIntents {















    method public static void sendSmsCbReceivedBroadcast(@NonNull android.content.Context, @Nullable android.os.UserHandle, @NonNull android.telephony.SmsCbMessage, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, int);















    field public static final String ACTION_AREA_INFO_UPDATED = "android.telephony.action.AREA_INFO_UPDATED";










@@ -11616,7 +11603,6 @@ package android.telephony {













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCarrierPrivilegeStatus(int);















    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPrivilegedPackagesForAllActiveSubscriptions();















    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules();













    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CdmaEriInformation getCdmaEriInformation();















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn();















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin();

























telephony/java/android/telephony/CdmaEriInformation.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -40,7 +40,6 @@ import java.lang.annotation.RetentionPolicy;













 *















 * @hide















 */













@SystemApi















public final class CdmaEriInformation implements Parcelable {















    /** @hide */















    @Retention(RetentionPolicy.SOURCE)

































telephony/java/android/telephony/TelephonyManager.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -5606,7 +5606,6 @@ public class TelephonyManager {













     * @hide















     */















    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    @SystemApi















    @NonNull















    public CdmaEriInformation getCdmaEriInformation() {















        return new CdmaEriInformation(