am d7a35611: Merge "READ_SMS allows getLine1Number() [3/3]" into mnc-dev (668a5070) · Commits · e / os / android_frameworks_opt_telephony

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

+13 −4

Original line number	Diff line number	Diff line
		@@ -386,9 +386,18 @@ public class PhoneSubInfo {
		* Besides READ_PHONE_STATE, WRITE_SMS also allows apps to get phone numbers.
		*/
		private boolean checkReadPhoneNumber(String callingPackage, String message) {
		// Note checkReadPhoneState() may throw, so we need to do the appops check first.
		return (mAppOps.noteOp(AppOpsManager.OP_WRITE_SMS,
		Binder.getCallingUid(), callingPackage) == AppOpsManager.MODE_ALLOWED)
		\|\| checkReadPhoneState(callingPackage, message);
		// Default SMS app can always read it.
		if (mAppOps.noteOp(AppOpsManager.OP_WRITE_SMS,
		Binder.getCallingUid(), callingPackage) == AppOpsManager.MODE_ALLOWED) {
		return true;
		}
		try {
		return checkReadPhoneState(callingPackage, message);
		} catch (SecurityException e) {
		// Can be read with READ_SMS too.
		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.READ_SMS, message);
		return mAppOps.noteOp(AppOpsManager.OP_READ_SMS,
		Binder.getCallingUid(), callingPackage) == AppOpsManager.MODE_ALLOWED;
		}
		}
		}