Merge "Switch to use ThreadUtils.postOnMainThread" (fa828543) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accounts/AccountPreferenceBase.java

+3 −28

Original line number	Diff line number	Diff line
		@@ -23,18 +23,16 @@ import android.content.Context;
		import android.content.SyncStatusObserver;
		import android.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.support.v7.preference.PreferenceScreen;
		import android.text.format.DateFormat;
		import android.util.Log;

		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.Utils;
		import com.android.settingslib.accounts.AuthenticatorHelper;
		import com.android.settingslib.utils.ThreadUtils;

		import java.util.ArrayList;
		import java.util.Date;

		abstract class AccountPreferenceBase extends SettingsPreferenceFragment
		@@ -46,8 +44,6 @@ abstract class AccountPreferenceBase extends SettingsPreferenceFragment
		public static final String AUTHORITIES_FILTER_KEY = "authorities";
		public static final String ACCOUNT_TYPES_FILTER_KEY = "account_types";

		private final Handler mHandler = new Handler();

		private UserManager mUm;
		private Object mStatusChangeListenerHandle;
		protected AuthenticatorHelper mAuthenticatorHelper;
		@@ -118,29 +114,8 @@ abstract class AccountPreferenceBase extends SettingsPreferenceFragment
		ContentResolver.removeStatusChangeListener(mStatusChangeListenerHandle);
		}

		private SyncStatusObserver mSyncStatusObserver = new SyncStatusObserver() {
		public void onStatusChanged(int which) {
		mHandler.post(new Runnable() {
		public void run() {
		onSyncStateUpdated();
		}
		});
		}
		};

		public ArrayList<String> getAuthoritiesForAccountType(String type) {
		return mAuthenticatorHelper.getAuthoritiesForAccountType(type);
		}

		/**
		* Gets the preferences.xml file associated with a particular account type.
		* @param accountType the type of account
		* @return a PreferenceScreen inflated from accountPreferenceId.
		*/
		public PreferenceScreen addPreferencesForType(final String accountType,
		PreferenceScreen parent) {
		return mAccountTypePreferenceLoader.addPreferencesForType(accountType, parent);
		}
		private SyncStatusObserver mSyncStatusObserver =
		which -> ThreadUtils.postOnMainThread(() -> onSyncStateUpdated());

		public void updateAuthDescriptions() {
		mAuthenticatorHelper.updateAuthDescriptions(getActivity());

src/com/android/settings/applications/RunningServiceDetails.java

+6 −9

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.content.pm.ServiceInfo;
		import android.content.res.Resources;
		import android.os.Bundle;
		import android.os.Debug;
		import android.os.Handler;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.provider.Settings;
		@@ -37,6 +36,7 @@ import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.core.InstrumentedPreferenceFragment;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settingslib.utils.ThreadUtils;

		import java.io.File;
		import java.io.FileInputStream;
		@@ -483,14 +483,11 @@ public class RunningServiceDetails extends InstrumentedPreferenceFragment
		}

		private void finish() {
		(new Handler()).post(new Runnable() {
		@Override
		public void run() {
		Activity a = getActivity();
		ThreadUtils.postOnMainThread(() -> {
		final Activity a = getActivity();
		if (a != null) {
		a.onBackPressed();
		}
		}
		});
		}

src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.content.pm.ResolveInfo;
		import android.content.pm.ServiceInfo;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		import android.provider.Settings;
		import android.service.autofill.AutofillService;
		import android.service.autofill.AutofillServiceInfo;
		@@ -39,6 +38,7 @@ import android.util.Log;
		import com.android.internal.content.PackageMonitor;
		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.R;
		import com.android.settingslib.utils.ThreadUtils;

		import java.util.ArrayList;
		import java.util.List;
		@@ -59,7 +59,6 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
		* Set when the fragment is implementing ACTION_REQUEST_SET_AUTOFILL_SERVICE.
		*/
		private DialogInterface.OnClickListener mCancelListener;
		private final Handler mHandler = new Handler();

		@Override
		public void onCreate(Bundle savedInstanceState) {
		@@ -123,17 +122,17 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
		private final PackageMonitor mSettingsPackageMonitor = new PackageMonitor() {
		@Override
		public void onPackageAdded(String packageName, int uid) {
		mHandler.post(() -> update());
		ThreadUtils.postOnMainThread(() -> update());
		}

		@Override
		public void onPackageModified(String packageName) {
		mHandler.post(() -> update());
		ThreadUtils.postOnMainThread(() -> update());
		}

		@Override
		public void onPackageRemoved(String packageName, int uid) {
		mHandler.post(() -> update());
		ThreadUtils.postOnMainThread(() -> update());
		}
		};

src/com/android/settings/dashboard/SummaryLoader.java

+12 −17

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.settings.SettingsActivity;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.drawer.DashboardCategory;
		import com.android.settingslib.drawer.Tile;
		import com.android.settingslib.utils.ThreadUtils;

		import java.lang.reflect.Field;
		import java.util.List;
		@@ -52,7 +53,6 @@ public class SummaryLoader {
		private final String mCategoryKey;

		private final Worker mWorker;
		private final Handler mHandler;
		private final HandlerThread mWorkerThread;

		private SummaryConsumer mSummaryConsumer;
		@@ -64,7 +64,6 @@ public class SummaryLoader {
		mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
		.getDashboardFeatureProvider(activity);
		mCategoryKey = null;
		mHandler = new Handler();
		mWorkerThread = new HandlerThread("SummaryLoader", Process.THREAD_PRIORITY_BACKGROUND);
		mWorkerThread.start();
		mWorker = new Worker(mWorkerThread.getLooper());
		@@ -82,7 +81,6 @@ public class SummaryLoader {
		mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
		.getDashboardFeatureProvider(activity);
		mCategoryKey = categoryKey;
		mHandler = new Handler();
		mWorkerThread = new HandlerThread("SummaryLoader", Process.THREAD_PRIORITY_BACKGROUND);
		mWorkerThread.start();
		mWorker = new Worker(mWorkerThread.getLooper());
		@@ -112,9 +110,7 @@ public class SummaryLoader {

		public void setSummary(SummaryProvider provider, final CharSequence summary) {
		final ComponentName component = mSummaryProviderMap.get(provider);
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		ThreadUtils.postOnMainThread(() -> {

		final Tile tile = getTileFromCategory(
		mDashboardFeatureProvider.getTilesForCategory(mCategoryKey), component);
		@@ -130,7 +126,6 @@ public class SummaryLoader {
		}

		updateSummaryIfNeeded(tile, summary);
		}
		});
		}

src/com/android/settings/dashboard/SupportFragment.java

+4 −9

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@ import android.net.NetworkCapabilities;
		import android.net.NetworkInfo;
		import android.net.NetworkRequest;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Looper;
		import android.support.v7.widget.LinearLayoutManager;
		import android.support.v7.widget.RecyclerView;
		import android.view.LayoutInflater;
		@@ -40,6 +38,7 @@ import com.android.settings.R;
		import com.android.settings.core.InstrumentedFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.overlay.SupportFeatureProvider;
		import com.android.settingslib.utils.ThreadUtils;

		/**
		* Fragment for support tab in SettingsGoogle.
		@@ -47,7 +46,6 @@ import com.android.settings.overlay.SupportFeatureProvider;
		public final class SupportFragment extends InstrumentedFragment implements View.OnClickListener,
		OnAccountsUpdateListener {

		private final Handler mHandler = new Handler(Looper.getMainLooper());
		private final ConnectivityManager.NetworkCallback mNetworkCallback =
		new ConnectivityManager.NetworkCallback() {

		@@ -152,13 +150,10 @@ public final class SupportFragment extends InstrumentedFragment implements View.
		}

		private void postConnectivityChanged() {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		ThreadUtils.postOnMainThread(() -> {
		if (mSupportItemAdapter != null) {
		mSupportItemAdapter.setHasInternet(hasInternet());
		}
		}
		});
		}