diff options
| author | 2024-10-29 18:01:38 +0000 | |
|---|---|---|
| committer | 2024-10-29 18:01:38 +0000 | |
| commit | 56d8df058c4b8e71f553313c620fe08b956a4e5e (patch) | |
| tree | 006c56e6e4cedbf012d72ef59add7f9a26969670 | |
| parent | 088b75bed708bf9b5339f8874c0725a3f525eeb7 (diff) | |
| parent | 58d6b171e275b94c38c2a5fff5301d69bb6cc939 (diff) | |
Merge "Revert "Make DEFAULT_RESCIND_BAL_PRIVILEGES_FROM_PENDING_INTENT_..."" into main
| -rw-r--r-- | services/core/java/com/android/server/wm/BackgroundActivityStartController.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java index e55a16986285..a462c67a19f4 100644 --- a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java +++ b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java @@ -68,7 +68,6 @@ import android.app.IBackgroundActivityLaunchCallback; import android.app.compat.CompatChanges; import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledAfter; -import android.compat.annotation.Overridable; import android.content.ComponentName; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -137,7 +136,6 @@ public class BackgroundActivityStartController { /** If enabled the creator will not allow BAL on its behalf by default. */ @ChangeId @EnabledAfter(targetSdkVersion = UPSIDE_DOWN_CAKE) - @Overridable private static final long DEFAULT_RESCIND_BAL_PRIVILEGES_FROM_PENDING_INTENT_CREATOR = 296478951; public static final ActivityOptions ACTIVITY_OPTIONS_SYSTEM_DEFINED = |