Merge "Fix security vulnerability of TelecomManager#getPhoneAccountsForPackage" (810a90c5) · Commits · e / os / android_packages_services_Telecomm

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

+17 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ import android.text.TextUtils;
		import android.util.EventLog;

		import com.android.internal.telecom.ITelecomService;
		import com.android.internal.telephony.TelephonyPermissions;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.server.telecom.components.UserCallIntentProcessorFactory;
		import com.android.server.telecom.settings.BlockedNumbersActivity;
		@@ -278,6 +277,23 @@ public class TelecomServiceImpl {

		@Override
		public List<PhoneAccountHandle> getPhoneAccountsForPackage(String packageName) {
		//TODO: Deprecate this in S
		try {
		enforceCallingPackage(packageName);
		} catch (SecurityException se1) {
		EventLog.writeEvent(0x534e4554, "153995334", Binder.getCallingUid(),
		"getPhoneAccountsForPackage: invalid calling package");
		throw se1;
		}

		try {
		enforcePermission(READ_PRIVILEGED_PHONE_STATE);
		} catch (SecurityException se2) {
		EventLog.writeEvent(0x534e4554, "153995334", Binder.getCallingUid(),
		"getPhoneAccountsForPackage: no permission");
		throw se2;
		}

		synchronized (mLock) {
		final UserHandle callingUserHandle = Binder.getCallingUserHandle();
		long token = Binder.clearCallingIdentity();