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

Merge commit '071aa6b88bc1fb4ca0af0c67b89b4bf0c3ac5de0' into manual_merge_071aa6b88b

Browse Source 
Change-Id: I06f6e1bf1bbff0ac2e5ea7200432e8edb66ee1e3
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2017-05-12 15:47:00 -07:00
parent 1949776c59 071aa6b88b
commit 01639b7504
3 changed files with 171 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ import android.net.NetworkPolicy;
import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
import android.net.TrafficStats;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.UserHandle;
@@ -51,11 +50,6 @@ import com.android.settingslib.net.ChartDataLoader;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
@@ -76,6 +70,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
private static final String KEY_UNRESTRICTED_DATA = "unrestricted_data_saver";
private static final int LOADER_CHART_DATA = 2;
private static final int LOADER_APP_PREF = 3;
private final ArraySet<String> mPackages = new ArraySet<>();
private Preference mTotalUsage;
@@ -102,12 +97,6 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
private SwitchPreference mUnrestrictedData;
private DataSaverBackend mDataSaverBackend;
// Parameters to construct an efficient ThreadPoolExecutor
private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
private static final int CORE_POOL_SIZE = Math.max(2, Math.min(CPU_COUNT - 1, 4));
private static final int MAXIMUM_POOL_SIZE = CPU_COUNT * 2 + 1;
private static final int KEEP_ALIVE_SECONDS = 30;
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -194,14 +183,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
if (mPackages.size() > 1) {
mAppList = (PreferenceCategory) findPreference(KEY_APP_LIST);
final int packageSize = mPackages.size();
final BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>(packageSize);
final ThreadPoolExecutor executor = new ThreadPoolExecutor(CORE_POOL_SIZE,
MAXIMUM_POOL_SIZE, KEEP_ALIVE_SECONDS, TimeUnit.SECONDS, workQueue);
for (int i = 1; i < mPackages.size(); i++) {
final AppPrefLoader loader = new AppPrefLoader();
loader.executeOnExecutor(executor, mPackages.valueAt(i));
}
getLoaderManager().initLoader(LOADER_APP_PREF, Bundle.EMPTY, mAppPrefCallbacks);
} else {
removePreference(KEY_APP_LIST);
}
@@ -400,30 +382,27 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
}
};
private class AppPrefLoader extends AsyncTask<String, Void, Preference> {
@Override
protected Preference doInBackground(String... params) {
PackageManager pm = getPackageManager();
String pkg = params[0];
try {
ApplicationInfo info = pm.getApplicationInfo(pkg, 0);
Preference preference = new Preference(getPrefContext());
preference.setIcon(info.loadIcon(pm));
preference.setTitle(info.loadLabel(pm));
preference.setSelectable(false);
return preference;
} catch (PackageManager.NameNotFoundException e) {
private final LoaderManager.LoaderCallbacks<ArraySet<Preference>> mAppPrefCallbacks =
new LoaderManager.LoaderCallbacks<ArraySet<Preference>>() {
@Override
public Loader<ArraySet<Preference>> onCreateLoader(int i, Bundle bundle) {
return new AppPrefLoader(getPrefContext(), mPackages, getPackageManager());
}
return null;
}
@Override
protected void onPostExecute(Preference pref) {
if (pref != null && mAppList != null) {
mAppList.addPreference(pref);
@Override
public void onLoadFinished(Loader<ArraySet<Preference>> loader,
ArraySet<Preference> preferences) {
if (preferences != null && mAppList != null) {
for (Preference preference : preferences) {
mAppList.addPreference(preference);
}
}
}
}
}
@Override
public void onLoaderReset(Loader<ArraySet<Preference>> loader) {
}
};
@Override
public void onDataSaverChanged(boolean isDataSaving) {