diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2017-06-29 20:32:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-29 20:32:55 +0000 |
commit | abb71b1920534d5bdcde5a69496c156c86a3bd58 (patch) | |
tree | 0db46c677b2cf0708bbfa626d1c1fbbade5b45b9 | |
parent | e5ecc557ef76c08df4172854cee668ff56b07f18 (diff) | |
parent | 6f7f4bb97e574c409ba409b67c5ed6903967da6c (diff) | |
download | android_packages_apps_Trebuchet-abb71b1920534d5bdcde5a69496c156c86a3bd58.tar.gz android_packages_apps_Trebuchet-abb71b1920534d5bdcde5a69496c156c86a3bd58.tar.bz2 android_packages_apps_Trebuchet-abb71b1920534d5bdcde5a69496c156c86a3bd58.zip |
Merge "Salt the package hash code using the device serial Bug: 62676166" into ub-launcher3-dorval-polish
am: 6f7f4bb97e
Change-Id: If62bc555e4ae607977b40c1c1d22d62b53455e97
-rw-r--r-- | src/com/android/launcher3/logging/UserEventDispatcher.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index edbb88c93..32cf9d42c 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -20,6 +20,7 @@ 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; @@ -131,14 +132,20 @@ 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().hashCode(); - event.srcTarget[idx].componentHash = cn.hashCode(); + event.srcTarget[idx].packageNameHash = (cn.getPackageName() + serial).hashCode(); + event.srcTarget[idx].componentHash = (cn.flattenToString() + serial).hashCode(); if (mPredictedApps != null) { event.srcTarget[idx].predictedRank = mPredictedApps.indexOf( new ComponentKey(cn, itemInfo.user)); |