diff --git a/src/com/android/settings/applications/ClonedAppsPreferenceController.java b/src/com/android/settings/applications/ClonedAppsPreferenceController.java index 38f6dcc80f0..a4dda73ea1e 100644 --- a/src/com/android/settings/applications/ClonedAppsPreferenceController.java +++ b/src/com/android/settings/applications/ClonedAppsPreferenceController.java @@ -16,13 +16,10 @@ package com.android.settings.applications; -import static com.android.settings.Utils.PROPERTY_CLONED_APPS_ENABLED; - import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; -import android.provider.DeviceConfig; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; @@ -55,9 +52,7 @@ public class ClonedAppsPreferenceController extends BasePreferenceController @Override public int getAvailabilityStatus() { - return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_APP_CLONING, - PROPERTY_CLONED_APPS_ENABLED, true) - && mContext.getResources().getBoolean(R.bool.config_cloned_apps_page_enabled) + return mContext.getResources().getBoolean(R.bool.config_cloned_apps_page_enabled) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index d3d532f2dd4..679b89ba3e8 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -21,7 +21,6 @@ import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; import static com.android.internal.jank.InteractionJankMonitor.CUJ_SETTINGS_PAGE_SCROLL; import static com.android.settings.ChangeIds.CHANGE_RESTRICT_SAW_INTENT; -import static com.android.settings.Utils.PROPERTY_DELETE_ALL_APP_CLONES_ENABLED; import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL; import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_BATTERY_OPTIMIZED; import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_BATTERY_RESTRICTED; @@ -61,7 +60,6 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.preference.PreferenceFrameLayout; -import android.provider.DeviceConfig; import android.provider.Settings; import android.text.TextUtils; import android.util.ArraySet; @@ -888,9 +886,7 @@ public class ManageApplications extends InstrumentedFragment } mOptionsMenu.findItem(R.id.delete_all_app_clones) - .setVisible(mListType == LIST_TYPE_CLONED_APPS && DeviceConfig.getBoolean( - DeviceConfig.NAMESPACE_APP_CLONING, PROPERTY_DELETE_ALL_APP_CLONES_ENABLED, - true) && Utils.getCloneUserId(getContext()) != -1); + .setVisible(mListType == LIST_TYPE_CLONED_APPS && Utils.getCloneUserId(getContext()) != -1); } @Override