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

Commit 9c614e6f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Un-expose APIs added for telephony mainline." into rvc-dev am: 9a58d574 

Change-Id: I306392edfae898f021c9bb0a5095c978cc7e1f57
parents aab97af0 9a58d574

api/current.txt

+0 −8
Original line number Diff line number Diff line
@@ -47000,7 +47000,6 @@ package android.telephony { 
    method public abstract int getAsuLevel();

    method public abstract int getDbm();

    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public abstract int getLevel();

    method public static final int getNumSignalStrengthLevels();

    method public abstract int hashCode();

    field public static final int SIGNAL_STRENGTH_GOOD = 3; // 0x3

    field public static final int SIGNAL_STRENGTH_GREAT = 4; // 0x4
@@ -47581,12 +47580,6 @@ package android.telephony { 
    field public static final int SCAN_TYPE_PERIODIC = 1; // 0x1

  }













  public final class PhoneCapability implements android.os.Parcelable {













    method public int describeContents();













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













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













  }



























  public class PhoneNumberFormattingTextWatcher implements android.text.TextWatcher {















    ctor public PhoneNumberFormattingTextWatcher();















    ctor public PhoneNumberFormattingTextWatcher(String);










@@ -48110,7 +48103,6 @@ package android.telephony {













    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean doesSwitchMultiSimConfigTriggerReboot();















    method public int getActiveModemCount();















    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo();













    method @NonNull public static int[] getAllNetworkTypes();















    method public int getCallState();















    method public int getCardIdForDefaultEuicc();















    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @WorkerThread public android.os.PersistableBundle getCarrierConfig();

























api/system-current.txt



+0
−46




























Original line number
Diff line number
Diff line








@@ -1735,7 +1735,6 @@ package android.content {













    field public static final String STATUS_BAR_SERVICE = "statusbar";















    field public static final String SYSTEM_CONFIG_SERVICE = "system_config";















    field public static final String SYSTEM_UPDATE_SERVICE = "system_update";













    field public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry";















    field public static final String TETHERING_SERVICE = "tethering";















    field public static final String VR_SERVICE = "vrmanager";















    field public static final String WIFI_NL80211_SERVICE = "wifinl80211";










@@ -10795,30 +10794,6 @@ package android.telephony {













    field public static final String MBMS_STREAMING_SERVICE_ACTION = "android.telephony.action.EmbmsStreaming";















  }



























  public final class ModemActivityInfo implements android.os.Parcelable {













    ctor public ModemActivityInfo(long, int, int, @NonNull int[], int);













    method public int describeContents();













    method public int getIdleTimeMillis();













    method public int getReceiveTimeMillis();













    method public int getSleepTimeMillis();













    method public long getTimestamp();













    method @NonNull public java.util.List<android.telephony.ModemActivityInfo.TransmitPower> getTransmitPowerInfo();













    method public boolean isValid();













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













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













    field public static final int TX_POWER_LEVELS = 5; // 0x5













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













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













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













    field public static final int TX_POWER_LEVEL_3 = 3; // 0x3













    field public static final int TX_POWER_LEVEL_4 = 4; // 0x4













  }

























  public class ModemActivityInfo.TransmitPower {













    method @NonNull public android.util.Range<java.lang.Integer> getPowerRangeInDbm();













    method public int getTimeInMillis();













  }



























  public final class NetworkRegistrationInfo implements android.os.Parcelable {















    method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();















    method public int getRegistrationState();










@@ -11043,21 +11018,15 @@ package android.telephony {













  }





























  public class ServiceState implements android.os.Parcelable {













    method public void fillInNotifierBundle(@NonNull android.os.Bundle);















    method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);















    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);















    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);













    method @NonNull public static android.telephony.ServiceState newFromBundle(@NonNull android.os.Bundle);















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















    field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3















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















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










@@ -11331,7 +11300,6 @@ package android.telephony {













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean isIccLockEnabled();















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled();















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();










@@ -11383,11 +11351,6 @@ package android.telephony {













    method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor);















    method public void updateServiceLocation();















    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED";













    field public static final String ACTION_CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE = "com.android.internal.telephony.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE";













    field public static final String ACTION_CARRIER_SIGNAL_PCO_VALUE = "com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE";













    field public static final String ACTION_CARRIER_SIGNAL_REDIRECTED = "com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED";













    field public static final String ACTION_CARRIER_SIGNAL_REQUEST_NETWORK_FAILED = "com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED";













    field public static final String ACTION_CARRIER_SIGNAL_RESET = "com.android.internal.telephony.CARRIER_SIGNAL_RESET";















    field public static final String ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED";















    field public static final String ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED";















    field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";









@@ -11404,17 +11367,8 @@ package android.telephony {













    field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff















    field public static final String EXTRA_ANOMALY_DESCRIPTION = "android.telephony.extra.ANOMALY_DESCRIPTION";















    field public static final String EXTRA_ANOMALY_ID = "android.telephony.extra.ANOMALY_ID";













    field @Deprecated public static final String EXTRA_APN_PROTOCOL = "apnProto";













    field public static final String EXTRA_APN_PROTOCOL_INT = "apnProtoInt";













    field @Deprecated public static final String EXTRA_APN_TYPE = "apnType";













    field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt";













    field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable";













    field public static final String EXTRA_ERROR_CODE = "errorCode";













    field public static final String EXTRA_PCO_ID = "pcoId";













    field public static final String EXTRA_PCO_VALUE = "pcoValue";















    field public static final String EXTRA_PHONE_IN_ECM_STATE = "android.telephony.extra.PHONE_IN_ECM_STATE";















    field public static final String EXTRA_PHONE_IN_EMERGENCY_CALL = "android.telephony.extra.PHONE_IN_EMERGENCY_CALL";













    field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";















    field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";















    field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";















    field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING";

























api/test-current.txt



+0
−37




























Original line number
Diff line number
Diff line








@@ -3802,43 +3802,6 @@ package android.telephony {













    field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff















  }





























  public class TelephonyRegistryManager {













    method public void addOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener, @NonNull java.util.concurrent.Executor);













    method public void addOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener, @NonNull java.util.concurrent.Executor);













    method public void listenForSubscriber(int, @NonNull String, @NonNull String, @NonNull android.telephony.PhoneStateListener, int, boolean);













    method public void notifyActiveDataSubIdChanged(int);













    method public void notifyBarringInfoChanged(int, int, @NonNull android.telephony.BarringInfo);













    method public void notifyCallForwardingChanged(int, boolean);













    method public void notifyCallQualityChanged(int, int, @NonNull android.telephony.CallQuality, int);













    method public void notifyCallStateChanged(int, int, int, @Nullable String);













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyCallStateChangedForAllSubscriptions(int, @Nullable String);













    method public void notifyCarrierNetworkChange(boolean);













    method public void notifyCellInfoChanged(int, @NonNull java.util.List<android.telephony.CellInfo>);













    method public void notifyCellLocation(int, @NonNull android.telephony.CellIdentity);













    method public void notifyDataActivationStateChanged(int, int, int);













    method public void notifyDataActivityChanged(int, int);













    method public void notifyDataConnectionForSubscriber(int, int, int, @Nullable android.telephony.PreciseDataConnectionState);













    method public void notifyDisconnectCause(int, int, int, int);













    method public void notifyDisplayInfoChanged(int, int, @NonNull android.telephony.TelephonyDisplayInfo);













    method public void notifyEmergencyNumberList(int, int);













    method public void notifyImsDisconnectCause(int, @NonNull android.telephony.ims.ImsReasonInfo);













    method public void notifyMessageWaitingChanged(int, int, boolean);













    method public void notifyOutgoingEmergencyCall(int, int, @NonNull android.telephony.emergency.EmergencyNumber);













    method public void notifyOutgoingEmergencySms(int, int, @NonNull android.telephony.emergency.EmergencyNumber);













    method public void notifyPhoneCapabilityChanged(@NonNull android.telephony.PhoneCapability);













    method public void notifyPreciseCallState(int, int, int, int, int);













    method public void notifyPreciseDataConnectionFailed(int, int, int, @Nullable String, int);













    method public void notifyRadioPowerStateChanged(int, int, int);













    method public void notifyRegistrationFailed(int, int, @NonNull android.telephony.CellIdentity, @NonNull String, int, int, int);













    method public void notifyServiceStateChanged(int, int, @NonNull android.telephony.ServiceState);













    method public void notifySignalStrengthChanged(int, int, @NonNull android.telephony.SignalStrength);













    method public void notifySrvccStateChanged(int, int);













    method public void notifyUserMobileDataStateChanged(int, int, boolean);













    method public void notifyVoiceActivationStateChanged(int, int, int);













    method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);













    method public void removeOnSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);













  }





























}































package android.telephony.emergency {

































core/java/android/content/Context.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -5104,7 +5104,6 @@ public abstract class Context {













     * {@link TelephonyRegistryManager}.















     * @hide















     */













    @SystemApi















    public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry";































    /**

































core/java/android/telephony/TelephonyRegistryManager.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -61,7 +61,6 @@ import java.util.concurrent.Executor;













 *















 * @hide















 */













@TestApi















public class TelephonyRegistryManager {































    private static final String TAG = "TelephonyRegistryManager";