commit b4a0838d08198fd93be99ce2907b3f9b70f0d7bc
author Amith Yamasani <yamasani@google.com> Sun Apr 28 22:23:20 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Apr 28 22:23:20 2013 -0700
tree a4d0222596d4d7f6ee151664f329dda2ba474746
parent 9649c3ebbe08e310bdc42dbfce48b64d7246a202
parent b0171715876b672c94c8a5aaafde95ff47b234b4

am b0171715: Three kinds of owner info - owner, user and profile

* commit 'b0171715876b672c94c8a5aaafde95ff47b234b4':
  Three kinds of owner info - owner, user and profile

src/com/android/settings/accounts/AccountSyncSettings.java

diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 64c4d4a..c14dbbe 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -115,7 +115,8 @@
                                 } catch (AuthenticatorException e) {
                                     // handled below
                                 }
-                                if (failed) {
+                                if (failed && getActivity() != null &&
+                                        !getActivity().isFinishing()) {
                                     showDialog(FAILED_REMOVAL_DIALOG);
                                 } else {
                                     finish();

src/com/android/settings/applications/RunningState.java

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 @@
                     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,