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

pm: Verify shared-user priv-app install location

Browse Source 
Apps that share a UID with a privileged app are privleged and
should live in /system/priv-app. Otherwise, fail
assertPackageIsValid().

On Taimen, this results in two additional apps failing:
com.android.providers.userdictionary
com.android.providers.downloads.ui

Test: Boot Taimen, verify apps are scanned correctly.
Bug: 71593002
Change-Id: I29b4dc8a2fea18248fe1f6aeee87ae3798028c60
This commit is contained in:
Jeff Vander Stoep
2018-01-11 16:09:58 -08:00
parent 7b71dfe2f6
commit d1cf49904b
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -10652,6 +10652,26 @@ public class PackageManagerService extends IPackageManager.Stub
}
}
}
// Verify that packages sharing a user with a privileged app are marked as privileged.
if (!pkg.isPrivileged() && (pkg.mSharedUserId != null)) {
SharedUserSetting sharedUserSetting = null;
try {
sharedUserSetting = mSettings.getSharedUserLPw(pkg.mSharedUserId, 0, 0, false);
} catch (PackageManagerException ignore) {}
if (sharedUserSetting != null && sharedUserSetting.isPrivileged()) {
// Exempt SharedUsers signed with the platform key.
PackageSetting platformPkgSetting = mSettings.mPackages.get("android");
if ((platformPkgSetting.signatures.mSignatures != null) &&
(compareSignatures(platformPkgSetting.signatures.mSignatures,
pkg.mSigningDetails.signatures) != PackageManager.SIGNATURE_MATCH)) {
throw new PackageManagerException("Apps that share a user with a " +
"privileged app must themselves be marked as privileged. " +
pkg.packageName + " shares privileged user " +
pkg.mSharedUserId + ".");
}
}
}
}
}

5
services/core/java/com/android/server/pm/SharedUserSetting.java
View File

@@ -17,6 +17,7 @@
package com.android.server.pm;
import android.annotation.Nullable;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageParser;
import android.service.pm.PackageServiceDumpProto;
import android.util.ArraySet;
@@ -102,4 +103,8 @@ public final class SharedUserSetting extends SettingBase {
}
return pkgList;
}
public boolean isPrivileged() {
return (this.pkgPrivateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0;
}
}