Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
diff --git a/Android.mk b/Android.mk
index 4cd85ec..80e681c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -478,6 +478,8 @@
resources/samples/TicTacToeLib "TicTacToeLib" \
-samplecode $(sample_dir)/TicTacToeMain \
resources/samples/TicTacToeMain "TicTacToeMain" \
+ -samplecode $(sample_dir)/ToyVpn \
+ resources/samples/ToyVpn "Toy VPN Client" \
-samplecode $(sample_dir)/USB \
resources/samples/USB "USB" \
-samplecode $(sample_dir)/WeatherListWidget \
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp
index 4f75fad..426f4f7 100644
--- a/core/jni/android_view_GLES20Canvas.cpp
+++ b/core/jni/android_view_GLES20Canvas.cpp
@@ -23,6 +23,7 @@
#include <nativehelper/JNIHelp.h>
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/android_graphics_SurfaceTexture.h>
+#include <cutils/properties.h>
#include <utils/ResourceTypes.h>
#include <gui/SurfaceTexture.h>
@@ -736,7 +737,15 @@
static jboolean android_view_GLES20Canvas_isAvailable(JNIEnv* env, jobject clazz) {
#ifdef USE_OPENGL_RENDERER
- return JNI_TRUE;
+ char prop[PROPERTY_VALUE_MAX];
+ if (property_get("ro.kernel.qemu", prop, NULL) == 0) {
+ // not in the emulator
+ return JNI_TRUE;
+ }
+ // In the emulator this property will be set to 1 when hardware GLES is
+ // enabled, 0 otherwise. On old emulator versions it will be undefined.
+ property_get("ro.kernel.qemu.gles", prop, "0");
+ return atoi(prop) == 1 ? JNI_TRUE : JNI_FALSE;
#else
return JNI_FALSE;
#endif
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index a35e684..18f1547 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -718,6 +718,16 @@
}
},
{
+ tags: ['sample', 'communication', 'new'],
+ path: 'samples/ToyVpn/index.html',
+ title: {
+ en: 'Toy VPN Client'
+ },
+ description: {
+ en: 'A sample application that illustrates the creation of a custom VPN client.'
+ }
+ },
+ {
tags: ['sample', 'newfeature'],
path: 'samples/USB/index.html',
title: {
diff --git a/docs/html/resources/samples/images/vpn-confirmation.png b/docs/html/resources/samples/images/vpn-confirmation.png
new file mode 100755
index 0000000..ae2e583
--- /dev/null
+++ b/docs/html/resources/samples/images/vpn-confirmation.png
Binary files differ
