Fix network error caused by apache.http.legacy.

Signed-off-by: tiann <twsxtd@gmail.com>

Author: tiann

VirtualApp/lib/src/main/java/android/content/pm/PackageParser.java

@@ -68,6 +68,8 @@ public class Package {
  public String codePath;
  public String baseCodePath;
  public String[] splitCodePaths;
+
+ public ArrayList<String> usesOptionalLibraries;
  }
 
  public final class Service extends Component<ServiceIntentInfo> {

VirtualApp/lib/src/main/java/com/lody/virtual/client/ipc/VPackageManager.java

@@ -189,7 +189,11 @@ public ApplicationInfo getApplicationInfo(String packageName, int flags, int use
  if (!new File(APACHE_LEGACY).exists()) {
  APACHE_LEGACY = "/system/framework/org.apache.http.legacy.jar";
  }
- if (android.os.Build.VERSION.SDK_INT >= P && info.targetSdkVersion <= P) {
+ List<String> sharedLibraries = getInterface().getSharedLibraries(packageName);
+ boolean forceAdd = sharedLibraries.contains("org.apache.http.legacy");
+
+ // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/services/core/java/com/android/server/pm/parsing/library/OrgApacheHttpLegacyUpdater.java;l=36?q=OrgApacheHttpLegacyUpdater&ss=android%2Fplatform%2Fsuperproject:frameworks%2Fbase%2Fservices%2Fcore%2Fjava%2Fcom%2Fandroid%2Fserver%2Fpm%2Fparsing%2Flibrary%2F
+ if (android.os.Build.VERSION.SDK_INT >= P && info.targetSdkVersion < P || forceAdd) {
  String[] newSharedLibraryFiles;
  if (info.sharedLibraryFiles == null) {
  newSharedLibraryFiles = new String[]{APACHE_LEGACY};

VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/VPackageManagerService.java

@@ -220,7 +220,14 @@ public List<String> getSharedLibraries(String packageName) {
  synchronized (mPackages) {
  VPackage p = mPackages.get(packageName);
  if (p != null) {
- return p.usesLibraries;
+ ArrayList<String> list = new ArrayList<>();
+ if (p.usesLibraries != null) {
+ list.addAll(p.usesLibraries);
+ }
+ if (p.usesOptionalLibraries != null) {
+ list.addAll(p.usesOptionalLibraries);
+ }
+ return list;
  }
  return null;
  }

VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/parser/PackageParserEx.java

@@ -233,6 +233,8 @@ private static VPackage buildPackageCache(PackageParser.Package p) {
  cache.splitCodePaths = p.splitCodePaths;
  }
 
+ cache.usesOptionalLibraries = p.usesOptionalLibraries;
+
  addOwner(cache);
  return cache;
  }

VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/parser/VPackage.java

@@ -66,6 +66,7 @@ public VPackage[] newArray(int size) {
  public Object mExtras;
 
  public String[] splitNames;
+ public ArrayList<String> usesOptionalLibraries;
 
  /**
  * Path where this package was found on disk. For monolithic packages
@@ -136,6 +137,8 @@ protected VPackage(Parcel in) {
  this.codePath = in.readString();
  this.baseCodePath = in.readString();
  this.splitCodePaths = in.createStringArray();
+
+ this.usesOptionalLibraries = in.createStringArrayList();
  }
 
  @Override
@@ -247,6 +250,8 @@ public void writeToParcel(Parcel dest, int flags) {
  dest.writeString(this.codePath);
  dest.writeString(this.baseCodePath);
  dest.writeStringArray(this.splitCodePaths);
+
+ dest.writeStringList(this.usesOptionalLibraries);
  }
 
  public static class ActivityIntentInfo extends IntentInfo {