Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev

am: 810c312a29 Change-Id: Ida86b2e9f68683c88db24bcbb16eaf14ce8f2d94
2017-07-31 19:03:13 +00:00
parent 978b8e1842 810c312a29
commit c2e30cd5c9
1 changed files with 3 additions and 1 deletions
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -776,7 +776,9 @@ public class BackupManagerService implements BackupManagerServiceInterface {
    // side unpredictability.
    @Override
    public int generateRandomIntegerToken() {
-        int token = mTokenGenerator.nextInt() & ~0xFF;
+        int token = mTokenGenerator.nextInt();
+        if (token < 0) token = -token;
+        token &= ~0xFF;
        token |= (mNextToken.incrementAndGet() & 0xFF);
        return token;
    }