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

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

    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.

    private static int getRandomSessionId() {

        int id;

        do {

            id = sIdGenerator.nextInt();

            id = ID_GENERATOR.nextInt();

        } while (id == NO_SESSION_ID);

        return id;

    }