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

Merge "Activity windows should not be focusable if not attached to the hierarchy"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-12 00:57:24 +00:00
committed by Android (Google) Code Review
parent a9fe205c51 a9c9d9871b
commit 92f6c6c7a9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -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;
@@ -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. */