PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Guard against empty extraInfo" into nyc-dev am: b63a4f8

Browse Source 
am: de27b15

* commit 'de27b15329e11a9787bead8560d08b530bdce089':
  Guard against empty extraInfo

Change-Id: I4ddf00b0d159e8c085049f9566f19433e4a2fc8c
This commit is contained in:
Jason Monk
2016-04-13 00:33:25 +00:00
committed by android-build-merger
parent 664033d46f de27b15329
commit 698ef83e0c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/datausage/UnrestrictedDataAccess.java
View File

@@ -28,6 +28,7 @@ import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -215,8 +216,8 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
mEntry = entry;
mEntry.ensureLabel(getContext());
setTitle(entry.label);
setChecked(((AppStateDataUsageBridge.DataUsageState) entry.extraInfo)
.isDataSaverWhitelisted);
final DataUsageState state = (DataUsageState) entry.extraInfo;
setChecked(state != null && state.isDataSaverWhitelisted);
if (mEntry.icon != null) {
setIcon(mEntry.icon);
}
@@ -224,8 +225,8 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
public void reuse() {
setTitle(mEntry.label);
setChecked(((AppStateDataUsageBridge.DataUsageState) mEntry.extraInfo)
.isDataSaverWhitelisted);
final DataUsageState state = (DataUsageState) mEntry.extraInfo;
setChecked(state != null && state.isDataSaverWhitelisted);
}
@Override