Merge "Move public methods of ResolverComparator to abstract class." (e08a4e19) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/AbstractResolverComparator.java

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		package com.android.internal.app;

		import android.content.ComponentName;
		import com.android.internal.app.ResolverActivity.ResolvedComponentInfo;
		import java.util.Comparator;
		import java.util.List;

		/**
		* Used to sort resolved activities in {@link ResolverListController}.
		*/
		abstract class AbstractResolverComparator implements Comparator<ResolvedComponentInfo> {

		protected AfterCompute mAfterCompute;

		/**
		* Callback to be called when {@link #compute(List)} finishes. This signals to stop waiting.
		*/
		public interface AfterCompute {

		public void afterCompute();
		}

		public void setCallBack(AfterCompute afterCompute) {
		mAfterCompute = afterCompute;
		}

		/**
		* Computes features for each target. This will be called before calls to {@link
		* #getScore(ComponentName)} or {@link #compare(Object, Object)}, in order to prepare the
		* comparator for those calls. Note that {@link #getScore(ComponentName)} uses {@link
		* ComponentName}, so the implementation will have to be prepared to identify a {@link
		* ResolvedComponentInfo} by {@link ComponentName}.
		*/
		public abstract void compute(List<ResolvedComponentInfo> targets);

		/**
		* Returns the score that was calculated for the corresponding {@link ResolvedComponentInfo}
		* when {@link #compute(List)} was called before this.
		*/
		public abstract float getScore(ComponentName name);

		/**
		* Reports to UsageStats what was chosen.
		*/
		// TODO(b/129014961) Move implemetation here and make final.
		public abstract void updateChooserCounts(String packageName, int userId, String action);

		/**
		* Updates the model used to rank the componentNames.
		*
		* <p>Default implementation does nothing, as we could have simple model that does not train
		* online.
		*
		* @param componentName the component that the user clicked
		*/
		public void updateModel(ComponentName componentName) {
		}

		/**
		* Called when the {@link ResolverActivity} is destroyed.
		*/
		public abstract void destroy();
		}

core/java/com/android/internal/app/ResolverListController.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ public class ResolverListController {
		private static final String TAG = "ResolverListController";
		private static final boolean DEBUG = false;

		private ResolverComparator mResolverComparator;
		private AbstractResolverComparator mResolverComparator;
		private boolean isComputed = false;

		public ResolverListController(
		@@ -70,7 +70,8 @@ public class ResolverListController {
		mTargetIntent = targetIntent;
		mReferrerPackage = referrerPackage;
		mResolverComparator =
		new ResolverComparator(mContext, mTargetIntent, mReferrerPackage, null);
		new ResolverRankerServiceResolverComparator(
		mContext, mTargetIntent, mReferrerPackage, null);
		}

		@VisibleForTesting
		@@ -221,7 +222,7 @@ public class ResolverListController {
		return listToReturn;
		}

		private class ComputeCallback implements ResolverComparator.AfterCompute {
		private class ComputeCallback implements AbstractResolverComparator.AfterCompute {

		private CountDownLatch mFinishComputeSignal;

core/java/com/android/internal/app/ResolverComparator.java→core/java/com/android/internal/app/ResolverRankerServiceResolverComparator.java

+15 −19

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

		import java.text.Collator;
		import java.util.ArrayList;
		import java.util.Comparator;
		import java.util.LinkedHashMap;
		import java.util.List;
		import java.util.Map;
		@@ -54,10 +53,10 @@ import java.util.concurrent.CountDownLatch;
		import java.util.concurrent.TimeUnit;

		/**
		* Ranks and compares packages based on usage stats.
		* Ranks and compares packages based on usage stats and uses the {@link ResolverRankerService}.
		*/
		class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		private static final String TAG = "ResolverComparator";
		class ResolverRankerServiceResolverComparator extends AbstractResolverComparator {
		private static final String TAG = "RRSResolverComparator";

		private static final boolean DEBUG = false;

		@@ -100,7 +99,6 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		private ComponentName mRankerServiceName;
		private IResolverRankerService mRanker;
		private ResolverRankerServiceConnection mConnection;
		private AfterCompute mAfterCompute;
		private Context mContext;
		private CountDownLatch mConnectSignal;

		@@ -155,12 +153,8 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		}
		};

		public interface AfterCompute {
		public void afterCompute ();
		}

		public ResolverComparator(Context context, Intent intent, String referrerPackage,
		AfterCompute afterCompute) {
		public ResolverRankerServiceResolverComparator(Context context, Intent intent,
		String referrerPackage, AfterCompute afterCompute) {
		mCollator = Collator.getInstance(context.getResources().getConfiguration().locale);
		String scheme = intent.getScheme();
		mHttp = "http".equals(scheme) \|\| "https".equals(scheme);
		@@ -185,7 +179,7 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		}

		// get annotations of content from intent.
		public void getContentAnnotations(Intent intent) {
		private void getContentAnnotations(Intent intent) {
		ArrayList<String> annotations = intent.getStringArrayListExtra(
		Intent.EXTRA_CONTENT_ANNOTATIONS);
		if (annotations != null) {
		@@ -200,11 +194,8 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		}
		}

		public void setCallBack(AfterCompute afterCompute) {
		mAfterCompute = afterCompute;
		}

		// compute features for each target according to usage stats of targets.
		@Override
		public void compute(List<ResolvedComponentInfo> targets) {
		reset();

		@@ -349,6 +340,7 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		return mCollator.compare(sa.toString().trim(), sb.toString().trim());
		}

		@Override
		public float getScore(ComponentName name) {
		final ResolverTarget target = mTargetsDict.get(name);
		if (target != null) {
		@@ -357,6 +349,7 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		return 0;
		}

		@Override
		public void updateChooserCounts(String packageName, int userId, String action) {
		if (mUsm != null) {
		mUsm.reportChooserSelection(packageName, userId, mContentType, mAnnotations, action);
		@@ -364,6 +357,7 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		}

		// update ranking model when the connection to it is valid.
		@Override
		public void updateModel(ComponentName componentName) {
		synchronized (mLock) {
		if (mRanker != null) {
		@@ -397,6 +391,7 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		}

		// unbind the service and clear unhandled messges.
		@Override
		public void destroy() {
		mHandler.removeMessages(RESOLVER_RANKER_SERVICE_RESULT);
		mHandler.removeMessages(RESOLVER_RANKER_RESULT_TIMEOUT);
		@@ -478,8 +473,8 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		if (!ResolverRankerService.BIND_PERMISSION.equals(perm)) {
		Log.w(TAG, "ResolverRankerService " + componentName + " does not require"
		+ " permission " + ResolverRankerService.BIND_PERMISSION
		+ " - this service will not be queried for ResolverComparator."
		+ " add android:permission=\""
		+ " - this service will not be queried for "
		+ "ResolverRankerServiceResolverComparator. add android:permission=\""
		+ ResolverRankerService.BIND_PERMISSION + "\""
		+ " to the <service> tag for " + componentName
		+ " in the manifest.");
		@@ -490,7 +485,8 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		resolveInfo.serviceInfo.packageName)) {
		Log.w(TAG, "ResolverRankerService " + componentName + " does not hold"
		+ " permission " + ResolverRankerService.HOLD_PERMISSION
		+ " - this service will not be queried for ResolverComparator.");
		+ " - this service will not be queried for "
		+ "ResolverRankerServiceResolverComparator.");
		continue;
		}
		} catch (NameNotFoundException e) {