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

Commit 7f1e2f13 authored by felipeal's avatar felipeal
Browse files

Minor improvements on UserController.java 

Bug: none
Test: echo 'in TH we trust!'

Change-Id: I8418747a7a85b2d1b9b8859cfe649ce634eaf099
parent 67caaa6d

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

+2 −1
Original line number Diff line number Diff line
@@ -1903,6 +1903,7 @@ class UserController implements Handler.Callback { 
        }



        // Optimization - if there is no pending user switch, return current id

        // (no need to acquire lock because mTargetUserId and mCurrentUserId are volatile)

        if (mTargetUserId == UserHandle.USER_NULL) {

            return getUserInfo(mCurrentUserId);

        }
@@ -1919,7 +1920,7 @@ class UserController implements Handler.Callback { 


    int getCurrentOrTargetUserId() {

        synchronized (mLock) {

            return mTargetUserId != UserHandle.USER_NULL ? mTargetUserId : mCurrentUserId;

            return getCurrentOrTargetUserIdLU();

        }

    }