Merge "Don't crash on non-app data usage" into nyc-dev (d1a4e452) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/datausage/AppDataUsage.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -40,8 +40,6 @@ import android.text.format.Formatter;
		import android.util.ArraySet;
		import android.view.View;
		import android.widget.AdapterView;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.settings.AppHeader;
		import com.android.settings.R;
		@@ -52,7 +50,6 @@ import com.android.settingslib.net.ChartData;
		import com.android.settingslib.net.ChartDataLoader;
		import com.android.settingslib.net.UidDetailProvider;

		import static android.net.NetworkPolicyManager.POLICY_NONE;
		import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;

		public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
		@@ -209,7 +206,9 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
		@Override
		public void onResume() {
		super.onResume();
		if (mDataSaverBackend != null) {
		mDataSaverBackend.addListener(this);
		}
		mPolicy = services.mPolicyEditor.getPolicy(mTemplate);
		getLoaderManager().restartLoader(LOADER_CHART_DATA,
		ChartDataLoader.buildArgs(mTemplate, mAppItem), mChartDataCallbacks);
		@@ -219,8 +218,10 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
		@Override
		public void onPause() {
		super.onPause();
		if (mDataSaverBackend != null) {
		mDataSaverBackend.remListener(this);
		}
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {