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

Guard against empty extraInfo

Browse Source 
Change-Id: Iff297637edd3ebf5b6d26bc1dc51e9c17393e24f
Fixes: 27999693
This commit is contained in:
Jason Monk
2016-04-12 16:03:39 -04:00
parent 2f99770cc1
commit 9a6349a4d5
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.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppStateBaseBridge; 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;
import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter; import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -215,8 +216,8 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
mEntry = entry; mEntry = entry;
mEntry.ensureLabel(getContext()); mEntry.ensureLabel(getContext());
setTitle(entry.label); setTitle(entry.label);
setChecked(((AppStateDataUsageBridge.DataUsageState) entry.extraInfo) final DataUsageState state = (DataUsageState) entry.extraInfo;
.isDataSaverWhitelisted); setChecked(state != null && state.isDataSaverWhitelisted);
if (mEntry.icon != null) { if (mEntry.icon != null) {
setIcon(mEntry.icon); setIcon(mEntry.icon);
} }
@@ -224,8 +225,8 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
public void reuse() { public void reuse() {
setTitle(mEntry.label); setTitle(mEntry.label);
setChecked(((AppStateDataUsageBridge.DataUsageState) mEntry.extraInfo) final DataUsageState state = (DataUsageState) mEntry.extraInfo;
.isDataSaverWhitelisted); setChecked(state != null && state.isDataSaverWhitelisted);
} }
@Override @Override