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

* commit 'dc876b56217c588596661ca514b4bdb8a6cfe843':
  Fix a NPE in device policy manager service.
This commit is contained in:
Svetoslav
2014-10-15 00:07:27 +00:00
committed by Android Git Automerger

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();