Apply new settings widget lib for the cbr main feature switch
apply the new settings widget lib for the emergency alert main feature
switch.
Bug: 183574149
Test: Manual
Change-Id: Idfdb2696056faf3dbe4ccb0061f2b61c33e94292
diff --git a/packages/SettingsLib/Utils/Android.bp b/packages/SettingsLib/Utils/Android.bp
index 1cf42ff..7d5eb69 100644
--- a/packages/SettingsLib/Utils/Android.bp
+++ b/packages/SettingsLib/Utils/Android.bp
@@ -13,6 +13,10 @@
srcs: ["src/**/*.java"],
resource_dirs: ["res"],
+ static_libs: [
+ "androidx.annotation_annotation",
+ ],
+
sdk_version: "system_current",
min_sdk_version: "21",
@@ -20,5 +24,6 @@
"//apex_available:platform",
"com.android.permission",
+ "com.android.cellbroadcast",
],
}
diff --git a/packages/SettingsLib/Utils/lint-baseline.xml b/packages/SettingsLib/Utils/lint-baseline.xml
deleted file mode 100644
index 172bde3..0000000
--- a/packages/SettingsLib/Utils/lint-baseline.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
-
- <issue
- id="NewApi"
- message="Call requires API level 23 (current min is 21): `android.content.Context#getSystemService`"
- errorLine1=" return context.getSystemService(UserManager.class).isManagedProfile(userId)"
- errorLine2=" ~~~~~~~~~~~~~~~~">
- <location
- file="frameworks/base/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java"
- line="58"
- column="24"/>
- </issue>
-
-</issues>
diff --git a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java
index 5dc0b72..cf45c0b 100644
--- a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java
+++ b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java
@@ -19,9 +19,12 @@
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
+import android.os.Build;
import android.os.UserManager;
import android.util.Log;
+import androidx.annotation.RequiresApi;
+
import com.android.settingslib.utils.R;
public class AppUtils {
@@ -49,6 +52,7 @@
* work app for accessibility purpose.
* If the app is in a work profile, then add a "work" prefix to the app name.
*/
+ @RequiresApi(Build.VERSION_CODES.M)
public static String getAppContentDescription(Context context, String packageName,
int userId) {
final CharSequence appLabel = getApplicationLabel(context.getPackageManager(), packageName);