PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RESTRICT AUTOMERGE Fix newAPI lint error am: af6641414c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17292063

Change-Id: Id7ed68153d53dd2238c27180495110bc46badde3
This commit is contained in:
kholoud mohamed
2022-03-21 13:13:03 +00:00
committed by Automerger Merge Worker
parent ba39424c6b af6641414c
commit 5259e7bcff
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/model/StringCache.java
+12 -3
View File
@@ -18,6 +18,9 @@ package com.android.launcher3.model;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.os.Build;
import androidx.annotation.RequiresApi;
import com.android.launcher3.R; import com.android.launcher3.R;
import com.android.launcher3.Utilities; import com.android.launcher3.Utilities;
@@ -214,13 +217,19 @@ public class StringCache {
private String getEnterpriseString( private String getEnterpriseString(
Context context, String updatableStringId, int defaultStringId) { Context context, String updatableStringId, int defaultStringId) {
DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
return Utilities.ATLEAST_T return Utilities.ATLEAST_T
? dpm.getResources().getString( ? getUpdatableEnterpriseSting(context, updatableStringId, defaultStringId)
updatableStringId, () -> context.getString(defaultStringId))
: context.getString(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 @Override
public StringCache clone() { public StringCache clone() {
StringCache clone = new StringCache(); StringCache clone = new StringCache();