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

Commit 1c6a8949 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #2538211: system server crash 

Change-Id: Ib440650129ca35e25c8c770113af21fef239178d
ClassCastException: com.android.internal.widget.PointerLocationView
parent 3daa6a55

core/java/android/view/ViewRoot.java

+10 −4
Original line number Diff line number Diff line
@@ -1500,8 +1500,10 @@ public final class ViewRoot extends Handler implements ViewParent, 
                        focus.getFocusedRect(mTempRect);

                        if (DEBUG_INPUT_RESIZE) Log.v(TAG, "Focus " + focus

                                + ": focusRect=" + mTempRect.toShortString());

                        if (mView instanceof ViewGroup) {

                            ((ViewGroup) mView).offsetDescendantRectToMyCoords(

                                    focus, mTempRect);

                        }

                        if (DEBUG_INPUT_RESIZE) Log.v(TAG,

                                "Focus in window: focusRect="

                                + mTempRect.toShortString()
@@ -2491,8 +2493,12 @@ public final class ViewRoot extends Handler implements ViewParent, 
                                // of previous focused into the coord system of

                                // newly focused view

                                focused.getFocusedRect(mTempRect);

                                ((ViewGroup) mView).offsetDescendantRectToMyCoords(focused, mTempRect);

                                ((ViewGroup) mView).offsetRectIntoDescendantCoords(v, mTempRect);

                                if (mView instanceof ViewGroup) {

                                    ((ViewGroup) mView).offsetDescendantRectToMyCoords(

                                            focused, mTempRect);

                                    ((ViewGroup) mView).offsetRectIntoDescendantCoords(

                                            v, mTempRect);

                                }

                                focusPassed = v.requestFocus(direction, mTempRect);

                            }