commit fc1bb74186c61712041dfa25e446391f7d8904a1
author Julia Reynolds <juliacr@google.com> Wed May 18 14:02:05 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 18 14:02:05 2016 +0000
tree 002c17d3426a38e6322efc24f5a20e9b98994e09
parent 1ef9c4afd56b534f836c38437624eabaa6691f0b
parent 47beeec10b5bacabdce66f7bf7fe0615a18eb963

Merge "Null check." into nyc-dev

src/com/android/settings/datausage/AppDataUsage.java

diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 7e9be3f..41cee97 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -302,7 +302,10 @@
     }
 
     private boolean getUnrestrictData() {
-        return mDataSaverBackend.isWhitelisted(mAppItem.key);
+        if (mDataSaverBackend != null) {
+            return mDataSaverBackend.isWhitelisted(mAppItem.key);
+        }
+        return false;
     }
 
     @Override