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

am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

Browse Source 
* commit 'cd79b35c3828e0ebf4c9e68da75f9d857ccf01db':
  Surface: add the PhysicalDisplayInfo#secure field
This commit is contained in:
Jamie Gennis
2012-10-23 15:24:29 -07:00
committed by Android Git Automerger
parent 30fd55cf98 cd79b35c38
commit 39c68da57b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/Surface.java
View File

@@ -758,6 +758,7 @@ public class Surface implements Parcelable {
public float density;
public float xDpi;
public float yDpi;
public boolean secure;
public PhysicalDisplayInfo() {
}
@@ -778,7 +779,8 @@ public class Surface implements Parcelable {
&& refreshRate == other.refreshRate
&& density == other.density
&& xDpi == other.xDpi
&& yDpi == other.yDpi;
&& yDpi == other.yDpi
&& secure == other.secure;
}
@Override
@@ -793,13 +795,15 @@ public class Surface implements Parcelable {
density = other.density;
xDpi = other.xDpi;
yDpi = other.yDpi;
secure = other.secure;
}
// For debugging purposes
@Override
public String toString() {
return "PhysicalDisplayInfo{" + width + " x " + height + ", " + refreshRate + " fps, "
+ "density " + density + ", " + xDpi + " x " + yDpi + " dpi}";
+ "density " + density + ", " + xDpi + " x " + yDpi + " dpi, secure " + secure
+ "}";
}
}

3
core/jni/android_view_Surface.cpp
View File

@@ -89,6 +89,7 @@ static struct {
jfieldID density;
jfieldID xDpi;
jfieldID yDpi;
jfieldID secure;
} gPhysicalDisplayInfoClassInfo;
@@ -714,6 +715,7 @@ static jboolean nativeGetDisplayInfo(JNIEnv* env, jclass clazz,
env->SetFloatField(infoObj, gPhysicalDisplayInfoClassInfo.density, info.density);
env->SetFloatField(infoObj, gPhysicalDisplayInfoClassInfo.xDpi, info.xdpi);
env->SetFloatField(infoObj, gPhysicalDisplayInfoClassInfo.yDpi, info.ydpi);
env->SetBooleanField(infoObj, gPhysicalDisplayInfoClassInfo.secure, info.secure);
return JNI_TRUE;
}
@@ -907,6 +909,7 @@ int register_android_view_Surface(JNIEnv* env)
gPhysicalDisplayInfoClassInfo.density = env->GetFieldID(clazz, "density", "F");
gPhysicalDisplayInfoClassInfo.xDpi = env->GetFieldID(clazz, "xDpi", "F");
gPhysicalDisplayInfoClassInfo.yDpi = env->GetFieldID(clazz, "yDpi", "F");
gPhysicalDisplayInfoClassInfo.secure = env->GetFieldID(clazz, "secure", "Z");
return err;
}