Fix NPE caused by status update outside activity lifecycle

Bug: 18373656 Change-Id: I3c7db15df7c47b65a42a13fc7a3a077c3ad48f77
2014-11-14 12:29:28 +00:00
parent b4e9a055bf
commit 2a3d649766
2 changed files with 18 additions and 5 deletions
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -231,7 +231,11 @@ public class ManageAccountsSettings extends AccountPreferenceBase
    @Override
    protected void onSyncStateUpdated() {
        showSyncState();
-        getActivity().invalidateOptionsMenu();
+        // Catch any delayed delivery of update messages
+        final Activity activity = getActivity();
+        if (activity != null) {
+            activity.invalidateOptionsMenu();
+        }
    }

    /**