diff options
| -rw-r--r-- | aconfig/FeatureFlags.aconfig | 10 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserActivity.java | 13 |
2 files changed, 5 insertions, 18 deletions
diff --git a/aconfig/FeatureFlags.aconfig b/aconfig/FeatureFlags.aconfig index 2e291dd2..dfe1bb2d 100644 --- a/aconfig/FeatureFlags.aconfig +++ b/aconfig/FeatureFlags.aconfig @@ -63,16 +63,6 @@ flag { } flag { - name: "fix_private_space_locked_on_restart" - namespace: "intentresolver" - description: "Dismiss Share sheet on restart if private space became locked while stopped" - bug: "338125945" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "fix_shortcut_loader_job_leak" namespace: "intentresolver" description: "User a nested coroutine scope for shortcut loader instances" diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java index 3ff296a2..e9e43dae 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -26,7 +26,6 @@ import static com.android.intentresolver.ChooserActionFactory.EDIT_SOURCE; import static com.android.intentresolver.Flags.fixDrawerOffsetOnConfigChange; import static com.android.intentresolver.Flags.fixEmptyStatePaddingBug; import static com.android.intentresolver.Flags.fixMissingDrawerOffsetCalculation; -import static com.android.intentresolver.Flags.fixPrivateSpaceLockedOnRestart; import static com.android.intentresolver.Flags.fixShortcutsFlashing; import static com.android.intentresolver.Flags.keyboardNavigationFix; import static com.android.intentresolver.Flags.rebuildAdaptersOnTargetPinning; @@ -426,13 +425,11 @@ public class ChooserActivity extends Hilt_ChooserActivity implements @Override protected final void onRestart() { super.onRestart(); - if (fixPrivateSpaceLockedOnRestart()) { - if (mChooserMultiProfilePagerAdapter.hasPageForProfile(Profile.Type.PRIVATE.ordinal()) - && !mProfileAvailability.isAvailable(mProfiles.getPrivateProfile())) { - Log.d(TAG, "Exiting due to unavailable profile"); - finish(); - return; - } + if (mChooserMultiProfilePagerAdapter.hasPageForProfile(Profile.Type.PRIVATE.ordinal()) + && !mProfileAvailability.isAvailable(mProfiles.getPrivateProfile())) { + Log.d(TAG, "Exiting due to unavailable profile"); + finish(); + return; } if (!mRegistered) { |