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

Merge "Don't crash on non-app data usage" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-05-05 15:41:17 +00:00
committed by Android (Google) Code Review
parent 2a6bc40d49 f82b3afdd6
commit d1a4e452ed
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -40,8 +40,6 @@ import android.text.format.Formatter;
import android.util.ArraySet; import android.util.ArraySet;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AppHeader; import com.android.settings.AppHeader;
import com.android.settings.R; 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.ChartDataLoader;
import com.android.settingslib.net.UidDetailProvider; import com.android.settingslib.net.UidDetailProvider;
import static android.net.NetworkPolicyManager.POLICY_NONE;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener, public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
@@ -209,7 +206,9 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
mDataSaverBackend.addListener(this); if (mDataSaverBackend != null) {
mDataSaverBackend.addListener(this);
}
mPolicy = services.mPolicyEditor.getPolicy(mTemplate); mPolicy = services.mPolicyEditor.getPolicy(mTemplate);
getLoaderManager().restartLoader(LOADER_CHART_DATA, getLoaderManager().restartLoader(LOADER_CHART_DATA,
ChartDataLoader.buildArgs(mTemplate, mAppItem), mChartDataCallbacks); ChartDataLoader.buildArgs(mTemplate, mAppItem), mChartDataCallbacks);
@@ -219,7 +218,9 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
mDataSaverBackend.remListener(this); if (mDataSaverBackend != null) {
mDataSaverBackend.remListener(this);
}
} }
@Override @Override