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

Merge "Re-add removed APIs per API council feedback." am: a94a71af13 am: 7085118cfc

Browse Source 
am: db0e0f8c57

Change-Id: If4d0ac8815596756774445c558a9456968c4e990
This commit is contained in:
Tyler Gunn
2018-10-25 18:55:47 -07:00
committed by android-build-merger
parent 17807ec5e7 db0e0f8c57
commit 1af91e3de8
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

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

3
api/system-removed.txt
View File

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

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

@@ -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();
}
/**