Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting for ResolverActivity." into oc-dr1-dev

Browse Source 
am: d967ee3492

Change-Id: I9573bc8878123fbad308d27adb2977811814ffcd
This commit is contained in:
Kang Li
2017-06-30 19:41:14 +00:00
committed by android-build-merger
parent 1b1a55a24b d967ee3492
commit 8853465754
3 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -1681,7 +1681,14 @@ public class ResolverActivity extends Activity {
// We assume that at this point we've already filtered out the only intent for a different
// targetUserId which we're going to use.
private void addResolveInfo(DisplayResolveInfo dri) {
if (dri.mResolveInfo.targetUserId == UserHandle.USER_CURRENT) {
if (dri != null && dri.mResolveInfo != null
&& dri.mResolveInfo.targetUserId == UserHandle.USER_CURRENT) {
// Checks if this info is already listed in display.
for (DisplayResolveInfo existingInfo : mDisplayList) {
if (resolveInfoMatch(dri.mResolveInfo, existingInfo.mResolveInfo)) {
return;
}
}
mDisplayList.add(dri);
}
}

4
core/java/com/android/internal/app/ResolverComparator.java
View File

@@ -553,7 +553,9 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
Log.e(TAG, "Error in Predict: " + e);
}
}
mAfterCompute.afterCompute();
if (mAfterCompute != null) {
mAfterCompute.afterCompute();
}
}
// adds select prob as the default values, according to a pre-trained Logistic Regression model.

76
core/java/com/android/internal/app/ResolverListController.java
View File

@@ -30,6 +30,7 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.RemoteException;
import android.util.Log;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import java.lang.InterruptedException;
@@ -55,7 +56,11 @@ public class ResolverListController {
private static final String TAG = "ResolverListController";
private static final boolean DEBUG = false;
Object mLock = new Object();
@GuardedBy("mLock")
private ResolverComparator mResolverComparator;
private boolean isComputed = false;
public ResolverListController(
Context context,
@@ -68,6 +73,10 @@ public class ResolverListController {
mLaunchedFromUid = launchedFromUid;
mTargetIntent = targetIntent;
mReferrerPackage = referrerPackage;
synchronized (mLock) {
mResolverComparator =
new ResolverComparator(mContext, mTargetIntent, mReferrerPackage, null);
}
}
@VisibleForTesting
@@ -232,25 +241,29 @@ public class ResolverListController {
@VisibleForTesting
@WorkerThread
public void sort(List<ResolverActivity.ResolvedComponentInfo> inputList) {
final CountDownLatch finishComputeSignal = new CountDownLatch(1);
ComputeCallback callback = new ComputeCallback(finishComputeSignal);
if (mResolverComparator == null) {
mResolverComparator =
new ResolverComparator(mContext, mTargetIntent, mReferrerPackage, callback);
} else {
mResolverComparator.setCallBack(callback);
}
try {
long beforeRank = System.currentTimeMillis();
mResolverComparator.compute(inputList);
finishComputeSignal.await();
Collections.sort(inputList, mResolverComparator);
long afterRank = System.currentTimeMillis();
if (DEBUG) {
Log.d(TAG, "Time Cost: " + Long.toString(afterRank - beforeRank));
synchronized (mLock) {
if (mResolverComparator == null) {
Log.d(TAG, "Comparator has already been destroyed; skipped.");
return;
}
final CountDownLatch finishComputeSignal = new CountDownLatch(1);
ComputeCallback callback = new ComputeCallback(finishComputeSignal);
mResolverComparator.setCallBack(callback);
try {
long beforeRank = System.currentTimeMillis();
if (!isComputed) {
mResolverComparator.compute(inputList);
finishComputeSignal.await();
isComputed = true;
}
Collections.sort(inputList, mResolverComparator);
long afterRank = System.currentTimeMillis();
if (DEBUG) {
Log.d(TAG, "Time Cost: " + Long.toString(afterRank - beforeRank));
}
} catch (InterruptedException e) {
Log.e(TAG, "Compute & Sort was interrupted: " + e);
}
} catch (InterruptedException e) {
Log.e(TAG, "Compute & Sort was interrupted: " + e);
}
}
@@ -271,27 +284,36 @@ public class ResolverListController {
@VisibleForTesting
public float getScore(ResolverActivity.DisplayResolveInfo target) {
if (mResolverComparator == null) {
return 0.0f;
synchronized (mLock) {
if (mResolverComparator == null) {
return 0.0f;
}
return mResolverComparator.getScore(target.getResolvedComponentName());
}
return mResolverComparator.getScore(target.getResolvedComponentName());
}
public void updateModel(ComponentName componentName) {
if (mResolverComparator != null) {
mResolverComparator.updateModel(componentName);
synchronized (mLock) {
if (mResolverComparator != null) {
mResolverComparator.updateModel(componentName);
}
}
}
public void updateChooserCounts(String packageName, int userId, String action) {
if (mResolverComparator != null) {
mResolverComparator.updateChooserCounts(packageName, userId, action);
synchronized (mLock) {
if (mResolverComparator != null) {
mResolverComparator.updateChooserCounts(packageName, userId, action);
}
}
}
public void destroy() {
if (mResolverComparator != null) {
mResolverComparator.destroy();
synchronized (mLock) {
if (mResolverComparator != null) {
mResolverComparator.destroy();
}
mResolverComparator = null;
}
}
}