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

Commit fa057e68 authored by Andy McFadden's avatar Andy McFadden Committed by Android Git Automerger
Browse files

am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev 

* commit '923c18b1':
  Plumb display name into SurfaceFlinger
parents d9ad5d0d 923c18b1

core/jni/android_view_Surface.cpp

+1 −2
Original line number Diff line number Diff line
@@ -650,8 +650,7 @@ static jobject nativeGetBuiltInDisplay(JNIEnv* env, jclass clazz, jint id) { 


static jobject nativeCreateDisplay(JNIEnv* env, jclass clazz, jstring nameObj) {

    ScopedUtfChars name(env, nameObj);

    // TODO: pass the name to SF.

    sp<IBinder> token(SurfaceComposerClient::createDisplay());

    sp<IBinder> token(SurfaceComposerClient::createDisplay(String8(name.c_str())));

    return javaObjectForIBinder(env, token);

}