commit bc0fd853c39f5619cc2acdeeaf5a02320dace8e3
author Jason Monk <jmonk@google.com> Tue Nov 10 20:10:26 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 10 20:10:26 2015 +0000
tree f775b94d5c0db43cbacbb0c2289e8111b8e2aa7a
parent bcefeb699d3a2a005b1739394f894b9659021cc5
parent e764165369bcab956941de8f3d530f97fbfdcf67

Merge "Context isn't good enough, actually check for null"

src/com/android/settings/DataUsageSummary.java

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 7c6f502..bcd05bd 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -552,6 +552,7 @@
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         final Context context = getContext();
+        if (context == null) return;
         final boolean appDetailMode = isAppDetailMode();
         final boolean isAdmin = mUserManager.isAdminUser();