Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fdd409c authored by Yi-an Chen's avatar Yi-an Chen
Browse files

Fix SafetyProtectionUtils 

This util was expecting getString() and getDrawable() to return null
when resource is not found but it's actually throwing an exception.
Changed the logic in this class to expect an exception when the
resource it not available

Bug: 269874157
Test: SafetyProtectionTest
Change-Id: I0f3490b59dc2427c2889e25fea529c85d3e1f150
parent 25126020

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;

        }

    }

}