diff options
| author | 2024-12-03 22:02:03 +0000 | |
|---|---|---|
| committer | 2024-12-03 22:02:03 +0000 | |
| commit | fe3569af3367c500b8a07bbdcb38fc4a6585eb1e (patch) | |
| tree | 8d19d89c808404e726131450540c6983cf8cc035 | |
| parent | 528fdf2967fd3e6f24669ff6027f96b0c2d4635d (diff) | |
| parent | 3156a30f3d11ddff999ab4cb0c6f71f3ba92a3c7 (diff) | |
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: fc1fc9a828 am: 3156a30f3d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3387619
Change-Id: Ia1045be4d3ef0ff3bf2ecfac82edb1cff8982861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 2bd2d34d54a2..f357836e9471 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -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 |