Merge "Remove FLAG_ACTIVITY_NEW_TASK when startActivityAsUser" into sc-dev am: 86a3084cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008361 Change-Id: I0f7ef9188b0e551cbf7c9c1f7d4e26ca43a4bcb4
This commit is contained in:
@@ -28,7 +28,6 @@ import androidx.fragment.app.Fragment;
|
|||||||
|
|
||||||
import com.android.settings.SettingsActivity;
|
import com.android.settings.SettingsActivity;
|
||||||
import com.android.settings.SubSettings;
|
import com.android.settings.SubSettings;
|
||||||
import com.android.settings.Utils;
|
|
||||||
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||||
import com.android.settingslib.transition.SettingsTransitionHelper.TransitionType;
|
import com.android.settingslib.transition.SettingsTransitionHelper.TransitionType;
|
||||||
|
|
||||||
@@ -182,10 +181,6 @@ public class SubSettingLauncher {
|
|||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
void launchAsUser(Intent intent, UserHandle userHandle) {
|
void launchAsUser(Intent intent, UserHandle userHandle) {
|
||||||
if (!Utils.isPageTransitionEnabled(mContext)) {
|
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
|
||||||
}
|
|
||||||
mContext.startActivityAsUser(intent, userHandle);
|
mContext.startActivityAsUser(intent, userHandle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user