drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a NPE in device policy manager service." into lmp-dev

Browse Source
This commit is contained in:
Svetoslav
2014-10-15 00:02:58 +00:00
committed by Android (Google) Code Review
parent ea4966442c 28433dbdab
commit dc876b5621
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

@ -5320,6 +5320,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
@Override @Override
public List<String> getCrossProfileWidgetProviders(int profileId) { public List<String> getCrossProfileWidgetProviders(int profileId) {
synchronized (DevicePolicyManagerService.this) { synchronized (DevicePolicyManagerService.this) {
if (mDeviceOwner == null) {
return Collections.emptyList();
}
ComponentName ownerComponent = mDeviceOwner.getProfileOwnerComponent(profileId); ComponentName ownerComponent = mDeviceOwner.getProfileOwnerComponent(profileId);
if (ownerComponent == null) { if (ownerComponent == null) {
return Collections.emptyList(); return Collections.emptyList();