Loading services/core/java/com/android/server/wm/ActivityRecord.java +2 −2 Original line number Diff line number Diff line Loading @@ -42,7 +42,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.ROTATION_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.activityTypeToString; Loading Loading @@ -2241,7 +2240,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return false; } } return getWindowConfiguration().canReceiveKeys() || isAlwaysFocusable(); return (getWindowConfiguration().canReceiveKeys() || isAlwaysFocusable()) && getParent() != null; } /** Move activity with its stack to front and make the stack focused. */ Loading Loading
services/core/java/com/android/server/wm/ActivityRecord.java +2 −2 Original line number Diff line number Diff line Loading @@ -42,7 +42,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.ROTATION_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.activityTypeToString; Loading Loading @@ -2241,7 +2240,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return false; } } return getWindowConfiguration().canReceiveKeys() || isAlwaysFocusable(); return (getWindowConfiguration().canReceiveKeys() || isAlwaysFocusable()) && getParent() != null; } /** Move activity with its stack to front and make the stack focused. */ Loading