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

Merge "Catch RejectedExecutionException when loading app data." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-27 00:58:24 +00:00
committed by Android (Google) Code Review
parent 2d0c3f072b c63d245779
commit 0a2a3a6ac1
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.text.format.Formatter;
import android.util.ArraySet;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -50,11 +51,19 @@ import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoader;
import com.android.settingslib.net.UidDetailProvider;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.RejectedExecutionException;
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,
DataSaverBackend.Listener {
private static final String TAG = "AppDataUsage";
public static final String ARG_APP_ITEM = "app_item";
public static final String ARG_NETWORK_TEMPLATE = "network_template";
@@ -94,6 +103,12 @@ 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);
@@ -180,9 +195,13 @@ 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++) {
new AppPrefLoader().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
mPackages.valueAt(i));
final AppPrefLoader loader = new AppPrefLoader();
loader.executeOnExecutor(executor, mPackages.valueAt(i));
}
} else {
removePreference(KEY_APP_LIST);