Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support ContextWrapper by replacing instanceof checks with token checks" into tm-qpr-dev

Browse Source
This commit is contained in:
Jiaming Liu
2022-12-16 17:26:26 +00:00
committed by Android (Google) Code Review
parent e22e369431 c737b91918
commit 18964627b6
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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. final IBinder windowContextToken = context.getWindowContextToken();
if (context instanceof WindowProvider) { if (windowContextToken != null) {
final IBinder windowContextToken = context.getWindowContextToken(); // 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'