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

Merge "Check for null application context in UserManager." into tm-qpr-dev

Browse Source
This commit is contained in:
Oli Lan
2022-08-23 10:43:23 +00:00
committed by Android (Google) Code Review
parent 04fd349391 37471ba1ce
commit 109ae7874c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/UserManager.java
View File

@@ -1971,7 +1971,8 @@ public class UserManager {
/** @hide */ /** @hide */
public UserManager(Context context, IUserManager service) { public UserManager(Context context, IUserManager service) {
mService = service; mService = service;
mContext = context.getApplicationContext(); Context appContext = context.getApplicationContext();
mContext = (appContext == null ? context : appContext);
mUserId = context.getUserId(); mUserId = context.getUserId();
} }