diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-22 07:08:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-22 07:08:10 +0000 |
| commit | 06182b0764a13d900f2aefcc5c2689c82cfebdc6 (patch) | |
| tree | e7a08b556e8ca6e1ab95446f8a809f4e8a465f79 /core/java | |
| parent | 03c766075d3b50bf859fdde64d5c2c42997ff079 (diff) | |
| parent | ae88825916156fdc10bd64610031fda53ae05090 (diff) | |
Merge "pm: Disallow HIDL libs from boot jars >= Q."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/AndroidHidlUpdater.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/pm/AndroidHidlUpdater.java b/core/java/android/content/pm/AndroidHidlUpdater.java index 69cc94ffef55..b7ae8f4a1291 100644 --- a/core/java/android/content/pm/AndroidHidlUpdater.java +++ b/core/java/android/content/pm/AndroidHidlUpdater.java @@ -38,6 +38,9 @@ public class AndroidHidlUpdater extends PackageSharedLibraryUpdater { if (pkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.P) { prefixRequiredLibrary(pkg, ANDROID_HIDL_BASE); prefixRequiredLibrary(pkg, ANDROID_HIDL_MANAGER); + } else { + removeLibrary(pkg, ANDROID_HIDL_BASE); + removeLibrary(pkg, ANDROID_HIDL_MANAGER); } } } |