Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: d0661a081d

Change-Id: I6681f7749a318ee3ac2f482ac7ff138a211652e9
This commit is contained in:
Robert Carr
2018-03-21 04:27:57 +00:00
committed by android-build-merger
parent 71802f34c2 d0661a081d
commit 367eeed46a
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/SurfaceControl.java
View File

@@ -566,7 +566,7 @@ public class SurfaceControl implements Parcelable {
*/ */
private SurfaceControl(SurfaceSession session, String name, int w, int h, int format, int flags, private SurfaceControl(SurfaceSession session, String name, int w, int h, int format, int flags,
SurfaceControl parent, int windowType, int ownerUid) SurfaceControl parent, int windowType, int ownerUid)
throws OutOfResourcesException { throws OutOfResourcesException, IllegalArgumentException {
if (session == null) { if (session == null) {
throw new IllegalArgumentException("session must not be null"); throw new IllegalArgumentException("session must not be null");
} }

10
core/jni/android_view_SurfaceControl.cpp
View File

@@ -116,9 +116,13 @@ static jlong nativeCreate(JNIEnv* env, jclass clazz, jobject sessionObj,
ScopedUtfChars name(env, nameStr); ScopedUtfChars name(env, nameStr);
sp<SurfaceComposerClient> client(android_view_SurfaceSession_getClient(env, sessionObj)); sp<SurfaceComposerClient> client(android_view_SurfaceSession_getClient(env, sessionObj));
SurfaceControl *parent = reinterpret_cast<SurfaceControl*>(parentObject); SurfaceControl *parent = reinterpret_cast<SurfaceControl*>(parentObject);
sp<SurfaceControl> surface = client->createSurface( sp<SurfaceControl> surface;
String8(name.c_str()), w, h, format, flags, parent, windowType, ownerUid); status_t err = client->createSurfaceChecked(
if (surface == NULL) { 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); jniThrowException(env, OutOfResourcesException, NULL);
return 0; return 0;
} }

2
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -512,7 +512,7 @@ class WindowStateAnimator {
mDrawState = NO_SURFACE; mDrawState = NO_SURFACE;
return null; return null;
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "Exception creating surface", e); Slog.e(TAG, "Exception creating surface (parent dead?)", e);
mDrawState = NO_SURFACE; mDrawState = NO_SURFACE;
return null; return null;
} }