From 1f1a4348da3c59661df7a12e971793081bd75d5d Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Thu, 21 Nov 2019 17:14:28 -0800 Subject: [PATCH] Remove usage of ITelecomService.getCallState() hidden API Get the call state using TelecomManager which should be the same Bug: 140908357 Test: Build Change-Id: Ib975f5441b081586e7d595209ca0c1345b854cfc --- .../android/telephony/TelephonyManager.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 1a5796bb810db..72e76ee4b8f8c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -86,7 +86,6 @@ import android.util.Pair; import com.android.ims.internal.IImsServiceFeatureCallback; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.telecom.ITelecomService; import com.android.internal.telephony.CellNetworkScanResult; import com.android.internal.telephony.INumberVerificationCallback; import com.android.internal.telephony.IOns; @@ -5034,13 +5033,11 @@ public class TelephonyManager { * @return the current call state. */ public @CallState int getCallState() { - try { - ITelecomService telecom = getTelecomService(); - if (telecom != null) { - return telecom.getCallState(); + if (mContext != null) { + TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class); + if (telecomManager != null) { + return telecomManager.getCallState(); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getCallState", e); } return CALL_STATE_IDLE; } @@ -5210,13 +5207,6 @@ public class TelephonyManager { return ITelephony.Stub.asInterface(ServiceManager.getService(Context.TELEPHONY_SERVICE)); } - /** - * @hide - */ - private ITelecomService getTelecomService() { - return ITelecomService.Stub.asInterface(ServiceManager.getService(TELECOM_SERVICE)); - } - private ITelephonyRegistry getTelephonyRegistry() { return ITelephonyRegistry.Stub.asInterface(ServiceManager.getService("telephony.registry")); }