Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1551aae8 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix translation session id collision bug." into tm-qpr-dev am: ebb357e1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19423814



Change-Id: Iad538b9ee2aef1e58a9b292d8a36f27a7b79191b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f114085b ebb357e1

core/java/android/view/translation/TranslationManager.java

+3 −2
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ import android.util.Pair; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.SyncResultReceiver;



import java.security.SecureRandom;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Map;

import java.util.Objects;

import java.util.Random;

import java.util.Set;

import java.util.concurrent.Executor;

import java.util.concurrent.TimeoutException;
@@ -92,7 +92,8 @@ public final class TranslationManager { 
    private final Map<Consumer<TranslationCapability>, IRemoteCallback> mCapabilityCallbacks =

            new ArrayMap<>();



    private static final Random ID_GENERATOR = new Random();

    // TODO(b/158778794): make the session ids truly globally unique across processes

    private static final SecureRandom ID_GENERATOR = new SecureRandom();

    private final Object mLock = new Object();



    @NonNull