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

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

Browse Source 
am: 810c312a29

Change-Id: Ida86b2e9f68683c88db24bcbb16eaf14ce8f2d94
This commit is contained in:
Michal Karpinski
2017-07-31 19:03:13 +00:00
committed by android-build-merger
parent 978b8e1842 810c312a29
commit c2e30cd5c9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -776,7 +776,9 @@ public class BackupManagerService implements BackupManagerServiceInterface {
// side unpredictability. // side unpredictability.
@Override @Override
public int generateRandomIntegerToken() { public int generateRandomIntegerToken() {
int token = mTokenGenerator.nextInt() & ~0xFF; int token = mTokenGenerator.nextInt();
if (token < 0) token = -token;
token &= ~0xFF;
token |= (mNextToken.incrementAndGet() & 0xFF); token |= (mNextToken.incrementAndGet() & 0xFF);
return token; return token;
} }