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

am 0cd28fdd: Merge "Use the default SecureRandom provider." into gingerbread

Browse Source 
Merge commit '0cd28fdd16ac140d024953c7a076ffb3ec82c8b2' into gingerbread-plus-aosp

* commit '0cd28fdd16ac140d024953c7a076ffb3ec82c8b2':
  Use the default SecureRandom provider.
This commit is contained in:
Nick Kralevich
2010-09-24 13:16:19 -07:00
committed by Android Git Automerger
parent 888bcdbeca 0cd28fdd16
commit 6c48f228f1
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,10 +327,7 @@ public class SettingsProvider extends ContentProvider {
try {
final String value = c.moveToNext() ? c.getString(0) : null;
if (value == null) {
final SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
String serial = SystemProperties.get("ro.serialno", "");
random.setSeed(
(serial + System.nanoTime() + new SecureRandom().nextLong()).getBytes());
final SecureRandom random = new SecureRandom();
final String newAndroidIdValue = Long.toHexString(random.nextLong());
Log.d(TAG, "Generated and saved new ANDROID_ID [" + newAndroidIdValue + "]");
final ContentValues values = new ContentValues();
@@ -342,8 +339,6 @@ public class SettingsProvider extends ContentProvider {
}
}
return true;
} catch (NoSuchAlgorithmException e) {
return false;
} finally {
c.close();
}