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

Merge "Revert "Salt the package hash code using the device serial Bug: 62676166"" into ub-launcher3-dorval-polish

Browse Source
This commit is contained in:
Hyunyoung Song
2017-06-29 22:10:06 +00:00
committed by Android (Google) Code Review
parent d6573ed128 ef6746bc65
commit 393dcd914b
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/logging/UserEventDispatcher.java
+2 -9
View File
@@ -20,7 +20,6 @@ import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.SystemClock;
import android.support.annotation.Nullable;
import android.util.Log;
@@ -132,20 +131,14 @@ public class UserEventDispatcher {
LauncherEvent event = newLauncherEvent(newTouchAction(Action.Touch.TAP),
newItemTarget(v), newTarget(Target.Type.CONTAINER));
String serial;
if (Utilities.isAtLeastO()) {
serial = Build.getSerial();
} else {
serial = Build.SERIAL;
}
// TODO: make idx percolate up the view hierarchy if needed.
int idx = 0;
if (fillInLogContainerData(event, v)) {
ItemInfo itemInfo = (ItemInfo) v.getTag();
event.srcTarget[idx].intentHash = intentHashCode;
if (cn != null) {
event.srcTarget[idx].packageNameHash = (cn.getPackageName() + serial).hashCode();
event.srcTarget[idx].componentHash = (cn.flattenToString() + serial).hashCode();
event.srcTarget[idx].packageNameHash = cn.getPackageName().hashCode();
event.srcTarget[idx].componentHash = cn.hashCode();
if (mPredictedApps != null) {
event.srcTarget[idx].predictedRank = mPredictedApps.indexOf(
new ComponentKey(cn, itemInfo.user));