From f9784d3729fd7160799e823ec99e473e308c3068 Mon Sep 17 00:00:00 2001 From: Pranav Vashi Date: Tue, 10 Dec 2024 23:35:51 +0530 Subject: [PATCH] OmniJawsClient: Clean up unnecessary check Signed-off-by: Pranav Vashi Signed-off-by: Dmitrii Signed-off-by: MOVZX --- .../android/internal/util/evolution/OmniJawsClient.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/core/java/com/android/internal/util/evolution/OmniJawsClient.java b/core/java/com/android/internal/util/evolution/OmniJawsClient.java index d4625bd64373f..06d520ea9b72b 100644 --- a/core/java/com/android/internal/util/evolution/OmniJawsClient.java +++ b/core/java/com/android/internal/util/evolution/OmniJawsClient.java @@ -55,7 +55,6 @@ public class OmniJawsClient { private static final String ICON_PACKAGE_DEFAULT = "org.omnirom.omnijaws"; private static final String ICON_PREFIX_DEFAULT = "google_new_light"; - private static final String ICON_PREFIX_OUTLINE = "outline"; private static final String EXTRA_ERROR = "error"; public static final int EXTRA_ERROR_NETWORK = 0; public static final int EXTRA_ERROR_LOCATION = 1; @@ -386,7 +385,7 @@ public class OmniJawsClient { private void updateSettings() { final String iconPack = mCachedInfo != null ? mCachedInfo.iconPack : null; - if (TextUtils.isEmpty(iconPack)) { + if (iconPack == null || TextUtils.isEmpty(iconPack)) { loadDefaultIconsPackage(); } else if (mSettingIconPackage == null || !iconPack.equals(mSettingIconPackage)) { mSettingIconPackage = iconPack; @@ -446,8 +445,4 @@ public class OmniJawsClient { mContext.unregisterReceiver(mReceiver); mWeatherReceiverRegistered = false; } - - public boolean isOutlineIconPackage() { - return mIconPrefix.equals(ICON_PREFIX_OUTLINE); - } }