summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-11-13 08:24:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-13 08:24:51 +0000
commitcfd1648fa12d8fb1acbf011597170dba15f7c513 (patch)
tree42105d4c6ddc5931644eed0f4473cdce08c1b231
parentab35d18a7c93595d8665b5d80e0dccb639051631 (diff)
parentdc186b4d44fc06246f1c0c454ec2ad6ef1b8e589 (diff)
Merge "Remove pi.append_native_lib_paths property" am: f7d62644d6 am: 2407fa17f4 am: dc186b4d44
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498476 Change-Id: I5e820e85b0de85649039daf468239d693c390ea2
-rw-r--r--core/java/android/app/LoadedApk.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index 5fd2a878cc31..b45f3893db8c 100644
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -103,7 +103,6 @@ final class ServiceConnectionLeaked extends AndroidRuntimeException {
public final class LoadedApk {
static final String TAG = "LoadedApk";
static final boolean DEBUG = false;
- private static final String PROPERTY_NAME_APPEND_NATIVE = "pi.append_native_lib_paths";
@UnsupportedAppUsage
private final ActivityThread mActivityThread;
@@ -906,7 +905,7 @@ public final class LoadedApk {
needToSetupJitProfiles = true;
}
- if (!libPaths.isEmpty() && SystemProperties.getBoolean(PROPERTY_NAME_APPEND_NATIVE, true)) {
+ if (!libPaths.isEmpty()) {
// Temporarily disable logging of disk reads on the Looper thread as this is necessary
StrictMode.ThreadPolicy oldPolicy = allowThreadDiskReads();
try {