Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe3569af authored by Ömer Yaveroğlu's avatar Ömer Yaveroğlu Committed by Automerger Merge Worker
Browse files

Merge "Unregister the AppIntegrityManagerService from the... 

Merge "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" into main am: fc1fc9a8 am: 3156a30f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3387619



Change-Id: Ia1045be4d3ef0ff3bf2ecfac82edb1cff8982861
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 528fdf29 3156a30f

core/java/android/app/SystemServiceRegistry.java

+0 −12
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ import android.content.ContentCaptureOptions; 
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;
@@ -1581,16 +1579,6 @@ public final class SystemServiceRegistry { 
                        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