From b7e650c6f7d689a46a34ce09d8bc4cc3e843ec6a Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Thu, 21 Jul 2016 12:22:17 -0700
Subject: [PATCH] Check for null activity before getting dashboard categories.

In DashboardSummary, when async task finishes running, ensure that the
fragment is still associated with the activity before getting the
dashboard categories from the activity.

Change-Id: If23cd27a0d3e3429d900ae41ef6f24ed03b9e8d6
Fixes: 30278854
---
 src/com/android/settings/dashboard/DashboardSummary.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 3a75c8aec8f..1c7e22d8112 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.dashboard;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -231,8 +232,12 @@ public class DashboardSummary extends InstrumentedFragment
 
         @Override
         protected void onPostExecute(List<Tile> tiles) {
+            final Activity activity = getActivity();
+            if (activity == null) {
+                return;
+            }
             List<DashboardCategory> categories =
-                    ((SettingsActivity) getActivity()).getDashboardCategories();
+                    ((SettingsActivity) activity).getDashboardCategories();
             mAdapter.setCategoriesAndSuggestions(categories, tiles);
         }
     }