Add PackageManagerLocal for mainline modules
Bug: 211763739
Change-Id: Ia25ea8e224fcf88030761636c574f5084c98b035
diff --git a/services/api/current.txt b/services/api/current.txt
index 440f66a..45c0059 100644
--- a/services/api/current.txt
+++ b/services/api/current.txt
@@ -44,6 +44,13 @@
}
+package com.android.server.pm {
+
+ public interface PackageManagerLocal {
+ }
+
+}
+
package com.android.server.role {
public interface RoleServicePlatformHelper {
diff --git a/services/core/java/com/android/server/pm/PackageManagerLocal.java b/services/core/java/com/android/server/pm/PackageManagerLocal.java
new file mode 100644
index 0000000..7b76567
--- /dev/null
+++ b/services/core/java/com/android/server/pm/PackageManagerLocal.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.pm;
+
+import android.annotation.SystemApi;
+
+/**
+ * In-process API for server side PackageManager related infrastructure.
+ *
+ * For now, avoiding adding methods that rely on package data until we solve the snapshot
+ * consistency problem.
+ *
+ * @hide
+ */
+@SystemApi(client = SystemApi.Client.SYSTEM_SERVER)
+public interface PackageManagerLocal {
+}
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 0602f3e..90dd8fc 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -203,6 +203,7 @@
import com.android.permission.persistence.RuntimePermissionsPersistence;
import com.android.server.EventLogTags;
import com.android.server.FgThread;
+import com.android.server.LocalManagerRegistry;
import com.android.server.LocalServices;
import com.android.server.LockGuard;
import com.android.server.PackageWatchdog;
@@ -1537,6 +1538,7 @@
ServiceManager.addService("package", m);
final PackageManagerNative pmn = new PackageManagerNative(m);
ServiceManager.addService("package_native", pmn);
+ LocalManagerRegistry.addManager(PackageManagerLocal.class, m.new PackageManagerLocalImpl());
return m;
}
@@ -6768,6 +6770,9 @@
return mComputer.canQueryPackage(callingUid, targetPackageName);
}
+ private class PackageManagerLocalImpl implements PackageManagerLocal {
+ }
+
private class PackageManagerInternalImpl extends PackageManagerInternal {
@Override
public List<ApplicationInfo> getInstalledApplications(