Merge "Use the default SecureRandom provider." into gingerbread (0cd28fdd) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -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();
		}