Merge "Clear calling identity before calling getSubscriptionUserHandle" (71f0a1f4) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SmsPermissions.java

+18 −2

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,15 @@ public class SmsPermissions {
	*/		*/
	public boolean checkCallingOrSelfCanGetSmscAddress(String callingPackage, String message) {		public boolean checkCallingOrSelfCanGetSmscAddress(String callingPackage, String message) {
	// Allow it to the default SMS app always.		// Allow it to the default SMS app always.
	if (!isCallerDefaultSmsPackage(callingPackage)) {		boolean isDefaultSmsPackage;
			final long identity = Binder.clearCallingIdentity();
			try {
			isDefaultSmsPackage = isCallerDefaultSmsPackage(callingPackage);
			} finally {
			Binder.restoreCallingIdentity(identity);
			}

			if (!isDefaultSmsPackage) {
	TelephonyPermissions		TelephonyPermissions
	.enforceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(		.enforceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
	mContext, mPhone.getSubId(), message);		mContext, mPhone.getSubId(), message);
	@@ -153,7 +161,15 @@ public class SmsPermissions {
	*/		*/
	public boolean checkCallingOrSelfCanSetSmscAddress(String callingPackage, String message) {		public boolean checkCallingOrSelfCanSetSmscAddress(String callingPackage, String message) {
	// Allow it to the default SMS app always.		// Allow it to the default SMS app always.
	if (!isCallerDefaultSmsPackage(callingPackage)) {		boolean isDefaultSmsPackage;
			final long identity = Binder.clearCallingIdentity();
			try {
			isDefaultSmsPackage = isCallerDefaultSmsPackage(callingPackage);
			} finally {
			Binder.restoreCallingIdentity(identity);
			}

			if (!isDefaultSmsPackage) {
	// Allow it with MODIFY_PHONE_STATE or Carrier Privileges		// Allow it with MODIFY_PHONE_STATE or Carrier Privileges
	TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(		TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
	mContext, mPhone.getSubId(), message);		mContext, mPhone.getSubId(), message);