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();
