@@ -2489,11 +2489,11 @@ // acceptable value. if (hwFocusRequest == HeavyweightFocusRequest.CLEAR_GLOBAL_FOCUS_OWNER) { int size = heavyweightRequests.size(); - hwFocusRequest = (HeavyweightFocusRequest)((size >= 2) + hwFocusRequest = (size >= 2 ? heavyweightRequests.get(size - 2) : null); } if (focusedWindowChanged(heavyweight, (hwFocusRequest != null)