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
This commit is contained in:
kholoud mohamed
2022-03-21 10:19:24 +00:00
committed by Kholoud Mohamed
parent ac0574781c
commit af6641414c

View File

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