commit 7b03ae69df53d651c7ebf334e2b15f684c79cbf8
author Doris Ling <dling@google.com> Thu Jul 21 20:58:21 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 21 20:58:22 2016 +0000
tree 7426d921258c660e356259f7e0d44484dd649a51
parent cafe6972a9af89b623070ec1ff1671d218ad5580
parent b7e650c6f7d689a46a34ce09d8bc4cc3e843ec6a

Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev

src/com/android/settings/dashboard/DashboardSummary.java

diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 3a75c8a..1c7e22d 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 @@
 
         @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);
         }
     }