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

Commit 1af91e3d authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Re-add removed APIs per API council feedback." am: a94a71af am: 7085118c 

am: db0e0f8c

Change-Id: If4d0ac8815596756774445c558a9456968c4e990
parents 17807ec5 db0e0f8c

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -5499,7 +5499,10 @@ package android.telephony { 
    method public boolean handlePinMmi(java.lang.String);

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

    method public boolean isDataConnectivityPossible();

    method public deprecated boolean isIdle();

    method public deprecated boolean isOffhook();

    method public deprecated boolean isRadioOn();

    method public deprecated boolean isRinging();

    method public boolean isVideoCallingEnabled();

    method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);

    method public boolean needsOtaServiceProvisioning();

api/system-removed.txt

+0 −3
Original line number Diff line number Diff line
@@ -116,9 +116,6 @@ package android.telephony { 
  public class TelephonyManager {

    method public deprecated void answerRingingCall();

    method public deprecated boolean endCall();

    method public deprecated boolean isIdle();

    method public deprecated boolean isOffhook();

    method public deprecated boolean isRinging();

    method public deprecated void silenceRinger();

  }

telephony/java/android/telephony/TelephonyManager.java

+9 −6
Original line number Diff line number Diff line
@@ -6619,7 +6619,7 @@ public class TelephonyManager { 
    }



    /**

     * @removed Use {@link android.telecom.TelecomManager#isInCall} instead

     * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead

     * @hide

     */

    @Deprecated
@@ -6629,11 +6629,12 @@ public class TelephonyManager { 
            android.Manifest.permission.READ_PHONE_STATE

    })

    public boolean isOffhook() {

        return false;

        TelecomManager tm = (TelecomManager) mContext.getSystemService(TELECOM_SERVICE);

        return tm.isInCall();

    }



    /**

     * @removed Use {@link android.telecom.TelecomManager#isRinging} instead

     * @deprecated Use {@link android.telecom.TelecomManager#isRinging} instead

     * @hide

     */

    @Deprecated
@@ -6643,11 +6644,12 @@ public class TelephonyManager { 
            android.Manifest.permission.READ_PHONE_STATE

    })

    public boolean isRinging() {

        return false;

        TelecomManager tm = (TelecomManager) mContext.getSystemService(TELECOM_SERVICE);

        return tm.isRinging();

    }



    /**

     * @removed Use {@link android.telecom.TelecomManager#isInCall} instead

     * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead

     * @hide

     */

    @Deprecated
@@ -6657,7 +6659,8 @@ public class TelephonyManager { 
            android.Manifest.permission.READ_PHONE_STATE

    })

    public boolean isIdle() {

        return true;

        TelecomManager tm = (TelecomManager) mContext.getSystemService(TELECOM_SERVICE);

        return !tm.isInCall();

    }



    /**