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

Commit 367eeed4 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "Distinguish between createSurface error codes." into pi-dev 

am: d0661a08

Change-Id: I6681f7749a318ee3ac2f482ac7ff138a211652e9
parents 71802f34 d0661a08

core/java/android/view/SurfaceControl.java

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ public class SurfaceControl implements Parcelable { 
     */

    private SurfaceControl(SurfaceSession session, String name, int w, int h, int format, int flags,

            SurfaceControl parent, int windowType, int ownerUid)

                    throws OutOfResourcesException {

                    throws OutOfResourcesException, IllegalArgumentException {

        if (session == null) {

            throw new IllegalArgumentException("session must not be null");

        }

core/jni/android_view_SurfaceControl.cpp

+7 −3
Original line number Diff line number Diff line
@@ -116,9 +116,13 @@ static jlong nativeCreate(JNIEnv* env, jclass clazz, jobject sessionObj, 
    ScopedUtfChars name(env, nameStr);

    sp<SurfaceComposerClient> client(android_view_SurfaceSession_getClient(env, sessionObj));

    SurfaceControl *parent = reinterpret_cast<SurfaceControl*>(parentObject);

    sp<SurfaceControl> surface = client->createSurface(

            String8(name.c_str()), w, h, format, flags, parent, windowType, ownerUid);

    if (surface == NULL) {

    sp<SurfaceControl> surface;

    status_t err = client->createSurfaceChecked(

            String8(name.c_str()), w, h, format, &surface, flags, parent, windowType, ownerUid);

    if (err == NAME_NOT_FOUND) {

        jniThrowException(env, "java/lang/IllegalArgumentException", NULL);

        return 0;

    } else if (err != NO_ERROR) {

        jniThrowException(env, OutOfResourcesException, NULL);

        return 0;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ class WindowStateAnimator { 
            mDrawState = NO_SURFACE;

            return null;

        } catch (Exception e) {

            Slog.e(TAG, "Exception creating surface", e);

            Slog.e(TAG, "Exception creating surface (parent dead?)", e);

            mDrawState = NO_SURFACE;

            return null;

        }