commit c0eb065b467ab6eb8d5bf7256619aed4a7d110a9
author Ömer Yaveroğlu <omernebil@google.com> Mon Dec 02 16:23:08 2024 +0000
committer Ömer Yaveroğlu <omernebil@google.com> Tue Dec 03 11:47:35 2024 +0000
tree 97ef3222d166522828f9808c02c4d040b94aa65d
parent 55b1b0dbe7fe8ffd80df6ea19428ad497426d2be

Unregister the AppIntegrityManagerService from the SystemServiceRegistry as we broke the link between the PackageManager and this service in the previous change: https://android-review.git.corp.google.com/c/platform/frameworks/base/+/3376209

Change-Id: I78d11e8e1f108c5273c2cc4ec91a0bdc05692c71

core/java/android/app/SystemServiceRegistry.java

diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 918ae1c..4137a5f 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -71,8 +71,6 @@
 import android.content.Context;
 import android.content.IRestrictionsManager;
 import android.content.RestrictionsManager;
-import android.content.integrity.AppIntegrityManager;
-import android.content.integrity.IAppIntegrityManager;
 import android.content.om.IOverlayManager;
 import android.content.om.OverlayManager;
 import android.content.pm.ApplicationInfo;
@@ -1497,16 +1495,6 @@
                         return new AttestationVerificationManager(ctx.getOuterContext(),
                                 IAttestationVerificationManagerService.Stub.asInterface(b));
                     }});
-
-        //CHECKSTYLE:ON IndentationCheck
-        registerService(Context.APP_INTEGRITY_SERVICE, AppIntegrityManager.class,
-                new CachedServiceFetcher<AppIntegrityManager>() {
-                    @Override
-                    public AppIntegrityManager createService(ContextImpl ctx)
-                            throws ServiceNotFoundException {
-                        IBinder b = ServiceManager.getServiceOrThrow(Context.APP_INTEGRITY_SERVICE);
-                        return new AppIntegrityManager(IAppIntegrityManager.Stub.asInterface(b));
-                    }});
         registerService(Context.APP_HIBERNATION_SERVICE, AppHibernationManager.class,
                 new CachedServiceFetcher<AppHibernationManager>() {
                     @Override