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

Commit 3b078376 authored by Baligh Uddin's avatar Baligh Uddin
Browse files

Revert "Fix stuck automerge." 

This reverts commit a5899657.

Change-Id: Icf849bd2815618e548eba795f4649dddf85c3ad3
parent a5899657

api/current.txt

+30 −3
Original line number Diff line number Diff line
@@ -37365,48 +37365,70 @@ package android.telephony { 








  public class TelephonyManager {









    method public boolean canChangeDtmfToneLength();









    method public android.telephony.TelephonyManager createForSubscriptionId(int);









    method public java.util.List<android.telephony.CellInfo> getAllCellInfo();









    method public int getCallState();









    method public int getCallState(int);









    method public android.telephony.CellLocation getCellLocation();









    method public int getDataActivity();









    method public int getDataNetworkType();









    method public int getDataNetworkType(int);









    method public int getDataState();









    method public java.lang.String getDeviceId();









    method public java.lang.String getDeviceId(int);









    method public java.lang.String getDeviceSoftwareVersion();









    method public java.lang.String getGroupIdLevel1();









    method public java.lang.String getGroupIdLevel1(int);









    method public java.lang.String getIccAuthentication(int, int, java.lang.String);









    method public java.lang.String getIccAuthentication(int, int, int, java.lang.String);









    method public java.lang.String getLine1AlphaTag(int);









    method public java.lang.String getLine1Number();









    method public java.lang.String getLine1Number(int);









    method public java.lang.String getMmsUAProfUrl();









    method public java.lang.String getMmsUserAgent();









    method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();









    method public java.lang.String getNetworkCountryIso();









    method public java.lang.String getNetworkCountryIso(int);









    method public java.lang.String getNetworkOperator();









    method public java.lang.String getNetworkOperator(int);









    method public java.lang.String getNetworkOperatorName();









    method public java.lang.String getNetworkOperatorName(int);









    method public int getNetworkType();









    method public int getNetworkType(int);









    method public int getPhoneCount();









    method public int getPhoneType();









    method public java.lang.String getSimCountryIso();









    method public java.lang.String getSimCountryIso(int);









    method public java.lang.String getSimOperator();









    method public java.lang.String getSimOperator(int);









    method public java.lang.String getSimOperatorName();









    method public java.lang.String getSimOperatorName(int);









    method public java.lang.String getSimSerialNumber();









    method public java.lang.String getSimSerialNumber(int);









    method public int getSimState();









    method public java.lang.String getSubscriberId();









    method public java.lang.String getSubscriberId(int);









    method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();









    method public java.lang.String getVoiceMailAlphaTag();









    method public java.lang.String getVoiceMailAlphaTag(int);









    method public java.lang.String getVoiceMailNumber();









    method public int getVoiceNetworkType();









    method public java.lang.String getVoiceMailNumber(int);









    method public int getVoiceNetworkType(int);









    method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);









    method public boolean hasCarrierPrivileges();









    method public boolean hasCarrierPrivileges(int);









    method public boolean hasIccCard();









    method public boolean iccCloseLogicalChannel(int);









    method public boolean iccCloseLogicalChannel(int, int);









    method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);









    method public byte[] iccExchangeSimIO(int, int, int, int, int, int, java.lang.String);









    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);









    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(int, java.lang.String);









    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);









    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, int, java.lang.String);









    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);









    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, int, java.lang.String);









    method public boolean isHearingAidCompatibilitySupported();









    method public boolean isNetworkRoaming();









    method public boolean isNetworkRoaming(int);









    method public boolean isSmsCapable();









    method public boolean isTtyModeSupported();









    method public boolean isVoiceCapable();








@@ -37414,10 +37436,15 @@ package android.telephony {







    method public boolean isWorldPhone();









    method public void listen(android.telephony.PhoneStateListener, int);









    method public java.lang.String sendEnvelopeWithStatus(java.lang.String);









    method public java.lang.String sendEnvelopeWithStatus(int, java.lang.String);









    method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);









    method public boolean setLine1NumberForDisplay(int, java.lang.String, java.lang.String);









    method public boolean setOperatorBrandOverride(java.lang.String);









    method public boolean setOperatorBrandOverride(int, java.lang.String);









    method public boolean setPreferredNetworkTypeToGlobal();









    method public boolean setPreferredNetworkTypeToGlobal(int);









    method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);









    method public boolean setVoiceMailNumber(int, java.lang.String, java.lang.String);









    field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";









    field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";









    field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

























api/system-current.txt



+30
−3






























Original line number
Diff line number
Diff line







@@ -40302,7 +40302,6 @@ package android.telephony {







    method public boolean canChangeDtmfToneLength();









    method public int checkCarrierPrivilegesForPackage(java.lang.String);









    method public int checkCarrierPrivilegesForPackageAnyPhone(java.lang.String);









    method public android.telephony.TelephonyManager createForSubscriptionId(int);









    method public void dial(java.lang.String);









    method public boolean disableDataConnectivity();









    method public boolean enableDataConnectivity();








@@ -40310,6 +40309,7 @@ package android.telephony {







    method public boolean endCall();









    method public java.util.List<android.telephony.CellInfo> getAllCellInfo();









    method public int getCallState();









    method public int getCallState(int);









    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);









    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);









    method public java.lang.String getCdmaMdn();








@@ -40322,47 +40322,69 @@ package android.telephony {







    method public int getDataActivity();









    method public boolean getDataEnabled();









    method public boolean getDataEnabled(int);









    method public int getDataNetworkType();









    method public int getDataNetworkType(int);









    method public int getDataState();









    method public java.lang.String getDeviceId();









    method public java.lang.String getDeviceId(int);









    method public java.lang.String getDeviceSoftwareVersion();









    method public java.lang.String getGroupIdLevel1();









    method public java.lang.String getGroupIdLevel1(int);









    method public java.lang.String getIccAuthentication(int, int, java.lang.String);









    method public java.lang.String getIccAuthentication(int, int, int, java.lang.String);









    method public java.lang.String getLine1AlphaTag(int);









    method public java.lang.String getLine1Number();









    method public java.lang.String getLine1Number(int);









    method public java.lang.String getMmsUAProfUrl();









    method public java.lang.String getMmsUserAgent();









    method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();









    method public java.lang.String getNetworkCountryIso();









    method public java.lang.String getNetworkCountryIso(int);









    method public java.lang.String getNetworkOperator();









    method public java.lang.String getNetworkOperator(int);









    method public java.lang.String getNetworkOperatorName();









    method public java.lang.String getNetworkOperatorName(int);









    method public int getNetworkType();









    method public int getNetworkType(int);









    method public int getPhoneCount();









    method public int getPhoneType();









    method public java.lang.String getSimCountryIso();









    method public java.lang.String getSimCountryIso(int);









    method public java.lang.String getSimOperator();









    method public java.lang.String getSimOperator(int);









    method public java.lang.String getSimOperatorName();









    method public java.lang.String getSimOperatorName(int);









    method public java.lang.String getSimSerialNumber();









    method public java.lang.String getSimSerialNumber(int);









    method public int getSimState();









    method public java.lang.String getSubscriberId();









    method public java.lang.String getSubscriberId(int);









    method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();









    method public java.lang.String getVoiceMailAlphaTag();









    method public java.lang.String getVoiceMailAlphaTag(int);









    method public java.lang.String getVoiceMailNumber();









    method public int getVoiceNetworkType();









    method public java.lang.String getVoiceMailNumber(int);









    method public int getVoiceNetworkType(int);









    method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);









    method public boolean handlePinMmi(java.lang.String);









    method public boolean handlePinMmiForSubscriber(int, java.lang.String);









    method public boolean hasCarrierPrivileges();









    method public boolean hasCarrierPrivileges(int);









    method public boolean hasIccCard();









    method public boolean iccCloseLogicalChannel(int);









    method public boolean iccCloseLogicalChannel(int, int);









    method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);









    method public byte[] iccExchangeSimIO(int, int, int, int, int, int, java.lang.String);









    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);









    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(int, java.lang.String);









    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);









    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, int, java.lang.String);









    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);









    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, int, java.lang.String);









    method public boolean isDataConnectivityPossible();









    method public boolean isHearingAidCompatibilitySupported();









    method public boolean isIdle();









    method public boolean isNetworkRoaming();









    method public boolean isNetworkRoaming(int);









    method public boolean isOffhook();









    method public boolean isRadioOn();









    method public boolean isRinging();








@@ -40375,14 +40397,19 @@ package android.telephony {







    method public void listen(android.telephony.PhoneStateListener, int);









    method public boolean needsOtaServiceProvisioning();









    method public java.lang.String sendEnvelopeWithStatus(java.lang.String);









    method public java.lang.String sendEnvelopeWithStatus(int, java.lang.String);









    method public void setDataEnabled(boolean);









    method public void setDataEnabled(int, boolean);









    method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);









    method public boolean setLine1NumberForDisplay(int, java.lang.String, java.lang.String);









    method public boolean setOperatorBrandOverride(java.lang.String);









    method public boolean setOperatorBrandOverride(int, java.lang.String);









    method public boolean setPreferredNetworkTypeToGlobal();









    method public boolean setPreferredNetworkTypeToGlobal(int);









    method public boolean setRadio(boolean);









    method public boolean setRadioPower(boolean);









    method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);









    method public boolean setVoiceMailNumber(int, java.lang.String, java.lang.String);









    method public void silenceRinger();









    method public boolean supplyPin(java.lang.String);









    method public int[] supplyPinReportResult(java.lang.String);

























api/test-current.txt



+30
−3






























Original line number
Diff line number
Diff line







@@ -37443,48 +37443,70 @@ package android.telephony {















  public class TelephonyManager {









    method public boolean canChangeDtmfToneLength();









    method public android.telephony.TelephonyManager createForSubscriptionId(int);









    method public java.util.List<android.telephony.CellInfo> getAllCellInfo();









    method public int getCallState();









    method public int getCallState(int);









    method public android.telephony.CellLocation getCellLocation();









    method public int getDataActivity();









    method public int getDataNetworkType();









    method public int getDataNetworkType(int);









    method public int getDataState();









    method public java.lang.String getDeviceId();









    method public java.lang.String getDeviceId(int);









    method public java.lang.String getDeviceSoftwareVersion();









    method public java.lang.String getGroupIdLevel1();









    method public java.lang.String getGroupIdLevel1(int);









    method public java.lang.String getIccAuthentication(int, int, java.lang.String);









    method public java.lang.String getIccAuthentication(int, int, int, java.lang.String);









    method public java.lang.String getLine1AlphaTag(int);









    method public java.lang.String getLine1Number();









    method public java.lang.String getLine1Number(int);









    method public java.lang.String getMmsUAProfUrl();









    method public java.lang.String getMmsUserAgent();









    method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();









    method public java.lang.String getNetworkCountryIso();









    method public java.lang.String getNetworkCountryIso(int);









    method public java.lang.String getNetworkOperator();









    method public java.lang.String getNetworkOperator(int);









    method public java.lang.String getNetworkOperatorName();









    method public java.lang.String getNetworkOperatorName(int);









    method public int getNetworkType();









    method public int getNetworkType(int);









    method public int getPhoneCount();









    method public int getPhoneType();









    method public java.lang.String getSimCountryIso();









    method public java.lang.String getSimCountryIso(int);









    method public java.lang.String getSimOperator();









    method public java.lang.String getSimOperator(int);









    method public java.lang.String getSimOperatorName();









    method public java.lang.String getSimOperatorName(int);









    method public java.lang.String getSimSerialNumber();









    method public java.lang.String getSimSerialNumber(int);









    method public int getSimState();









    method public java.lang.String getSubscriberId();









    method public java.lang.String getSubscriberId(int);









    method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();









    method public java.lang.String getVoiceMailAlphaTag();









    method public java.lang.String getVoiceMailAlphaTag(int);









    method public java.lang.String getVoiceMailNumber();









    method public int getVoiceNetworkType();









    method public java.lang.String getVoiceMailNumber(int);









    method public int getVoiceNetworkType(int);









    method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);









    method public boolean hasCarrierPrivileges();









    method public boolean hasCarrierPrivileges(int);









    method public boolean hasIccCard();









    method public boolean iccCloseLogicalChannel(int);









    method public boolean iccCloseLogicalChannel(int, int);









    method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);









    method public byte[] iccExchangeSimIO(int, int, int, int, int, int, java.lang.String);









    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);









    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(int, java.lang.String);









    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);









    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, int, java.lang.String);









    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);









    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, int, java.lang.String);









    method public boolean isHearingAidCompatibilitySupported();









    method public boolean isNetworkRoaming();









    method public boolean isNetworkRoaming(int);









    method public boolean isSmsCapable();









    method public boolean isTtyModeSupported();









    method public boolean isVoiceCapable();








@@ -37492,10 +37514,15 @@ package android.telephony {







    method public boolean isWorldPhone();









    method public void listen(android.telephony.PhoneStateListener, int);









    method public java.lang.String sendEnvelopeWithStatus(java.lang.String);









    method public java.lang.String sendEnvelopeWithStatus(int, java.lang.String);









    method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);









    method public boolean setLine1NumberForDisplay(int, java.lang.String, java.lang.String);









    method public boolean setOperatorBrandOverride(java.lang.String);









    method public boolean setOperatorBrandOverride(int, java.lang.String);









    method public boolean setPreferredNetworkTypeToGlobal();









    method public boolean setPreferredNetworkTypeToGlobal(int);









    method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);









    method public boolean setVoiceMailNumber(int, java.lang.String, java.lang.String);









    field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";









    field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";









    field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";