commit af6641414ca20b637114b898edb2abbecbc252dd
author kholoud mohamed <kholoudm@google.com> Mon Mar 21 10:19:24 2022 +0000
committer Kholoud Mohamed <kholoudm@google.com> Mon Mar 21 10:50:29 2022 +0000
tree cc35bed0876c8b7c2a7f0453b92a72b8e1c2cbe5
parent ac0574781c8a7b80a7df22e3efabc1d2d943ca14

RESTRICT AUTOMERGE Fix newAPI lint error

Fixes: 225612636
Test: m -j out/soong/.intermediates/packages/apps/Launcher3/Launcher3/android_common/lint/lint-report.txt
Change-Id: Ib7f7df0010702b0f26d99bbd7b27ee38a6ed5e17

src/com/android/launcher3/model/StringCache.java

diff --git a/src/com/android/launcher3/model/StringCache.java b/src/com/android/launcher3/model/StringCache.java
index e0a1dff..2fc852d 100644
--- a/src/com/android/launcher3/model/StringCache.java
+++ b/src/com/android/launcher3/model/StringCache.java
@@ -18,6 +18,9 @@
 
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.os.Build;
+
+import androidx.annotation.RequiresApi;
 
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
@@ -214,13 +217,19 @@
 
     private String getEnterpriseString(
             Context context, String updatableStringId, int defaultStringId) {
-        DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
         return Utilities.ATLEAST_T
-                ? dpm.getResources().getString(
-                        updatableStringId, () -> context.getString(defaultStringId))
+                ? getUpdatableEnterpriseSting(context, updatableStringId, defaultStringId)
                 : context.getString(defaultStringId);
     }
 
+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+    private String getUpdatableEnterpriseSting(
+            Context context, String updatableStringId, int defaultStringId) {
+        DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
+        return dpm.getResources().getString(
+                updatableStringId, () -> context.getString(defaultStringId));
+    }
+
     @Override
     public StringCache clone() {
         StringCache clone = new StringCache();