Merge "log callingPackage for all public TelecomManager API's (2/2)" (dea43b2c) · Commits · e / os / android_frameworks_base

cmds/telecom/src/com/android/commands/telecom/Telecom.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public final class Telecom extends BaseCommand {

		(new Telecom()).run(args);
		}

		private static final String CALLING_PACKAGE = Telecom.class.getPackageName();
		private static final String COMMAND_SET_PHONE_ACCOUNT_ENABLED = "set-phone-account-enabled";
		private static final String COMMAND_SET_PHONE_ACCOUNT_DISABLED = "set-phone-account-disabled";
		private static final String COMMAND_REGISTER_PHONE_ACCOUNT = "register-phone-account";
		@@ -286,7 +286,7 @@ public final class Telecom extends BaseCommand {
		final String label = nextArgRequired();
		PhoneAccount account = PhoneAccount.builder(handle, label)
		.setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER).build();
		mTelecomService.registerPhoneAccount(account);
		mTelecomService.registerPhoneAccount(account, CALLING_PACKAGE);
		System.out.println("Success - " + handle + " registered.");
		}

		@@ -316,7 +316,7 @@ public final class Telecom extends BaseCommand {
		.addSupportedUriScheme(PhoneAccount.SCHEME_TEL)
		.addSupportedUriScheme(PhoneAccount.SCHEME_VOICEMAIL)
		.build();
		mTelecomService.registerPhoneAccount(account);
		mTelecomService.registerPhoneAccount(account, CALLING_PACKAGE);
		System.out.println("Success - " + handle + " registered.");
		}

		@@ -358,7 +358,7 @@ public final class Telecom extends BaseCommand {

		private void runUnregisterPhoneAccount() throws RemoteException {
		final PhoneAccountHandle handle = getPhoneAccountHandleFromArgs();
		mTelecomService.unregisterPhoneAccount(handle);
		mTelecomService.unregisterPhoneAccount(handle, CALLING_PACKAGE);
		System.out.println("Success - " + handle + " unregistered.");
		}

		@@ -395,11 +395,11 @@ public final class Telecom extends BaseCommand {
		}

		private void runGetDefaultDialer() throws RemoteException {
		System.out.println(mTelecomService.getDefaultDialerPackage());
		System.out.println(mTelecomService.getDefaultDialerPackage(CALLING_PACKAGE));
		}

		private void runGetSystemDialer() throws RemoteException {
		System.out.println(mTelecomService.getSystemDialerPackage());
		System.out.println(mTelecomService.getSystemDialerPackage(CALLING_PACKAGE));
		}

		private void runWaitOnHandler() throws RemoteException {

telecomm/java/android/telecom/TelecomManager.java

+13 −11

Original line number	Diff line number	Diff line
		@@ -1179,7 +1179,7 @@ public class TelecomManager {
		if (service != null) {
		try {
		return service.getSimCallManager(
		SubscriptionManager.getDefaultSubscriptionId());
		SubscriptionManager.getDefaultSubscriptionId(), mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#getSimCallManager");
		}
		@@ -1201,7 +1201,7 @@ public class TelecomManager {
		ITelecomService service = getTelecomService();
		if (service != null) {
		try {
		return service.getSimCallManager(subscriptionId);
		return service.getSimCallManager(subscriptionId, mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#getSimCallManager");
		}
		@@ -1225,7 +1225,7 @@ public class TelecomManager {
		ITelecomService service = getTelecomService();
		if (service != null) {
		try {
		return service.getSimCallManagerForUser(userId);
		return service.getSimCallManagerForUser(userId, mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#getSimCallManagerForUser");
		}
		@@ -1481,7 +1481,7 @@ public class TelecomManager {
		ITelecomService service = getTelecomService();
		if (service != null) {
		try {
		service.registerPhoneAccount(account);
		service.registerPhoneAccount(account, mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#registerPhoneAccount", e);
		}
		@@ -1497,7 +1497,7 @@ public class TelecomManager {
		ITelecomService service = getTelecomService();
		if (service != null) {
		try {
		service.unregisterPhoneAccount(accountHandle);
		service.unregisterPhoneAccount(accountHandle, mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#unregisterPhoneAccount", e);
		}
		@@ -1578,7 +1578,7 @@ public class TelecomManager {
		ITelecomService service = getTelecomService();
		if (service != null) {
		try {
		return service.getDefaultDialerPackage();
		return service.getDefaultDialerPackage(mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException attempting to get the default dialer package name.", e);
		}
		@@ -1652,7 +1652,7 @@ public class TelecomManager {
		ITelecomService service = getTelecomService();
		if (service != null) {
		try {
		return service.getSystemDialerPackage();
		return service.getSystemDialerPackage(mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException attempting to get the system dialer package name.", e);
		}
		@@ -2057,7 +2057,8 @@ public class TelecomManager {
		"acceptHandover for API > O-MR1");
		return;
		}
		service.addNewIncomingCall(phoneAccount, extras == null ? new Bundle() : extras);
		service.addNewIncomingCall(phoneAccount, extras == null ? new Bundle() : extras,
		mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException adding a new incoming call: " + phoneAccount, e);
		}
		@@ -2099,7 +2100,8 @@ public class TelecomManager {
		if (service != null) {
		try {
		service.addNewIncomingConference(
		phoneAccount, extras == null ? new Bundle() : extras);
		phoneAccount, extras == null ? new Bundle() : extras,
		mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException adding a new incoming conference: " + phoneAccount, e);
		}
		@@ -2395,7 +2397,7 @@ public class TelecomManager {
		Intent result = null;
		if (service != null) {
		try {
		result = service.createManageBlockedNumbersIntent();
		result = service.createManageBlockedNumbersIntent(mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#createManageBlockedNumbersIntent", e);
		}
		@@ -2552,7 +2554,7 @@ public class TelecomManager {
		ITelecomService service = getTelecomService();
		if (service != null) {
		try {
		service.acceptHandover(srcAddr, videoState, destAcct);
		service.acceptHandover(srcAddr, videoState, destAcct, mContext.getPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException acceptHandover: " + e);
		}

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+14 −10

Original line number	Diff line number	Diff line
		@@ -99,22 +99,22 @@ interface ITelecomService {
		/**
		* @see TelecomServiceImpl#getSimCallManager
		*/
		PhoneAccountHandle getSimCallManager(int subId);
		PhoneAccountHandle getSimCallManager(int subId, String callingPackage);

		/**
		* @see TelecomServiceImpl#getSimCallManagerForUser
		*/
		PhoneAccountHandle getSimCallManagerForUser(int userId);
		PhoneAccountHandle getSimCallManagerForUser(int userId, String callingPackage);

		/**
		* @see TelecomServiceImpl#registerPhoneAccount
		*/
		void registerPhoneAccount(in PhoneAccount metadata);
		void registerPhoneAccount(in PhoneAccount metadata, String callingPackage);

		/**
		* @see TelecomServiceImpl#unregisterPhoneAccount
		*/
		void unregisterPhoneAccount(in PhoneAccountHandle account);
		void unregisterPhoneAccount(in PhoneAccountHandle account, String callingPackage);

		/**
		* @see TelecomServiceImpl#clearAccounts
		@@ -147,7 +147,7 @@ interface ITelecomService {
		/**
		* @see TelecomServiceImpl#getDefaultDialerPackage
		*/
		String getDefaultDialerPackage();
		String getDefaultDialerPackage(String callingPackage);

		/**
		* @see TelecomServiceImpl#getDefaultDialerPackage
		@@ -157,7 +157,7 @@ interface ITelecomService {
		/**
		* @see TelecomServiceImpl#getSystemDialerPackage
		*/
		String getSystemDialerPackage();
		String getSystemDialerPackage(String callingPackage);

		/**
		* @see TelecomServiceImpl#dumpCallAnalytics
		@@ -255,12 +255,15 @@ interface ITelecomService {
		/**
		* @see TelecomServiceImpl#addNewIncomingCall
		*/
		void addNewIncomingCall(in PhoneAccountHandle phoneAccount, in Bundle extras);
		void addNewIncomingCall(in PhoneAccountHandle phoneAccount, in Bundle extras,
		String callingPackage);

		/**
		* @see TelecomServiceImpl#addNewIncomingConference
		*/
		void addNewIncomingConference(in PhoneAccountHandle phoneAccount, in Bundle extras);
		void addNewIncomingConference(in PhoneAccountHandle phoneAccount, in Bundle extras,
		String callingPackage);


		/**
		* @see TelecomServiceImpl#addNewUnknownCall
		@@ -296,7 +299,7 @@ interface ITelecomService {
		/**
		* @see TelecomServiceImpl#createManageBlockedNumbersIntent
		**/
		Intent createManageBlockedNumbersIntent();
		Intent createManageBlockedNumbersIntent(String callingPackage);

		/**
		* @see TelecomServiceImpl#createLaunchEmergencyDialerIntent
		@@ -323,7 +326,8 @@ interface ITelecomService {
		/**
		* @see TelecomServiceImpl#acceptHandover
		*/
		void acceptHandover(in Uri srcAddr, int videoState, in PhoneAccountHandle destAcct);
		void acceptHandover(in Uri srcAddr, int videoState, in PhoneAccountHandle destAcct,
		String callingPackage);

		/**
		* @see TelecomServiceImpl#setTestEmergencyPhoneAccountPackageNameFilter