OSDN Git Service

Include OrgApacheHttpLegacyUpdater unconditionally
authorPaul Duffin <paulduffin@google.com>
Tue, 8 Jan 2019 13:26:40 +0000 (13:26 +0000)
committerPaul Duffin <paulduffin@google.com>
Tue, 22 Jan 2019 14:16:14 +0000 (14:16 +0000)
commit025bfab929b80f3e6a501da50298780a8dbb22c6
treecd1664cb3d0a5a8e6eb9dccd771eef12031d2825
parent3b887bdf4a16a64f9716f603a905b74c1bcc5a70
Include OrgApacheHttpLegacyUpdater unconditionally

Previously, OrgApacheHttpLegacyUpdater was added to the bootclasspath
(in the framework-oahl-backward-compatibility library) if and only if
the org.apache.http.legacy.jar was not on the bootclasspath. Its
presence caused the runtime to maintain backwards compatibility by
adding org.apache.http.legacy.jar to the app's classpath for apps that
target < P.

The org.apache.http.legacy.jar was permanently removed from the
bootclasspath in P and so the framework-oahl-backward-compatibility
library, and hence OrgApacheHttpLegacyUpdater, are always on the
bootclasspath and so there is no need to treat it as optional. To that
end this change:
1) Includes it in the main framework target, previously it was
   explicitly excluded.
2) Removes the code for handling the case when it is not present.
3) Removes tests for when it is not present.
4) Removes documentation describing what happens when it is not
   present.

Bug: 18027885
Test: cts/tests/signature/runSignatureTest.sh
Change-Id: I3892ead8cd2a8bf17e57bf08e3bf6ee65afac0a1
Android.bp
core/java/android/content/pm/OrgApacheHttpLegacyUpdater.java
core/java/android/content/pm/PackageBackwardCompatibility.java
core/tests/coretests/src/android/content/pm/PackageBackwardCompatibilityTest.java