am c1e3983b: Merge "Fix NullPointerException at RunningState"

* commit 'c1e3983b319ae4998ede94742db5462d01f53b73':
  Fix NullPointerException at RunningState
This commit is contained in:
Amith Yamasani
2013-04-16 06:43:05 -07:00
committed by Android Git Automerger

View File

@@ -462,6 +462,12 @@ public class RunningState {
si.mServiceInfo = ActivityThread.getPackageManager().getServiceInfo( si.mServiceInfo = ActivityThread.getPackageManager().getServiceInfo(
service.service, PackageManager.GET_UNINSTALLED_PACKAGES, service.service, PackageManager.GET_UNINSTALLED_PACKAGES,
UserHandle.getUserId(service.uid)); UserHandle.getUserId(service.uid));
if (si.mServiceInfo == null) {
Log.d("RunningService", "getServiceInfo returned null for: "
+ service.service);
return false;
}
} catch (RemoteException e) { } catch (RemoteException e) {
} }
si.mDisplayLabel = makeLabel(pm, si.mDisplayLabel = makeLabel(pm,