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

Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev

Browse Source
This commit is contained in:
Benjamin Franz
2015-01-26 10:49:47 +00:00
committed by Android (Google) Code Review
parent 414ea81ea3 f87b174dac
commit 6d16b8614a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -4734,6 +4734,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
public UserHandle createAndInitializeUser(ComponentName who, String name, public UserHandle createAndInitializeUser(ComponentName who, String name,
String ownerName, ComponentName profileOwnerComponent, Bundle adminExtras) { String ownerName, ComponentName profileOwnerComponent, Bundle adminExtras) {
UserHandle user = createUser(who, name); UserHandle user = createUser(who, name);
if (user == null) {
return null;
}
long id = Binder.clearCallingIdentity(); long id = Binder.clearCallingIdentity();
try { try {
String profileOwnerPkg = profileOwnerComponent.getPackageName(); String profileOwnerPkg = profileOwnerComponent.getPackageName();