diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java index 878b690a7cf64..507fce3292b1e 100644 --- a/core/java/android/webkit/JWebCoreJavaBridge.java +++ b/core/java/android/webkit/JWebCoreJavaBridge.java @@ -222,6 +222,21 @@ final class JWebCoreJavaBridge extends Handler { mHasDeferredTimers = false; } + private String[] getKeyStrengthList() { + // FIXME: fake the list for now + String[] list = new String[2]; + list[0] = "1024"; + list[1] = "512"; + return list; + } + + private String getSignedPublicKey(int index, String challenge, String url) { + // FIXME: do nothing for now + Log.w(LOGTAG, "getSignedPublicKey for " + index + " and challenge=" + + challenge + " and url=" + url); + return ""; + } + private native void nativeConstructor(); private native void nativeFinalize(); private native void sharedTimerFired(); diff --git a/tests/permission/Android.mk b/tests/permission/Android.mk new file mode 100644 index 0000000000000..a6df98e37576a --- /dev/null +++ b/tests/permission/Android.mk @@ -0,0 +1,14 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +# We only want this apk build for tests. +LOCAL_MODULE_TAGS := tests + +# Include all test java files. +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_PACKAGE_NAME := FrameworkPermissionTests + +include $(BUILD_PACKAGE) + diff --git a/tests/permission/AndroidManifest.xml b/tests/permission/AndroidManifest.xml new file mode 100644 index 0000000000000..b19bf006cfebc --- /dev/null +++ b/tests/permission/AndroidManifest.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java b/tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java new file mode 100644 index 0000000000000..010601a4fe05b --- /dev/null +++ b/tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java @@ -0,0 +1,13 @@ +package com.android.framework.permission.tests; + +import junit.framework.TestCase; + +/** + * TODO: Remove this. This is only a placeholder, need to implement this. + */ +public class DummyPermissionTest extends TestCase { + + public void testMe() { + + } +}