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

Commit c737b919 authored by Jiaming Liu's avatar Jiaming Liu
Browse files

Support ContextWrapper by replacing instanceof checks with token checks 

Test: all tests pass

Bug: 258065175

Change-Id: I3dd08929c0ba420d5fa71f0e0fdbc8ca7cc8abb5
parent 4d3d9d5e

libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java

+9 −8
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ import android.graphics.Rect; 
import android.os.Bundle;

import android.os.Bundle;

import android.os.IBinder;

import android.os.IBinder;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.window.WindowProvider;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.Nullable;
@@ -129,9 +128,10 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { 
        });

        });

        mWindowLayoutChangeListeners.put(context, consumer);

        mWindowLayoutChangeListeners.put(context, consumer);





        // TODO(b/258065175) Further extend this to ContextWrappers.

        if (context instanceof WindowProvider) {

        final IBinder windowContextToken = context.getWindowContextToken();

        final IBinder windowContextToken = context.getWindowContextToken();

        if (windowContextToken != null) {

            // We register component callbacks for window contexts. For activity contexts, they will

            // receive callbacks from NotifyOnConfigurationChanged instead.

            final ConfigurationChangeListener listener =

            final ConfigurationChangeListener listener =

                    new ConfigurationChangeListener(windowContextToken);

                    new ConfigurationChangeListener(windowContextToken);

            context.registerComponentCallbacks(listener);

            context.registerComponentCallbacks(listener);
@@ -150,8 +150,8 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { 
            if (!mWindowLayoutChangeListeners.get(context).equals(consumer)) {

            if (!mWindowLayoutChangeListeners.get(context).equals(consumer)) {

                continue;

                continue;

            }

            }

            if (context instanceof WindowProvider) {

            final IBinder token = context.getWindowContextToken();

            final IBinder token = context.getWindowContextToken();

            if (token != null) {

                context.unregisterComponentCallbacks(mConfigurationChangeListeners.get(token));

                context.unregisterComponentCallbacks(mConfigurationChangeListeners.get(token));

                mConfigurationChangeListeners.remove(token);

                mConfigurationChangeListeners.remove(token);

            }

            }
@@ -308,9 +308,10 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { 
            return false;

            return false;

        }

        }

        final int windowingMode;

        final int windowingMode;

        if (context instanceof Activity) {

        IBinder activityToken = context.getActivityToken();

        if (activityToken != null) {

            final Configuration taskConfig = ActivityClient.getInstance().getTaskConfiguration(

            final Configuration taskConfig = ActivityClient.getInstance().getTaskConfiguration(

                    context.getActivityToken());

                    activityToken);

            if (taskConfig == null) {

            if (taskConfig == null) {

                // If we cannot determine the task configuration for any reason, it is likely that

                // If we cannot determine the task configuration for any reason, it is likely that

                // we won't be able to determine its position correctly as well. DisplayFeatures'

                // we won't be able to determine its position correctly as well. DisplayFeatures'