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

Merge "Don\'t crash on Settings data usage" into nyc-dev

Browse Source 
am: b60c7560af

* commit 'b60c7560afe6c4326d9e77423b31e0dcbf452506':
  Don't crash on Settings data usage

Change-Id: I6227d2797bdbe49758885a4c48f20e6013f30be7
This commit is contained in:
Jason Monk
2016-04-29 18:58:41 +00:00
committed by android-build-merger
parent 7efc40797a b60c7560af
commit fc63188c2c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import android.net.NetworkTemplate;
import android.net.TrafficStats; import android.net.TrafficStats;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
@@ -140,7 +141,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
mCycle = (SpinnerPreference) findPreference(KEY_CYCLE); mCycle = (SpinnerPreference) findPreference(KEY_CYCLE);
mCycleAdapter = new CycleAdapter(getContext(), mCycle, mCycleListener, false); mCycleAdapter = new CycleAdapter(getContext(), mCycle, mCycleListener, false);
if (UserHandle.isApp(mAppItem.key)) { if (UserHandle.isApp(mAppItem.key) || mAppItem.key == Process.SYSTEM_UID) {
if (mPackages.size() != 0) { if (mPackages.size() != 0) {
PackageManager pm = getPackageManager(); PackageManager pm = getPackageManager();
try { try {