Merge "Null check." into nyc-dev am: fc1bb74186

am: d6575bcee2

* commit 'd6575bcee288f1b6b9a825c793bbbfd3d00e27b7':
  Null check.

Change-Id: Ifc8c584ec72f5fc19e45115d35cce7b3ef43a337

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

@@ -302,7 +302,10 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
     }
 
     private boolean getUnrestrictData() {
-        return mDataSaverBackend.isWhitelisted(mAppItem.key);
+        if (mDataSaverBackend != null) {
+            return mDataSaverBackend.isWhitelisted(mAppItem.key);
+        }
+        return false;
     }
 
     @Override