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

Commit e3a6cf3e authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 3adf7678: Merge change 4184 into donut

Merge commit '3adf7678'

* commit '3adf7678':
  Add permission test structure for private framework permissions.
  Add <keygen> support for VPN.
parents 9fac42f8 3adf7678
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -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();
+14 −0
Original line number Diff line number Diff line
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)
+33 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
 * Copyright (C) 2009 Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.android.framework.permission.tests">

    <application>
        <uses-library android:name="android.test.runner" />
    </application>

    <!--
    The test declared in this instrumentation can be run via this command
    "adb shell am instrument -w com.android.framework.permission.tests/android.test.InstrumentationTestRunner"
    -->
    <instrumentation android:name="android.test.InstrumentationTestRunner"
                     android:targetPackage="com.android.framework.permission.tests"
                     android:label="Tests for private API framework permissions"/>

</manifest>
+13 −0
Original line number Diff line number Diff line
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() {

	}
}