Changing the message on user switching dialog.
On systems where primary user is different from the system user,
the message "Switching to Owner..." is displayed while logging out
from any user. Changing it to "Logging out <username>".
Bug: b/25749937
Change-Id: Id519bbd444c6b3f951511d6e566c503d06c510a1
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 6d8bd1c..dc82dd8 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -61,6 +61,7 @@
import android.os.UserManager;
import android.os.storage.IMountService;
import android.os.storage.StorageManager;
+import android.util.Pair;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseIntArray;
@@ -641,10 +642,10 @@
return true;
}
- void showUserSwitchDialog(int userId, String userName) {
+ void showUserSwitchDialog(Pair<UserInfo, UserInfo> fromToUserPair) {
// The dialog will show and then initiate the user switch by calling startUserInForeground
- Dialog d = new UserSwitchingDialog(mService, mService.mContext, userId, userName,
- true /* above system */);
+ Dialog d = new UserSwitchingDialog(mService, mService.mContext, fromToUserPair.first,
+ fromToUserPair.second, true /* above system */);
d.show();
}