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

Merge "Revert "Revert "Remove exception from OverlayConfig zygote method""" into rvc-dev

Browse Source
This commit is contained in:
Lee Chou
2020-03-05 10:35:05 +00:00
committed by Android (Google) Code Review
parent 7b35bb384e 15db04ec6c
commit 6f0c1bc10e
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/com/android/internal/content/om/OverlayConfig.java
View File

@@ -21,7 +21,6 @@ import android.annotation.Nullable;
import android.content.pm.PackagePartitions;
import android.content.pm.parsing.ParsingPackageRead;
import android.os.Build;
import android.os.Process;
import android.os.Trace;
import android.util.ArrayMap;
import android.util.Log;
@@ -186,13 +185,6 @@ public class OverlayConfig {
*/
@NonNull
public static OverlayConfig getZygoteInstance() {
if (Process.myUid() != Process.ROOT_UID) {
// Scan the overlays in the zygote process to generate configuration settings for
// overlays on the system image. Do not cache this instance so OverlayConfig will not
// be present in applications by default.
throw new IllegalStateException("Can only be invoked in the root process");
}
Trace.traceBegin(Trace.TRACE_TAG_RRO, "OverlayConfig#getZygoteInstance");
try {
return new OverlayConfig(null /* rootDirectory */, OverlayScanner::new,
@@ -209,13 +201,12 @@ public class OverlayConfig {
*/
@NonNull
public static OverlayConfig initializeSystemInstance(PackageProvider packageProvider) {
if (Process.myUid() != Process.SYSTEM_UID) {
throw new IllegalStateException("Can only be invoked in the system process");
}
Trace.traceBegin(Trace.TRACE_TAG_RRO, "OverlayConfig#initializeSystemInstance");
sInstance = new OverlayConfig(null, null, packageProvider);
Trace.traceEnd(Trace.TRACE_TAG_RRO);
try {
sInstance = new OverlayConfig(null, null, packageProvider);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_RRO);
}
return sInstance;
}
@@ -379,10 +370,6 @@ public class OverlayConfig {
*/
@NonNull
public String[] createImmutableFrameworkIdmapsInZygote() {
if (Process.myUid() != Process.ROOT_UID) {
throw new IllegalStateException("This method can only be called from the root process");
}
final String targetPath = "/system/framework/framework-res.apk";
final ArrayList<String> idmapPaths = new ArrayList<>();
final ArrayList<IdmapInvocation> idmapInvocations =