From 3629c607f0eeb5d277c54c0dd4c47e3bff2904ae Mon Sep 17 00:00:00 2001 From: Mayank Garg Date: Fri, 22 Nov 2019 15:53:19 -0800 Subject: [PATCH] Car user switching dialog taking more than 3 seconds Bug: 144706096 Bug: 145021634 Bug: 140999054 Bug: 145001354 Test: adb shell am instrument -w -r -e include_creation_time true -e iterations 10 -e class android.platform.test.scenario.multiuser.nonui.TEST_NAME android.platform.test.scenario/androidx.test.runner.AndroidJUnitRunner // for TEST_NAME SwitchToExistingSecondaryUserBenchmark, user switch time dropped from 5.2 seconds to 2.2 seconds Change-Id: I5474c683725b22f3e15e9b80ac4209df028a7993 (cherry picked from commit dec438aa5c5ae5a54d7bc7ac788ec4936ae3e3ba) --- .../java/com/android/server/am/CarUserSwitchingDialog.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/CarUserSwitchingDialog.java b/services/core/java/com/android/server/am/CarUserSwitchingDialog.java index c7de7b17b1c2c..183e05979c5e9 100644 --- a/services/core/java/com/android/server/am/CarUserSwitchingDialog.java +++ b/services/core/java/com/android/server/am/CarUserSwitchingDialog.java @@ -37,6 +37,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; import android.widget.TextView; + import com.android.internal.R; @@ -65,7 +66,9 @@ final class CarUserSwitchingDialog extends UserSwitchingDialog { setCancelable(false); Resources res = getContext().getResources(); // Custom view due to alignment and font size requirements - getContext().setTheme(R.style.Theme_DeviceDefault_Light_Dialog_Alert_UserSwitchingDialog); + // TODO (b/145021634): disabled because it's delaying user switch by 3 seconds + // getContext() + // .setTheme(R.style.Theme_DeviceDefault_Light_Dialog_Alert_UserSwitchingDialog); View view = LayoutInflater.from(getContext()).inflate( R.layout.car_user_switching_dialog, null);