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

make android_id random seed depend on time as well as ro.serialno

Browse Source 
Change-Id: I0a48aacd8da30896d91fa05b7791335e6ed751e5
This commit is contained in:
Doug Zongker
2010-08-19 13:38:26 -07:00
parent 4690627644
commit 0fe27cf5bd
1 changed files with 4 additions and 9 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

@@ -222,16 +222,11 @@ public class SettingsProvider extends ContentProvider {
final String value = c.moveToNext() ? c.getString(0) : null; final String value = c.moveToNext() ? c.getString(0) : null;
if (value == null) { if (value == null) {
final SecureRandom random = SecureRandom.getInstance("SHA1PRNG"); final SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
String serial = SystemProperties.get("ro.serialno"); String serial = SystemProperties.get("ro.serialno", "");
if (serial != null) { random.setSeed(
try { (serial + System.nanoTime() + new SecureRandom().nextLong()).getBytes());
random.setSeed(serial.getBytes("UTF-8"));
} catch (UnsupportedEncodingException ignore) {
// stick with default seed
}
}
final String newAndroidIdValue = Long.toHexString(random.nextLong()); final String newAndroidIdValue = Long.toHexString(random.nextLong());
Log.d(TAG, "Generated and saved new ANDROID_ID"); Log.d(TAG, "Generated and saved new ANDROID_ID [" + newAndroidIdValue + "]");
final ContentValues values = new ContentValues(); final ContentValues values = new ContentValues();
values.put(Settings.NameValueTable.NAME, Settings.Secure.ANDROID_ID); values.put(Settings.NameValueTable.NAME, Settings.Secure.ANDROID_ID);
values.put(Settings.NameValueTable.VALUE, newAndroidIdValue); values.put(Settings.NameValueTable.VALUE, newAndroidIdValue);