Merge "Fix SafetyProtectionUtils" into udc-dev (b7793f58) · Commits · e / os / android_frameworks_base

core/java/android/util/SafetyProtectionUtils.java

+15 −9

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ public class SafetyProtectionUtils {
		* @hide
		*/
		public static boolean shouldShowSafetyProtectionResources(Context context) {
		try {
		return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
		SAFETY_PROTECTION_RESOURCES_ENABLED, false)
		&& context.getResources().getBoolean(
		@@ -47,7 +48,12 @@ public class SafetyProtectionUtils {
		.getIdentifier("config_safetyProtectionEnabled",
		"bool", "android"))
		&& context.getDrawable(android.R.drawable.ic_safety_protection) != null
		&& context.getString(android.R.string.safety_protection_display_text) != null
		&& !context.getString(android.R.string.safety_protection_display_text).isEmpty();
		&& !context.getString(
		android.R.string.safety_protection_display_text).isEmpty();
		} catch (Resources.NotFoundException e) {
		// We should expect the resources to not exist for non-pixel devices
		// (except for the OEMs that opt-in)
		return false;
		}
		}
		}