From b0d60452540dd478affd46723e094d8a42066561 Mon Sep 17 00:00:00 2001
From: Mis012 <Michael.Srba@seznam.cz>
Date: Thu, 24 Nov 2022 15:56:40 +0100
Subject: [PATCH] src/api-impl/android/content/pm: fix up some stubs, remove
 some ugly make-this-compile out-of-place class definitions in favor of
 importing implementations we have created since

---
 .../android/content/pm/PackageManager.java    | 22 +++++++------------
 .../android/content/pm/PackageParser.java     |  1 +
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/api-impl/android/content/pm/PackageManager.java b/src/api-impl/android/content/pm/PackageManager.java
index 7a4f34b1..f2e25822 100644
--- a/src/api-impl/android/content/pm/PackageManager.java
+++ b/src/api-impl/android/content/pm/PackageManager.java
@@ -20,13 +20,13 @@ import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
 import android.content.ComponentName;
 import android.content.Context;
-//import android.content.Intent;
-//import android.content.IntentFilter;
-//import android.content.IntentSender;
-//import android.content.res.Resources;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.IntentSender;
+import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 //import android.graphics.drawable.Drawable;
-//import android.net.Uri;
+import android.net.Uri;
 import android.os.Environment;
 import android.os.UserHandle;
 import android.util.AndroidException;
@@ -36,20 +36,14 @@ import java.io.File;
 import java.util.List;
 import java.util.ArrayList;
 
-class Uri {}
-class Resources {}
 class IPackageInstallObserver {}
 class VerificationParams {}
 class ContainerEncryptionParams {}
 class IPackageDeleteObserver {}
 class IPackageDataObserver {}
-class IntentSender {}
 class IPackageStatsObserver {}
-class IntentFilter {}
-class Intent { public Intent(String action) {} }
 class VerifierDeviceIdentity {}
 class IPackageMoveObserver {}
-class ResolveInfo {}
 class Drawable {}
 
 /**
@@ -2165,7 +2159,7 @@ public class PackageManager {
      */
     public List<ResolveInfo> queryIntentActivities(Intent intent,
             int flags) {
-		return null;
+		return new ArrayList<ResolveInfo>();
 	}
 
     /**
@@ -2189,7 +2183,7 @@ public class PackageManager {
      */
     public List<ResolveInfo> queryIntentActivitiesAsUser(Intent intent,
             int flags, int userId) {
-		return null;
+		return new ArrayList<ResolveInfo>();
 	}
 
 
@@ -2303,7 +2297,7 @@ public class PackageManager {
      */
     public List<ResolveInfo> queryIntentServices(Intent intent,
             int flags) {
-		return null;
+		return new ArrayList<ResolveInfo>();
 	}
 
     /**
diff --git a/src/api-impl/android/content/pm/PackageParser.java b/src/api-impl/android/content/pm/PackageParser.java
index 09cac4f6..883a2bd4 100644
--- a/src/api-impl/android/content/pm/PackageParser.java
+++ b/src/api-impl/android/content/pm/PackageParser.java
@@ -17,6 +17,7 @@
 package android.content.pm;
 
 import android.content.ComponentName;
+import android.content.IntentFilter;
 import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;