diff options
| -rw-r--r-- | services/core/java/com/android/server/om/OverlayActorEnforcer.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/om/OverlayActorEnforcer.java b/services/core/java/com/android/server/om/OverlayActorEnforcer.java index cc5c88b77293..d806770e5c91 100644 --- a/services/core/java/com/android/server/om/OverlayActorEnforcer.java +++ b/services/core/java/com/android/server/om/OverlayActorEnforcer.java @@ -19,7 +19,6 @@ package com.android.server.om; import android.annotation.NonNull; import android.content.om.OverlayInfo; import android.content.om.OverlayableInfo; -import android.content.res.Flags; import android.net.Uri; import android.os.Process; import android.text.TextUtils; @@ -163,15 +162,11 @@ public class OverlayActorEnforcer { return ActorState.UNABLE_TO_GET_TARGET_OVERLAYABLE; } - // Framework doesn't have <overlayable> declaration by design, and we still want to be able - // to enable its overlays from the packages with the permission. - if (targetOverlayable == null - && !(Flags.rroControlForAndroidNoOverlayable() && targetPackageName.equals( - "android"))) { + if (targetOverlayable == null) { return ActorState.MISSING_OVERLAYABLE; } - final String actor = targetOverlayable == null ? null : targetOverlayable.actor; + String actor = targetOverlayable.actor; if (TextUtils.isEmpty(actor)) { // If there's no actor defined, fallback to the legacy permission check try { |