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

Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: d88c71a6e2" into oc-dr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-06-08 06:14:49 +00:00
committed by Android (Google) Code Review
parent f097dc9d20 a29c976872
commit 83330b44a8
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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");