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

Commit 27753efb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Verify enableOnBackInvokedCallback at the app-level if ActivityInfo is... 

Merge "Verify enableOnBackInvokedCallback at the app-level if ActivityInfo is null" into udc-dev am: 379a3d53 am: 2f43da1e

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



Change-Id: I4e758e228d63e312f573ed7dcca94d6a61904b9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7126b7b7 2f43da1e

core/java/android/window/WindowOnBackInvokedDispatcher.java

+26 −15
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import android.annotation.Nullable; 
import android.app.Activity;

import android.content.Context;

import android.content.ContextWrapper;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.os.Handler;

import android.os.RemoteException;

import android.os.SystemProperties;
@@ -421,36 +423,45 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
                return false;

            }



            boolean requestsPredictiveBack;

            boolean requestsPredictiveBack = false;



            // Check if the context is from an activity.

            while ((context instanceof ContextWrapper) && !(context instanceof Activity)) {

                context = ((ContextWrapper) context).getBaseContext();

            }



            boolean shouldCheckActivity = false;



            if (context instanceof Activity) {

                final Activity activity = (Activity) context;



                if (activity.getActivityInfo().hasOnBackInvokedCallbackEnabled()) {

                    requestsPredictiveBack =

                            activity.getActivityInfo().isOnBackInvokedCallbackEnabled();

                } else {

                    requestsPredictiveBack =

                            context.getApplicationInfo().isOnBackInvokedCallbackEnabled();

                }

                final ActivityInfo activityInfo = activity.getActivityInfo();

                if (activityInfo != null) {

                    if (activityInfo.hasOnBackInvokedCallbackEnabled()) {

                        shouldCheckActivity = true;

                        requestsPredictiveBack = activityInfo.isOnBackInvokedCallbackEnabled();



                        if (DEBUG) {

                    Log.d(TAG, TextUtils.formatSimple("Activity: %s isPredictiveBackEnabled=%s",

                            Log.d(TAG, TextUtils.formatSimple(

                                    "Activity: %s isPredictiveBackEnabled=%s",

                                    activity.getComponentName(),

                                    requestsPredictiveBack));

                        }

                    }

                } else {

                requestsPredictiveBack =

                        context.getApplicationInfo().isOnBackInvokedCallbackEnabled();

                    Log.w(TAG, "The ActivityInfo is null, so we cannot verify if this Activity"

                            + " has the 'android:enableOnBackInvokedCallback' attribute."

                            + " The application attribute will be used as a fallback.");

                }

            }



            if (!shouldCheckActivity) {

                final ApplicationInfo applicationInfo = context.getApplicationInfo();

                requestsPredictiveBack = applicationInfo.isOnBackInvokedCallbackEnabled();



                if (DEBUG) {

                    Log.d(TAG, TextUtils.formatSimple("App: %s requestsPredictiveBack=%s",

                            context.getApplicationInfo().packageName,

                            applicationInfo.packageName,

                            requestsPredictiveBack));

                }

            }