diff options
| author | Vladimir Marko <vmarko@google.com> | 2020-03-27 09:37:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-27 09:37:15 +0000 |
| commit | ee0511299864aaf2116b51e6d34fd7d37b75317e (patch) | |
| tree | 12b637a38324633044bc4997d86bbf4cad11893a | |
| parent | 1c414764dd9cfd6fe904be940bb28fe988640ae1 (diff) | |
| parent | 52ab5124d81d4863cb23b8f7149ca54a1d56cf2e (diff) | |
ART: Update list of reserved boot class path packages. am: 1ade9f4749 am: 52ab5124d8
Change-Id: Id22b4229ef4229e8b79580773589b5df223bdb1d
| -rw-r--r-- | runtime/class_linker.cc | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 05a03e16a1..4e3c2507be 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -3149,10 +3149,27 @@ static bool IsReservedBootClassPathDescriptor(const char* descriptor) { std::string_view descriptor_sv(descriptor); return // Reserved conscrypt packages (includes sub-packages under these paths). - StartsWith(descriptor_sv, "Landroid/net/ssl/") || + // StartsWith(descriptor_sv, "Landroid/net/ssl/") || // Covered by android.net below. StartsWith(descriptor_sv, "Lcom/android/org/conscrypt/") || // Reserved updatable-media package (includes sub-packages under this path). - StartsWith(descriptor_sv, "Landroid/media/"); + StartsWith(descriptor_sv, "Landroid/media/") || + // Reserved framework-mediaprovider package (includes sub-packages under this path). + StartsWith(descriptor_sv, "Landroid/provider/") || + // Reserved framework-statsd packages (includes sub-packages under these paths). + StartsWith(descriptor_sv, "Landroid/app/") || + StartsWith(descriptor_sv, "Landroid/os/") || + StartsWith(descriptor_sv, "Landroid/util/") || + // Reserved framework-permission packages (includes sub-packages under this path). + StartsWith(descriptor_sv, "Landroid/permission/") || + // StartsWith(descriptor_sv, "Landroid/app/role/") || // Covered by android.app above. + // Reserved framework-sdkextensions package (includes sub-packages under this path). + // StartsWith(descriptor_sv, "Landroid/os/ext/") || // Covered by android.os above. + // Reserved framework-wifi packages (includes sub-packages under these paths). + StartsWith(descriptor_sv, "Landroid/hardware/wifi/") || + // StartsWith(descriptor_sv, "Landroid/net/wifi/") || // Covered by android.net below. + StartsWith(descriptor_sv, "Landroid/x/net/wifi/") || + // Reserved framework-tethering package (includes sub-packages under this path). + StartsWith(descriptor_sv, "Landroid/net/"); } // Helper for maintaining DefineClass counting. We need to notify callbacks when we start/end a |