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

Browse Source 
am: b63a4f8

* commit 'b63a4f87416bcf3170411fc336529ca8f5d14626':
  Guard against empty extraInfo

Change-Id: Iea0c1172f484554a16d8c718b24f02e9e315ac0e
This commit is contained in:
Jason Monk
2016-04-12 22:44:49 +00:00
committed by android-build-merger
parent 3d4b96a46f b63a4f8741
commit de27b15329
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