From af6641414ca20b637114b898edb2abbecbc252dd Mon Sep 17 00:00:00 2001 From: kholoud mohamed Date: Mon, 21 Mar 2022 10:19:24 +0000 Subject: [PATCH] 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 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/model/StringCache.java b/src/com/android/launcher3/model/StringCache.java index e0a1dff5e0..2fc852dcce 100644 --- a/src/com/android/launcher3/model/StringCache.java +++ b/src/com/android/launcher3/model/StringCache.java @@ -18,6 +18,9 @@ package com.android.launcher3.model; 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 @@ public class StringCache { 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();