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

Revert "Parse "vendor/priv-app" to find privileged applications"

Browse Source 
This reverts commit 02708b1ac4.

Change-Id: Ie1ba362a9f5ee46516a79c35bd4a6e45f84b6a32
This commit is contained in:
Todd Kennedy
2016-06-21 22:14:55 +00:00
parent 02708b1ac4
commit 56b9656372
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2446,14 +2446,8 @@ public class PackageManagerService extends IPackageManager.Stub {
| PackageParser.PARSE_IS_SYSTEM
| PackageParser.PARSE_IS_SYSTEM_DIR, scanFlags, 0);
// Collected privileged vendor packages.
final File privilegedVendorAppDir = new File(Environment.getVendorDirectory(), "priv-app");
scanDirLI(privilegedVendorAppDir, PackageParser.PARSE_IS_SYSTEM
| PackageParser.PARSE_IS_SYSTEM_DIR
| PackageParser.PARSE_IS_PRIVILEGED, scanFlags, 0);
// Collect all vendor packages.
File vendorAppDir = new File(Environment.getVendorDirectory(), "app");
File vendorAppDir = new File("/vendor/app");
try {
vendorAppDir = vendorAppDir.getCanonicalFile();
} catch (IOException e) {
@@ -15820,10 +15814,7 @@ public class PackageManagerService extends IPackageManager.Stub {
try {
final String privilegedAppDir = new File(Environment.getRootDirectory(), "priv-app")
.getCanonicalPath();
final String privilegedAppVendorDir = new File(Environment.getVendorDirectory(), "priv-app")
.getCanonicalPath();
return (path.getCanonicalPath().startsWith(privilegedAppDir)
|| path.getCanonicalPath().startsWith(privilegedAppVendorDir));
return path.getCanonicalPath().startsWith(privilegedAppDir);
} catch (IOException e) {
Slog.e(TAG, "Unable to access code path " + path);
}