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

Merge "Protect use of onFindViewById for Fragment Transitions."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-18 20:26:17 +00:00
committed by Android (Google) Code Review
parent fcca000d47 498348d34b
commit db595b087a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/FragmentTransition.java
View File

@@ -188,7 +188,10 @@ class FragmentTransition {
private static void configureTransitionsOptimized(FragmentManagerImpl fragmentManager,
int containerId, FragmentContainerTransition fragments,
View nonExistentView, ArrayMap<String, String> nameOverrides) {
ViewGroup sceneRoot = (ViewGroup) fragmentManager.mContainer.onFindViewById(containerId);
ViewGroup sceneRoot = null;
if (fragmentManager.mContainer.onHasView()) {
sceneRoot = (ViewGroup) fragmentManager.mContainer.onFindViewById(containerId);
}
if (sceneRoot == null) {
return;
}
@@ -257,7 +260,10 @@ class FragmentTransition {
private static void configureTransitionsUnoptimized(FragmentManagerImpl fragmentManager,
int containerId, FragmentContainerTransition fragments,
View nonExistentView, ArrayMap<String, String> nameOverrides) {
ViewGroup sceneRoot = (ViewGroup) fragmentManager.mContainer.onFindViewById(containerId);
ViewGroup sceneRoot = null;
if (fragmentManager.mContainer.onHasView()) {
sceneRoot = (ViewGroup) fragmentManager.mContainer.onFindViewById(containerId);
}
if (sceneRoot == null) {
return;
}