OSDN Git Service

Fixes null-ref when trying to start Guest session.
authorjovanak <jovanak@google.com>
Wed, 25 Apr 2018 21:45:18 +0000 (14:45 -0700)
committerjovanak <jovanak@google.com>
Wed, 25 Apr 2018 23:10:59 +0000 (16:10 -0700)
commit6639c4dfa1a80191b34e70ca4b603ff5aab032f5
tree3e130fea658b3ac0357de3c3164e8a8d68e96d31
parentc8836d82b108f4b54261d73b95989b9de40d925d
Fixes null-ref when trying to start Guest session.

CarUserSwitchingDialog threw null-ref because Guest didn't have
a default avatar.

1. Adds null guard in case default avatar is not set.
2. Populates default Guest avatar correctly.

Fixes:77546931
Fixes:78588087
Test: Manual, observing the default icon when starting a guest session.
       Manual, observing the switching dialog icon without a default icon.

Change-Id: Iacbfcc65147fdbc5515c0d96eb613fb17543f6b3
packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java
packages/SettingsLib/tests/integ/src/com/android/settingslib/users/UserManagerHelperTest.java
packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java
packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java
services/core/java/com/android/server/am/CarUserSwitchingDialog.java