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

Merge "use device serial number to seed RNG for generating ANDROID_ID"

Browse Source
This commit is contained in:
Doug Zongker
2010-02-03 11:03:18 -08:00
committed by Android (Google) Code Review
parent 6511fe9c9d 4f8ff39c1e
commit 9cf1a5a0c7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -17,9 +17,10 @@
package com.android.providers.settings;
import java.io.FileNotFoundException;
import java.util.Random;
import java.security.SecureRandom;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Random;
import android.backup.BackupManager;
import android.content.ContentProvider;
@@ -197,6 +198,14 @@ public class SettingsProvider extends ContentProvider {
final String value = c.moveToNext() ? c.getString(0) : null;
if (value == null) {
final SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
String serial = SystemProperties.get("ro.serialno");
if (serial != null) {
try {
random.setSeed(serial.getBytes("UTF-8"));
} catch (UnsupportedEncodingException ignore) {
// stick with default seed
}
}
final String newAndroidIdValue = Long.toHexString(random.nextLong());
Log.d(TAG, "Generated and saved new ANDROID_ID");
final ContentValues values = new ContentValues();