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

Merge "Workaround to get passed the broken install flow" am: b0e6508a5b

Browse Source 
am: af657ae978

Change-Id: I57ba9c85e4d5b4e301cb14ba068430c4454a4978
This commit is contained in:
Calin Juravle
2017-11-17 02:55:15 +00:00
committed by android-build-merger
parent e778568995 af657ae978
commit a6b3dc3c42
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/Process.java
View File

@@ -151,6 +151,9 @@ public class Process {
*/ */
public static final int OTA_UPDATE_UID = 1061; public static final int OTA_UPDATE_UID = 1061;
/** {@hide} */
public static final int NOBODY_UID = 9999;
/** /**
* Defines the start of a range of UIDs (and GIDs), going from this * Defines the start of a range of UIDs (and GIDs), going from this
* number to {@link #LAST_APPLICATION_UID} that are reserved for assigning * number to {@link #LAST_APPLICATION_UID} that are reserved for assigning

8
services/core/java/com/android/server/pm/PackageDexOptimizer.java
View File

@@ -154,7 +154,13 @@ public class PackageDexOptimizer {
targetInstructionSets : getAppDexInstructionSets(pkg.applicationInfo); targetInstructionSets : getAppDexInstructionSets(pkg.applicationInfo);
final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets); final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets);
final List<String> paths = pkg.getAllCodePaths(); final List<String> paths = pkg.getAllCodePaths();
final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);
int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);
if (sharedGid == -1) {
Slog.wtf(TAG, "Well this is awkward; package " + pkg.applicationInfo.name + " had UID "
+ pkg.applicationInfo.uid, new Throwable());
sharedGid = android.os.Process.NOBODY_UID;
}
// Get the class loader context dependencies. // Get the class loader context dependencies.
// For each code path in the package, this array contains the class loader context that // For each code path in the package, this array contains the class loader context that