Merge "Revert^2 "Disable sms otp when device is fully managed"" into main (97ab1199) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.admin.DevicePolicyManager;
		import android.compat.annotation.ChangeId;
		import android.compat.annotation.EnabledAfter;
		import android.compat.annotation.UnsupportedAppUsage;
		@@ -430,13 +431,25 @@ public final class Telephony {
		* Determine whether a given method should be checked for an OTP
		* @hide
		*/
		public static boolean shouldCheckForOtp(String message) {
		if (!Flags.redactOtpSms()) {
		public static boolean shouldCheckForOtp(Context context, String message) {
		if (!isOtpRedactionEnabled(context)) {
		return false;
		}
		return CONTAINS_NUMBER.reset(message).find();
		}

		/**
		* Checks if OTP redaction in SMS is enabled
		* @hide
		*/
		public static boolean isOtpRedactionEnabled(Context context) {
		if (!Flags.redactOtpSms()) {
		return false;
		}
		DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
		return dpm == null \|\| !dpm.isDeviceManaged();
		}

		/**
		* Return cursor for table query.
		* @hide

+1 −0

Original line number	Diff line number	Diff line
		@@ -1050,6 +1050,7 @@
		<!-- Permission required for CTS test - CtsMediaProjectionTestCases -->
		<uses-permission android:name="android.permission.MANAGE_MEDIA_PROJECTION" />


		<application
		android:label="@string/app_label"
		android:theme="@android:style/Theme.DeviceDefault.DayNight"

+5 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.annotation.SuppressLint;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.PendingIntent;
		import android.app.admin.DevicePolicyManager;
		import android.app.role.RoleManager;
		import android.companion.AssociationInfo;
		import android.companion.CompanionDeviceManager;
		@@ -3820,6 +3821,10 @@ public final class SmsManager {
		return true;
		}

		if (userContext.getSystemService(DevicePolicyManager.class).isDeviceManaged()) {
		return true;
		}

		// All system apps have access to OTPs in SMS messages
		if (isSystemApp(userContext, packageName)) {
		return true;