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

Commit b055e976 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Throw IllegalArgumentException when fail to attach WindowContext" into main

parents c0b2a054 9865219f

core/java/android/window/WindowTokenClientController.java

+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,9 @@ public class WindowTokenClientController { 
            info = wms.attachWindowContextToDisplayContent(mAppThread, client, displayId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (Exception e) {

            Log.e(TAG, "Failed attachToDisplayContent", e);

            return false;

        }

        if (info == null) {

            return false;

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2945,7 +2945,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                final DisplayContent dc = mRoot.getDisplayContent(displayId);

                if (dc == null) {

                    if (callingPid != MY_PID) {

                        throw new WindowManager.InvalidDisplayException(

                        throw new IllegalArgumentException(

                                "attachWindowContextToDisplayContent: trying to attach to a"

                                        + " non-existing display:" + displayId);

                    }