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

Commit a2eaa426 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Clean up predictive_back_priority_system_navigation_observer flag 

This CL removes all references to the flag. The aconfig flag definition
itself is not removed due to isExported=true.

Bug: 436710530
Bug: 362938401
Test: presubmit
Flag: EXEMPT flag cleanup
Change-Id: I3a06a5ab925a688ca812a8014715db8d760a6d9b
parent 3b28e3e5

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -63556,7 +63556,7 @@ package android.window { 
    method public void unregisterOnBackInvokedCallback(@NonNull android.window.OnBackInvokedCallback);

    field public static final int PRIORITY_DEFAULT = 0; // 0x0

    field public static final int PRIORITY_OVERLAY = 1000000; // 0xf4240

    field @FlaggedApi("com.android.window.flags.predictive_back_priority_system_navigation_observer") public static final int PRIORITY_SYSTEM_NAVIGATION_OBSERVER = -2; // 0xfffffffe

    field public static final int PRIORITY_SYSTEM_NAVIGATION_OBSERVER = -2; // 0xfffffffe

  }















  public interface SplashScreen {

























core/java/android/window/OnBackInvokedDispatcher.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -16,14 +16,11 @@





























package android.window;





























import android.annotation.FlaggedApi;















import android.annotation.IntDef;















import android.annotation.IntRange;















import android.annotation.NonNull;















import android.annotation.SuppressLint;





























import com.android.window.flags.Flags;





























import java.lang.annotation.Retention;















import java.lang.annotation.RetentionPolicy;


























@@ -91,7 +88,6 @@ public interface OnBackInvokedDispatcher {













     * {@link #PRIORITY_SYSTEM_NAVIGATION_OBSERVER} can be registered at a time. On API level 37 and















     * higher, the number of registered observer callbacks is unrestricted.















     */













    @FlaggedApi(Flags.FLAG_PREDICTIVE_BACK_PRIORITY_SYSTEM_NAVIGATION_OBSERVER)















    int PRIORITY_SYSTEM_NAVIGATION_OBSERVER = -2;































    /**

































core/java/android/window/ProxyOnBackInvokedDispatcher.java



+3
−14




























Original line number
Diff line number
Diff line








@@ -16,8 +16,6 @@





























package android.window;





























import static com.android.window.flags.Flags.predictiveBackPrioritySystemNavigationObserver;





























import android.annotation.NonNull;















import android.annotation.Nullable;















import android.content.Context;










@@ -125,20 +123,11 @@ public class ProxyOnBackInvokedDispatcher implements OnBackInvokedDispatcher {













        }















        for (Pair<OnBackInvokedCallback, Integer> callbackPair : mCallbacks) {















            int priority = callbackPair.second;













            if (predictiveBackPrioritySystemNavigationObserver()) {













                if (priority >= PRIORITY_DEFAULT













                        || priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {













            if (priority >= PRIORITY_DEFAULT || priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {















                mActualDispatcher.registerOnBackInvokedCallback(priority, callbackPair.first);















            } else {















                mActualDispatcher.registerSystemOnBackInvokedCallback(callbackPair.first);















            }













            } else {













                if (priority >= PRIORITY_DEFAULT) {













                    mActualDispatcher.registerOnBackInvokedCallback(priority, callbackPair.first);













                } else {













                    mActualDispatcher.registerSystemOnBackInvokedCallback(callbackPair.first);













                }













            }















        }















        mCallbacks.clear();















        mImeDispatcher = null;

































core/java/android/window/WindowOnBackInvokedDispatcher.java



+8
−20




























Original line number
Diff line number
Diff line








@@ -21,7 +21,6 @@ import static android.window.SystemOverrideOnBackInvokedCallback.OVERRIDE_UNDEFI













import static com.android.window.flags.Flags.multipleSystemNavigationObserverCallbacks;















import static com.android.window.flags.Flags.predictiveBackCallbackCancellationFix;















import static com.android.window.flags.Flags.predictiveBackSystemOverrideCallback;













import static com.android.window.flags.Flags.predictiveBackPrioritySystemNavigationObserver;















import static com.android.window.flags.Flags.predictiveBackTimestampApi;































import android.annotation.NonNull;










@@ -214,8 +213,7 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {













                mImeDispatcher.registerOnBackInvokedCallback(priority, callback);















                return;















            }













            if (predictiveBackPrioritySystemNavigationObserver()













                    && predictiveBackSystemOverrideCallback()) {













            if (predictiveBackSystemOverrideCallback()) {















                if (priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER















                        && callback instanceof SystemOverrideOnBackInvokedCallback) {















                    Log.e(TAG, "System override callbacks cannot be registered to "









@@ -223,12 +221,10 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {













                    return;















                }















            }













            if (predictiveBackPrioritySystemNavigationObserver()) {















            if (priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {















                registerSystemNavigationObserverCallback(callback);















                return;















            }













            }















            if (callback instanceof ImeOnBackInvokedDispatcher.ImeOnBackInvokedCallback) {















                if (callback instanceof ImeOnBackInvokedDispatcher.DefaultImeOnBackAnimationCallback















                        && mImeBackAnimationController != null) {










@@ -790,19 +786,11 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {













                                + " application manifest.");















                return false;















            }













            if (predictiveBackPrioritySystemNavigationObserver()) {















            if (priority < 0 && priority != PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {















                throw new IllegalArgumentException("Application registered "















                        + "OnBackInvokedCallback cannot have negative priority. Priority: "















                        + priority);















            }













            } else {













                if (priority < 0) {













                    throw new IllegalArgumentException("Application registered "













                            + "OnBackInvokedCallback cannot have negative priority. Priority: "













                            + priority);













                }













            }















            Objects.requireNonNull(callback);















            return true;















        }