commit 3fbdf34a03c5ccee44732a9e9706da5e703093ab
author Raff Tsai <rafftsai@google.com> Thu Jan 16 05:27:32 2020 +0800
committer Raff Tsai <rafftsai@google.com> Thu Jan 16 13:56:52 2020 +0800
tree 369aefbef43d88315fa5d6a124c26792875bd35b
parent 08957569bebde13defd6ee60ab5c4e37c3a1e465

Remove settings_work_profile feature flag

Bug: 141601408
Test: robolectric
Change-Id: Ib7ef6794405fef6336690115680cf95b0e4c1542

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 9b257b6..8a96484 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -81,7 +81,6 @@
 import android.text.format.DateUtils;
 import android.text.style.TtsSpan;
 import android.util.ArraySet;
-import android.util.FeatureFlagUtils;
 import android.util.IconDrawableFactory;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -101,7 +100,6 @@
 import com.android.internal.app.UnlaunchableAppActivity;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.profileselector.ProfileFragmentBridge;
 import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
@@ -1051,8 +1049,7 @@
                 == ProfileSelectFragment.ProfileType.PERSONAL : false;
         final boolean isWork = args != null ? args.getInt(ProfileSelectFragment.EXTRA_PROFILE)
                 == ProfileSelectFragment.ProfileType.WORK : false;
-        if (FeatureFlagUtils.isEnabled(activity, FeatureFlags.PERSONAL_WORK_PROFILE)
-                && activity.getSystemService(UserManager.class).getUserProfiles().size() > 1
+        if (activity.getSystemService(UserManager.class).getUserProfiles().size() > 1
                 && ProfileFragmentBridge.FRAGMENT_MAP.get(fragmentName) != null
                 && !isWork && !isPersonal) {
             f = Fragment.instantiate(activity, ProfileFragmentBridge.FRAGMENT_MAP.get(fragmentName),