commit | 1ca6867e3541d30fc1dd8a51a856e49dda675bdb | [log] [tgz] |
---|---|---|
author | Julia Reynolds <juliacr@google.com> | Wed May 18 14:10:12 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 18 14:10:12 2016 +0000 |
tree | 9d68471b7264149cc4e57cf6f927292d858a864a | |
parent | 161def60eb1e4a0b9b556ec828f55b0a9fc537b0 [diff] | |
parent | fc1bb74186c61712041dfa25e446391f7d8904a1 [diff] |
Merge "Null check." into nyc-dev am: fc1bb74186 * commit 'fc1bb74186c61712041dfa25e446391f7d8904a1': Null check. Change-Id: Idbcee7bd10b0f530c7d48760e93cd3f8be3448b5
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