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

Commit fb1ae829 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Check for null application context in UserManager." into tm-qpr-dev am: 109ae787 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459093



Change-Id: I1007c9bffb74335d73ca36e34de9ac7939baa3b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80f4d0f8 109ae787

core/java/android/os/UserManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1971,7 +1971,8 @@ public class UserManager { 
    /** @hide */

    public UserManager(Context context, IUserManager service) {

        mService = service;

        mContext = context.getApplicationContext();

        Context appContext = context.getApplicationContext();

        mContext = (appContext == null ? context : appContext);

        mUserId = context.getUserId();

    }