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

am: 1ca6867e35

* commit '1ca6867e3541d30fc1dd8a51a856e49dda675bdb':
  Null check.

Change-Id: Ib62b96a074606166dafd1c1cf3d6905df491a67c

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