commit a41b23d55da1bd8e68eb784f28e2c3fe9ded080e
author Mathias Agopian <mathias@google.com> Thu Feb 14 20:22:24 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 14 20:22:33 2013 +0000
tree e13b05db5565c58a2847bb5e4c35d0e7b5848252
parent dfb306b2bc0adbec29e7ccd1a8ecb92502497573
parent f9136fd9692158574d187af8d4031fa4b1e2b6e6

Merge "get rid of Surface.getIdentity()"

core/java/android/view/Surface.java

diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java
index a972b75..48b7180 100644
--- a/core/java/android/view/Surface.java
+++ b/core/java/android/view/Surface.java
@@ -234,7 +234,6 @@
     private native void nativeDestroy();
 
     private native boolean nativeIsValid();
-    private native int nativeGetIdentity();
     private native boolean nativeIsConsumerRunningBehind();
 
     private native Canvas nativeLockCanvas(Rect dirty);
@@ -726,7 +725,7 @@
 
     @Override
     public String toString() {
-        return "Surface(name=" + mName + ", identity=" + nativeGetIdentity() + ")";
+        return "Surface(name=" + mName + ")";
     }
 
     private static void checkHeadless() {

core/jni/android_view_Surface.cpp

diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index 1f15370..40b505c 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -331,20 +331,6 @@
     return Surface::isValid(surface) ? JNI_TRUE : JNI_FALSE;
 }
 
-static jint nativeGetIdentity(JNIEnv* env, jobject surfaceObj) {
-    sp<SurfaceControl> control(getSurfaceControl(env, surfaceObj));
-    if (control != NULL) {
-        return jint(control->getIdentity());
-    }
-
-    sp<Surface> surface(getSurface(env, surfaceObj));
-    if (surface != NULL) {
-        return jint(surface->getIdentity());
-    }
-
-    return -1;
-}
-
 static jboolean nativeIsConsumerRunningBehind(JNIEnv* env, jobject surfaceObj) {
     sp<Surface> surface(getSurface(env, surfaceObj));
     if (!Surface::isValid(surface)) {
@@ -813,8 +799,6 @@
             (void*)nativeDestroy },
     {"nativeIsValid", "()Z",
             (void*)nativeIsValid },
-    {"nativeGetIdentity", "()I",
-            (void*)nativeGetIdentity },
     {"nativeIsConsumerRunningBehind", "()Z",
             (void*)nativeIsConsumerRunningBehind },
     {"nativeLockCanvas", "(Landroid/graphics/Rect;)Landroid/graphics/Canvas;",