diff options
| author | Johan Redestig <johan.redestig@sonymobile.com> | 2012-10-05 10:33:16 +0200 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2013-06-06 10:26:22 -0700 |
| commit | 6fd58003860c2fe6f9e4965fd06d7063c5c14566 (patch) | |
| tree | 079d2a6fa925942c1f4da74bcd8d2d26d5e39ba1 /src/com/android/settings/applications | |
| parent | 6fa5e627b8fd64af6e4ae286c46b3666b66f8d8a (diff) | |
| download | packages_apps_Settings-6fd58003860c2fe6f9e4965fd06d7063c5c14566.zip packages_apps_Settings-6fd58003860c2fe6f9e4965fd06d7063c5c14566.tar.gz packages_apps_Settings-6fd58003860c2fe6f9e4965fd06d7063c5c14566.tar.bz2 | |
Fix NullPointerException at RunningState
getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.
Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
Diffstat (limited to 'src/com/android/settings/applications')
| -rw-r--r-- | src/com/android/settings/applications/RunningState.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java index 5797dfa..d373fdd 100644 --- a/src/com/android/settings/applications/RunningState.java +++ b/src/com/android/settings/applications/RunningState.java @@ -462,6 +462,12 @@ public class RunningState { si.mServiceInfo = ActivityThread.getPackageManager().getServiceInfo( service.service, PackageManager.GET_UNINSTALLED_PACKAGES, UserHandle.getUserId(service.uid)); + + if (si.mServiceInfo == null) { + Log.d("RunningService", "getServiceInfo returned null for: " + + service.service); + return false; + } } catch (RemoteException e) { } si.mDisplayLabel = makeLabel(pm, |