From ef6746bc6569807f53f4f65c27b89edc0a7fb320 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Thu, 29 Jun 2017 22:09:16 +0000 Subject: [PATCH] Revert "Salt the package hash code using the device serial Bug: 62676166" This reverts commit e8ca28179b5a1a1114c13d04d57e5fb2800c8b55. Change-Id: I9fd51321d671d5ff90c7bfaddc05fc6ba11018e3 --- .../launcher3/logging/UserEventDispatcher.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index 32cf9d42c6..edbb88c934 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -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));