From f42dd913563e7022d7c9b499b473825fa5340b65 Mon Sep 17 00:00:00 2001 From: Mark Rathjen Date: Mon, 5 Jun 2017 19:04:34 -0700 Subject: Update Android ID (SSAID) to exclude package name in generation. Test: GTS tests pass, manual testing Bug: 62135316 Change-Id: Ia42bb79a017fc6c784c13d02ee48437d0acc7835 --- .../src/com/android/providers/settings/SettingsProvider.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 455d9cb871c4..f5d7dd8d9acd 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -2212,11 +2212,7 @@ public class SettingsProvider extends ContentProvider { throw new IllegalStateException("Key is corrupted", e); } - // Mac the package name and each of the signatures. - final String packageName = callingPkg.packageName; - byte[] packageNameBytes = packageName.getBytes(StandardCharsets.UTF_8); - m.update(getLengthPrefix(packageNameBytes), 0, 4); - m.update(packageNameBytes); + // Mac each of the developer signatures. for (int i = 0; i < callingPkg.signatures.length; i++) { byte[] sig = callingPkg.signatures[i].toByteArray(); m.update(getLengthPrefix(sig), 0, 4); @@ -2231,7 +2227,7 @@ public class SettingsProvider extends ContentProvider { final String uid = Integer.toString(callingPkg.applicationInfo.uid); final SettingsState ssaidSettings = getSettingsLocked(SETTINGS_TYPE_SSAID, userId); final boolean success = ssaidSettings.insertSettingLocked(uid, ssaid, null, true, - packageName); + callingPkg.packageName); if (!success) { throw new IllegalStateException("Ssaid settings not accessible"); -- cgit v1.2.3-59-g8ed1b