Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cecf1165 authored by Bookatz's avatar Bookatz Committed by Adam Bookatz
Browse files

UserController.startUser nullchecks unlockListener 

I noticed that the current code doesn't check whether unlockListener is
null before using it in this (fairly unlikely) codepath. This fixes
that.

Test: compiles
Fixes: 130302171
Change-Id: I7ac7a2252dc098f7823e423bab05c6fe10dff4a5
parent 35ed6c34

services/core/java/com/android/server/am/UserController.java

+1 −5
Original line number Diff line number Diff line
@@ -1020,11 +1020,7 @@ class UserController implements Handler.Callback { 
                        if (state.state == STATE_RUNNING_UNLOCKED) {

                            // We'll skip all later code, so we must tell listener it's already

                            // unlocked.

                            try {

                                unlockListener.onFinished(userId, null);

                            } catch (RemoteException ignore) {

                                // Ignore.

                            }

                            notifyFinished(userId, unlockListener);

                        }

                        return true;

                    }