am b32fe52c: am fe1fdacf: Merge "Clean up SIM CallManager APIs." into mnc-dev (42c93a18) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/TelecomManager.java

+0 −33

Original line number	Diff line number	Diff line
		@@ -476,39 +476,6 @@ public class TelecomManager {
		return null;
		}

		/**
		* Sets the SIM call manager to the specified phone account.
		*
		* @param accountHandle The phone account handle of the account to set as the sim call manager.
		* @hide
		*/
		public void setSimCallManager(PhoneAccountHandle accountHandle) {
		try {
		if (isServiceConnected()) {
		getTelecomService().setSimCallManager(accountHandle);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#setSimCallManager");
		}
		}

		/**
		* Returns the list of registered SIM call managers.
		*
		* @return List of registered SIM call managers.
		* @hide
		*/
		public List<PhoneAccountHandle> getSimCallManagers() {
		try {
		if (isServiceConnected()) {
		return getTelecomService().getSimCallManagers(mContext.getOpPackageName());
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#getSimCallManagers");
		}
		return new ArrayList<>();
		}

		/**
		* Returns the current connection manager. Apps must be prepared for this method to return
		* {@code null}, indicating that there currently exists no user-chosen default

+0 −10

Original line number	Diff line number	Diff line
		@@ -92,16 +92,6 @@ interface ITelecomService {
		*/
		PhoneAccountHandle getSimCallManager();

		/**
		* @see TelecomServiceImpl#setSimCallManager
		*/
		void setSimCallManager(in PhoneAccountHandle account);

		/**
		* @see TelecomServiceImpl#getSimCallManagers
		*/
		List<PhoneAccountHandle> getSimCallManagers(String callingPackage);

		/**
		* @see TelecomServiceImpl#registerPhoneAccount
		*/