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

Merge "Fix content capture session id collision bug" into rvc-dev am: dd9c140ef5 am: 3618b46f2a

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

Change-Id: Id597298b4bbe22ad4f343a622e9bda71387dca96
This commit is contained in:
TreeHugger Robot
2020-06-12 00:24:28 +00:00
committed by Automerger Merge Worker
parent c07354fcf8 3618b46f2a
commit a8122e5da2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/contentcapture/ContentCaptureSession.java
View File

@@ -39,8 +39,8 @@ import com.android.internal.util.Preconditions;
import java.io.PrintWriter;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Random;
/**
* Session used when the Android a system-provided content capture service
@@ -50,7 +50,9 @@ public abstract class ContentCaptureSession implements AutoCloseable {
private static final String TAG = ContentCaptureSession.class.getSimpleName();
private static final Random sIdGenerator = new Random();
// TODO(b/158778794): to make the session ids truly globally unique across
// processes, we may need to explore other options.
private static final SecureRandom ID_GENERATOR = new SecureRandom();
/**
* Initial state, when there is no session.
@@ -622,7 +624,7 @@ public abstract class ContentCaptureSession implements AutoCloseable {
private static int getRandomSessionId() {
int id;
do {
id = sIdGenerator.nextInt();
id = ID_GENERATOR.nextInt();
} while (id == NO_SESSION_ID);
return id;
}