diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index f996444b482..2b1a3bdcd46 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -131,6 +131,8 @@ public final class Utils extends com.android.settingslib.Utils { public static final String SETTINGS_PACKAGE_NAME = "com.android.settings"; + public static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui"; + public static final String OS_PKG = "os"; /** diff --git a/src/com/android/settings/applications/AppStateOverlayBridge.java b/src/com/android/settings/applications/AppStateOverlayBridge.java index 838ee422521..022f45ae824 100644 --- a/src/com/android/settings/applications/AppStateOverlayBridge.java +++ b/src/com/android/settings/applications/AppStateOverlayBridge.java @@ -19,6 +19,7 @@ import android.Manifest; import android.app.AppOpsManager; import android.content.Context; +import com.android.settings.Utils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; @@ -70,7 +71,7 @@ public class AppStateOverlayBridge extends AppStateAppOpsBridge { private static final List DISABLE_PACKAGE_LIST = new ArrayList<>(); static { - DISABLE_PACKAGE_LIST.add("com.android.systemui"); + DISABLE_PACKAGE_LIST.add(Utils.SYSTEMUI_PACKAGE_NAME); } public OverlayState(PermissionState permissionState) { diff --git a/src/com/android/settings/applications/RecentAppStatsMixin.java b/src/com/android/settings/applications/RecentAppStatsMixin.java index 4bf38642624..e592fdff39d 100644 --- a/src/com/android/settings/applications/RecentAppStatsMixin.java +++ b/src/com/android/settings/applications/RecentAppStatsMixin.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; +import static com.android.settings.Utils.SYSTEMUI_PACKAGE_NAME; import android.app.Application; import android.app.usage.UsageStats; @@ -71,7 +72,7 @@ public class RecentAppStatsMixin implements Comparator, LifecycleObs "android", "com.android.phone", SETTINGS_PACKAGE_NAME, - "com.android.systemui", + SYSTEMUI_PACKAGE_NAME, "com.android.providers.calendar", "com.android.providers.media" )); diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java index d794de69475..3c90bf358c0 100644 --- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java @@ -38,6 +38,7 @@ import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; import com.android.settings.R; +import com.android.settings.Utils; import com.android.settings.applications.AppInfoBase; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.EmptyTextSettings; @@ -57,7 +58,7 @@ public class PictureInPictureSettings extends EmptyTextSettings { static final List IGNORE_PACKAGE_LIST = new ArrayList<>(); static { - IGNORE_PACKAGE_LIST.add("com.android.systemui"); + IGNORE_PACKAGE_LIST.add(Utils.SYSTEMUI_PACKAGE_NAME); } /** diff --git a/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java b/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java index 302d6b595ae..5f95779cfbb 100644 --- a/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java +++ b/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java @@ -37,6 +37,7 @@ import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceScreen; import com.android.settings.R; +import com.android.settings.Utils; import com.android.settings.applications.AppInfoBase; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.EmptyTextSettings; @@ -58,7 +59,7 @@ public class TurnScreenOnSettings extends EmptyTextSettings { static final List IGNORE_PACKAGE_LIST = new ArrayList<>(); static { - IGNORE_PACKAGE_LIST.add("com.android.systemui"); + IGNORE_PACKAGE_LIST.add(Utils.SYSTEMUI_PACKAGE_NAME); } /** diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index b30aee4d216..66f2f1b8f31 100644 --- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java @@ -25,6 +25,7 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.R; import com.android.settings.SettingsActivity; +import com.android.settings.Utils; import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController; import com.android.settings.bluetooth.BluetoothSwitchPreferenceController; import com.android.settings.dashboard.DashboardFragment; @@ -45,8 +46,6 @@ public class BluetoothDashboardFragment extends DashboardFragment { private static final String TAG = "BluetoothDashboardFrag"; private static final String KEY_BLUETOOTH_SCREEN_FOOTER = "bluetooth_screen_footer"; - private static final String SETTINGS_PACKAGE_NAME = "com.android.settings"; - private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui"; private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -112,8 +111,8 @@ public class BluetoothDashboardFragment extends DashboardFragment { @VisibleForTesting boolean isAlwaysDiscoverable(String callingAppPackageName, String action) { return TextUtils.equals(SLICE_ACTION, action) ? false - : TextUtils.equals(SETTINGS_PACKAGE_NAME, callingAppPackageName) - || TextUtils.equals(SYSTEMUI_PACKAGE_NAME, callingAppPackageName); + : TextUtils.equals(Utils.SETTINGS_PACKAGE_NAME, callingAppPackageName) + || TextUtils.equals(Utils.SYSTEMUI_PACKAGE_NAME, callingAppPackageName); } /** diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 3c6077e3c24..9286b8164cc 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -28,6 +28,7 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.R; import com.android.settings.SettingsActivity; +import com.android.settings.Utils; import com.android.settings.core.SettingsUIDeviceConfig; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -38,7 +39,6 @@ import com.android.settingslib.search.SearchIndexable; public class ConnectedDeviceDashboardFragment extends DashboardFragment { private static final String TAG = "ConnectedDeviceFrag"; - private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE"; @@ -92,8 +92,8 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { @VisibleForTesting boolean isAlwaysDiscoverable(String callingAppPackageName, String action) { return TextUtils.equals(SLICE_ACTION, action) ? false - : TextUtils.equals(SETTINGS_PACKAGE_NAME, callingAppPackageName) - || TextUtils.equals(SYSTEMUI_PACKAGE_NAME, callingAppPackageName); + : TextUtils.equals(Utils.SETTINGS_PACKAGE_NAME, callingAppPackageName) + || TextUtils.equals(Utils.SYSTEMUI_PACKAGE_NAME, callingAppPackageName); } /** diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java index cc802e8d30a..dee38126494 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java @@ -16,6 +16,8 @@ package com.android.settings.fuelgauge; +import static com.android.settings.Utils.SYSTEMUI_PACKAGE_NAME; + import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -37,9 +39,8 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider private static final String PACKAGE_CALENDAR_PROVIDER = "com.android.providers.calendar"; private static final String PACKAGE_MEDIA_PROVIDER = "com.android.providers.media"; - private static final String PACKAGE_SYSTEMUI = "com.android.systemui"; private static final String[] PACKAGES_SYSTEM = {PACKAGE_MEDIA_PROVIDER, - PACKAGE_CALENDAR_PROVIDER, PACKAGE_SYSTEMUI}; + PACKAGE_CALENDAR_PROVIDER, SYSTEMUI_PACKAGE_NAME}; protected PackageManager mPackageManager; protected Context mContext; diff --git a/src/com/android/settings/panel/PanelFeatureProviderImpl.java b/src/com/android/settings/panel/PanelFeatureProviderImpl.java index 57a1ab0324a..71711f9228e 100644 --- a/src/com/android/settings/panel/PanelFeatureProviderImpl.java +++ b/src/com/android/settings/panel/PanelFeatureProviderImpl.java @@ -22,9 +22,9 @@ import android.os.Bundle; import android.provider.Settings; import android.util.FeatureFlagUtils; -public class PanelFeatureProviderImpl implements PanelFeatureProvider { +import com.android.settings.Utils; - private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui"; +public class PanelFeatureProviderImpl implements PanelFeatureProvider { @Override public PanelContent getPanel(Context context, Bundle bundle) { @@ -42,7 +42,7 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider { // Redirect to the internet dialog in SystemUI. Intent intent = new Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND) - .setPackage(SYSTEMUI_PACKAGE_NAME); + .setPackage(Utils.SYSTEMUI_PACKAGE_NAME); context.sendBroadcast(intent); return null; case Settings.Panel.ACTION_NFC: @@ -55,7 +55,7 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider { // Redirect to the volume panel in SystemUI. Intent volumeIntent = new Intent(Settings.Panel.ACTION_VOLUME); volumeIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND).setPackage( - SYSTEMUI_PACKAGE_NAME); + Utils.SYSTEMUI_PACKAGE_NAME); context.sendBroadcast(volumeIntent); return null; } else {