Skip to content
Snippets Groups Projects
Commit bb519522 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NullPointerException in UserController.forceStopUser" into main

parents c534686c 3f5a179f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
services/core/java/com/android/server/am/UserController.java
+ 1
− 1
View file @ bb519522
...@@ -1468,7 +1468,7 @@ class UserController implements Handler.Callback { ...@@ -1468,7 +1468,7 @@ class UserController implements Handler.Callback {
// Send PROFILE_INACCESSIBLE broadcast if a profile was stopped // Send PROFILE_INACCESSIBLE broadcast if a profile was stopped
final UserInfo userInfo = getUserInfo(userId); final UserInfo userInfo = getUserInfo(userId);
if (userInfo.isProfile()) { if (userInfo != null && userInfo.isProfile()) {
UserInfo parent = mInjector.getUserManager().getProfileParent(userId); UserInfo parent = mInjector.getUserManager().getProfileParent(userId);
if (parent != null) { if (parent != null) {
broadcastProfileAccessibleStateChanged(userId, parent.id, broadcastProfileAccessibleStateChanged(userId, parent.id,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment