Merge "Clear caller identify before registering and unregistering phone acct." into oc-dev (5688c193) · Commits · e / os / android_packages_services_Telecomm

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -397,7 +397,12 @@ public class TelecomServiceImpl {
		enforceRegisterMultiUser();
		}
		enforceUserHandleMatchesCaller(account.getAccountHandle());
		final long token = Binder.clearCallingIdentity();
		try {
		mPhoneAccountRegistrar.registerPhoneAccount(account);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		} catch (Exception e) {
		Log.e(this, e, "registerPhoneAccount %s", account);
		throw e;
		@@ -416,7 +421,12 @@ public class TelecomServiceImpl {
		enforcePhoneAccountModificationForPackage(
		accountHandle.getComponentName().getPackageName());
		enforceUserHandleMatchesCaller(accountHandle);
		final long token = Binder.clearCallingIdentity();
		try {
		mPhoneAccountRegistrar.unregisterPhoneAccount(accountHandle);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		} catch (Exception e) {
		Log.e(this, e, "unregisterPhoneAccount %s", accountHandle);
		throw e;