Merge "Add additional permission check" am: a58ac65d7d (824069b5) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/TelecomServiceImpl.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,12 @@ public class TelecomServiceImpl {
		boolean includeDisabledAccounts, String callingPackage) {
		try {
		Log.startSession("TSI.gCCPA");
		if (!canReadPhoneState(callingPackage, "getDefaultOutgoingPhoneAccount")) {
		if (includeDisabledAccounts &&
		!canReadPrivilegedPhoneState(
		callingPackage, "getCallCapablePhoneAccounts")) {
		return Collections.emptyList();
		}
		if (!canReadPhoneState(callingPackage, "getCallCapablePhoneAccounts")) {
		return Collections.emptyList();
		}
		synchronized (mLock) {
		@@ -2027,6 +2032,17 @@ public class TelecomServiceImpl {
		}
		}

		private boolean canReadPrivilegedPhoneState(String callingPackage, String message) {
		// The system/default dialer can always read phone state - so that emergency calls will
		// still work.
		if (isPrivilegedDialerCalling(callingPackage)) {
		return true;
		}

		mContext.enforceCallingOrSelfPermission(READ_PRIVILEGED_PHONE_STATE, message);
		return true;
		}

		private boolean isDialerOrPrivileged(String callingPackage, String message) {
		// The system/default dialer can always read phone state - so that emergency calls will
		// still work.