Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes null-ref when trying to start Guest session." into pi-dev am: 8491304cf6

Browse Source 
am: 9df8e55021

Change-Id: Ie1b89ca436d97718d01b7d9382e8a68513736f44
This commit is contained in:
Jovana Knezevic
2018-04-26 13:07:56 -07:00
committed by android-build-merger
parent ebf0b2b889 9df8e55021
commit 317f7de44c
5 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java
View File

@@ -354,20 +354,15 @@ public final class UserManagerHelper {
return;
}
if (userInfo.isGuest()) {
switchToGuest(userInfo.name);
return;
}
switchToUserId(userInfo.id);
}
/**
* Creates a guest session and switches into the guest session.
* Creates a new guest session and switches into the guest session.
*
* @param guestName Username for the guest user.
*/
public void switchToGuest(String guestName) {
public void startNewGuestSession(String guestName) {
UserInfo guest = mUserManager.createGuest(mContext, guestName);
if (guest == null) {
// Couldn't create user, most likely because there are too many, but we haven't
@@ -375,6 +370,7 @@ public final class UserManagerHelper {
Log.w(TAG, "can't create user.");
return;
}
assignDefaultIcon(guest);
switchToUserId(guest.id);
}
@@ -417,6 +413,27 @@ public final class UserManagerHelper {
mUserManager.setUserName(user.id, name);
}
/**
* Gets a bitmap representing the user's default avatar.
*
* @param userInfo User whose avatar should be returned.
* @return Default user icon
*/
public Bitmap getUserDefaultIcon(UserInfo userInfo) {
return UserIcons.convertToBitmap(
UserIcons.getDefaultUserIcon(mContext.getResources(), userInfo.id, false));
}
/**
* Gets a bitmap representing the default icon for a Guest user.
*
* @return Degault guest icon
*/
public Bitmap getGuestDefaultIcon() {
return UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(
mContext.getResources(), UserHandle.USER_NULL, false));
}
private void registerReceiver() {
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_USER_REMOVED);
@@ -435,8 +452,7 @@ public final class UserManagerHelper {
* @return Bitmap that has been assigned to the user.
*/
private Bitmap assignDefaultIcon(UserInfo userInfo) {
Bitmap bitmap = UserIcons.convertToBitmap(
UserIcons.getDefaultUserIcon(mContext.getResources(), userInfo.id, false));
Bitmap bitmap = userInfo.isGuest() ? getGuestDefaultIcon() : getUserDefaultIcon(userInfo);
mUserManager.setUserIcon(userInfo.id, bitmap);
return bitmap;
}

6
packages/SettingsLib/tests/integ/src/com/android/settingslib/users/UserManagerHelperTest.java
View File

@@ -247,13 +247,13 @@ public class UserManagerHelperTest {
}
@Test
public void switchToGuest() {
mHelper.switchToGuest("Test Guest");
public void startNewGuestSession() {
mHelper.startNewGuestSession("Test Guest");
verify(mUserManager).createGuest(mContext, "Test Guest");
UserInfo guestInfo = new UserInfo(21, "Test Guest", UserInfo.FLAG_GUEST);
when(mUserManager.createGuest(mContext, "Test Guest")).thenReturn(guestInfo);
mHelper.switchToGuest("Test Guest");
mHelper.startNewGuestSession("Test Guest");
verify(mActivityManager).switchUser(21);
}

7
packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java
View File

@@ -185,12 +185,7 @@ public class UserManagerHelperRoboTest {
mHelper.switchToUser(createUserInfoForId(20));
assertThat(ShadowActivityManager.getShadow().getSwitchUserCalled()).isFalse();
// Switching to Guest calls createGuest.
UserInfo guestInfo = new UserInfo(21, "Test Guest", UserInfo.FLAG_GUEST);
mHelper.switchToUser(guestInfo);
verify(mUserManager).createGuest(mContext, "Test Guest");
// Switching to non-current, non-guest user, simply calls switchUser.
// Switching to non-foreground user, simply calls switchUser.
UserInfo userToSwitchTo = new UserInfo(22, "Test User", 0);
mHelper.switchToUser(userToSwitchTo);
assertThat(ShadowActivityManager.getShadow().getSwitchUserCalled()).isTrue();

5
packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java
View File

@@ -207,7 +207,7 @@ public class UserGridRecyclerView extends PagedListView implements
// If the user selects Guest, start the guest session.
if (userRecord.mIsStartGuestSession) {
mUserManagerHelper.switchToGuest(mGuestName);
mUserManagerHelper.startNewGuestSession(mGuestName);
return;
}
@@ -241,8 +241,7 @@ public class UserGridRecyclerView extends PagedListView implements
private Bitmap getUserRecordIcon(UserRecord userRecord) {
if (userRecord.mIsStartGuestSession) {
return UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(
mContext.getResources(), UserHandle.USER_NULL, false));
return mUserManagerHelper.getGuestDefaultIcon();
}
if (userRecord.mIsAddUser) {

14
services/core/java/com/android/server/am/CarUserSwitchingDialog.java
View File

@@ -23,6 +23,7 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.UserManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
@@ -59,11 +60,14 @@ final class CarUserSwitchingDialog extends UserSwitchingDialog {
View view = LayoutInflater.from(getContext()).inflate(R.layout.car_user_switching_dialog,
null);
FileDescriptor fileDescriptor = UserManagerService.getInstance()
.getUserIcon(mNewUser.id).getFileDescriptor();
Bitmap bitmap = BitmapFactory.decodeFileDescriptor(fileDescriptor);
((ImageView) view.findViewById(R.id.user_loading_avatar))
.setImageBitmap(bitmap);
UserManager userManager =
(UserManager) getContext().getSystemService(Context.USER_SERVICE);
Bitmap bitmap = userManager.getUserIcon(mNewUser.id);
if (bitmap != null) {
((ImageView) view.findViewById(R.id.user_loading_avatar))
.setImageBitmap(bitmap);
}
((TextView) view.findViewById(R.id.user_loading))
.setText(res.getString(R.string.car_loading_profile));
setView(view);