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

Merge "Make TelephonyManager.getCdmaEriInformation and CdmaEriInformation hide@" into rvc-dev am: 2785cbd047 am: 43f41fe0d2 am: 8e87a84401

Browse Source 
Change-Id: Ia6bb68c658a739bc32e5eaaade18629d44f2c2bd
This commit is contained in:
Automerger Merge Worker
2020-03-10 22:00:04 +00:00
parent f53b97d0b0 8e87a84401
commit e69d056889
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/system-current.txt
View File

@@ -10911,19 +10911,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";
@@ -11618,7 +11605,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();

1
telephony/java/android/telephony/CdmaEriInformation.java
View File

@@ -40,7 +40,6 @@ import java.lang.annotation.RetentionPolicy;
*
* @hide
*/
@SystemApi
public final class CdmaEriInformation implements Parcelable {
/** @hide */
@Retention(RetentionPolicy.SOURCE)

1
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -5606,7 +5606,6 @@ public class TelephonyManager {
* @hide
*/
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@SystemApi
@NonNull
public CdmaEriInformation getCdmaEriInformation() {
return new CdmaEriInformation(