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

This commit is contained in:
Svetoslav
2014-10-15 00:02:58 +00:00
committed by Android (Google) Code Review

View File

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