PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: Ib283b390ae0fa591fa8c97d550731464b3d9ab3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Antol
2023-05-12 18:42:20 +00:00
committed by Automerger Merge Worker
parent f482ff63b9 9567bd4a50
commit 701babd574
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.applications.manageapplications; package com.android.settings.applications.manageapplications;
import static android.util.FeatureFlagUtils.SETTINGS_ENABLE_SPA;
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING;
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
@@ -67,7 +65,6 @@ import android.provider.DeviceConfig;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.FeatureFlagUtils;
import android.util.IconDrawableFactory; import android.util.IconDrawableFactory;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -728,9 +725,6 @@ public class ManageApplications extends InstrumentedFragment
R.string.long_background_tasks_label); R.string.long_background_tasks_label);
break; break;
case LIST_TYPE_CLONED_APPS: case LIST_TYPE_CLONED_APPS:
if (!FeatureFlagUtils.isEnabled(getContext(), SETTINGS_ENABLE_SPA)) {
return;
}
int userId = UserHandle.getUserId(mCurrentUid); int userId = UserHandle.getUserId(mCurrentUid);
UserInfo userInfo = mUserManager.getUserInfo(userId); UserInfo userInfo = mUserManager.getUserInfo(userId);
if (userInfo != null && !userInfo.isCloneProfile()) { if (userInfo != null && !userInfo.isCloneProfile()) {