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

Commit 9865219f authored by Chris Li's avatar Chris Li
Browse files

Throw IllegalArgumentException when fail to attach WindowContext 

So that the exception can be throw across processes.

Bug: 384164817
Test: N/A
Flag: EXEMPT debug log only
Change-Id: I9244324a9d9de1f2e4fc17af31c4284c1de687fc
parent 450f1b7d

core/java/android/window/WindowTokenClientController.java

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,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);

                    }