Snap for 8426163 from 61f55349a0d486a13f934fff77cac5f4421e6964 to mainline-tzdata2-release
Change-Id: Id5be3a530d6b0ea31bb5f131919afd9468e0eeb5
diff --git a/Android.bp b/Android.bp
index e01b0af..0d92caf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,26 +14,11 @@
package {
default_visibility: ["//visibility:private"],
- default_applicable_licenses: ["external_apache-harmony_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
- name: "external_apache-harmony_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- ],
- license_text: [
- "NOTICE",
- ],
}
java_test {
name: "apache-harmony-tests",
visibility: [
- "//art/build/sdk",
"//cts/tests/libcore/luni",
],
hostdex: true,
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
- license_type: NOTICE
-}
diff --git a/OWNERS b/OWNERS
index fedd23c..4a2c004 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,7 +2,9 @@
allight@google.com
oth@google.com
ngeoffray@google.com
+shertz@google.com
# For build / style / minor test fixes:
include platform/libcore:/OWNERS
-calin@google.com
+agampe@google.com
+sehr@google.com
diff --git a/jdwp/Android.bp b/jdwp/Android.bp
index 83e3d28..b1af1b5 100644
--- a/jdwp/Android.bp
+++ b/jdwp/Android.bp
@@ -1,27 +1,3 @@
-package {
- default_applicable_licenses: ["external_apache-harmony_jdwp_license"],
-}
-
-// Added automatically by a large-scale-change
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
- name: "external_apache-harmony_jdwp_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- ],
- license_text: [
- "COPYRIGHT.txt",
- "LICENSE.txt",
- "NOTICE.txt",
- ],
-}
-
java_genrule {
name: "SourceDebugExtensionMockClass_gen",
host_supported: true,
@@ -34,7 +10,6 @@
java_test {
name: "apache-harmony-jdwp-tests",
visibility: [
- "//art/build/sdk",
"//cts/tests/jdwp",
],
hostdex: true,
diff --git a/jdwp/AndroidTest.xml b/jdwp/AndroidTest.xml
new file mode 100644
index 0000000..faf3b33
--- /dev/null
+++ b/jdwp/AndroidTest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The 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.
+-->
+<configuration description="Base config for JDWP testing in CTS">
+ <include name="common-config" />
+ <!-- Removes temporary dalvik-cache directory created by JDWP tests -->
+ <option name="run-command:teardown-command" value="rm -rf /data/local/tmp/dalvik-cache" />
+</configuration>
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/DDM/DDMDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/DDM/DDMDebuggee.java
index 543e5be..0fa81e8 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/DDM/DDMDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/DDM/DDMDebuggee.java
@@ -56,10 +56,10 @@
public int disconnectCount = 0;
@Override
- public void onConnected() { connectCount++; }
+ public void connected() { connectCount++; }
@Override
- public void onDisconnected() { disconnectCount++; }
+ public void disconnected() { disconnectCount++; }
@Override
public Chunk handleChunk(Chunk request) {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEvents003Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEvents003Test.java
index 5991a94..3671af3 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEvents003Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEvents003Test.java
@@ -79,8 +79,8 @@
long runMethodID = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassID, "run");
logWriter.println("=> runMethodID = " + runMethodID);
- long fakeMethodID = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassID, "fakeMethod");
- logWriter.println("=> fakeMethodID = " + fakeMethodID);
+ long dummyMethodID = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassID, "dummyMethod");
+ logWriter.println("=> dummyMethodID = " + dummyMethodID);
logWriter.println("");
logWriter.println("=> Info for tested method '" + methodForEvents + "':");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedExceptionEventsDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedExceptionEventsDebuggee.java
index ecfe84c..de1825a 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedExceptionEventsDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedExceptionEventsDebuggee.java
@@ -43,7 +43,7 @@
logWriter.println("-> CombinedExceptionEventsDebuggee: Starting...");
// Preload exception classes
- new SubDebuggeeException("fake");
+ new SubDebuggeeException("dummy");
synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionCaughtDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionCaughtDebuggee.java
index 14edd22..57e27b5 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionCaughtDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionCaughtDebuggee.java
@@ -48,7 +48,7 @@
logWriter.println("-- ExceptionCatchDebuggee: STARTED");
// Cause loading of DebuggeeException so it is visible from the test.
- new DebuggeeException("fake exception");
+ new DebuggeeException("dummy exception");
synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionUncaughtDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionUncaughtDebuggee.java
index d7f6de2..21152bc 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionUncaughtDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionUncaughtDebuggee.java
@@ -44,7 +44,7 @@
logWriter.println("-- ExceptionUncaughtDebuggee: STARTED");
// Cause loading of DebuggeeException so it is visible from the test.
- new DebuggeeException("fake exception");
+ new DebuggeeException("dummy exception");
synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationDebuggee.java
index 5c773c2..2816c4f 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationDebuggee.java
@@ -51,7 +51,7 @@
logWriter.println("ExceptionWithLocationDebuggee: STARTED");
// load and prepare DebuggeeException class
@SuppressWarnings("unused")
- DebuggeeException ex = new DebuggeeException("fake exception");
+ DebuggeeException ex = new DebuggeeException("dummy exception");
synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionDebuggee.java
index a2fb675..a1e18a1 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionDebuggee.java
@@ -39,27 +39,27 @@
public static void main(String[] args) {
runDebuggee(ExceptionDebuggee.class);
}
-
+
@Override
public void run(){
-
+
logWriter.println("--> ExceptionDebuggee: STARTED");
// load and prepare DebuggeeException class
- DebuggeeException ex = new DebuggeeException("fake exception");
-
+ DebuggeeException ex = new DebuggeeException("dummy exception");
+
synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
-
+
logWriter.println("--> ExceptionDebuggee: Wait for SGNL_CONTINUE...");
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_CONTINUE);
logWriter.println("--> ExceptionDebuggee: SGNL_CONTINUE has been received!");
-
+
try {
// throw caught exception
throw new DebuggeeException("Caught debuggee exception");
} catch (DebuggeeException e) {
logWriter.println("-- ExceptionDebuggee: Exception: \""+e.getMessage()+"\" was thrown");
}
-
+
synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
logWriter.println("DUMP{" + ex + "}");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues002Test.java
index e4fcf01..641bba9 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues002Test.java
@@ -131,7 +131,7 @@
assertEquals("Invalid number of values,", checkedFieldsNumber - 1, returnedValuesNumber);
byte expectedFieldTags[] = {
- 0, // placeholder
+ 0, // dummy
JDWPConstants.Tag.LONG_TAG,
JDWPConstants.Tag.INT_TAG,
JDWPConstants.Tag.STRING_TAG,
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValuesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValuesTest.java
index 5339ec2..7d86429 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValuesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValuesTest.java
@@ -130,7 +130,7 @@
assertEquals("Invalid number of values,", checkedFieldsNumber - 1, returnedValuesNumber);
byte expectedFieldTags[] = {
- 0, // fake
+ 0, // dummy
JDWPConstants.Tag.INT_TAG,
JDWPConstants.Tag.LONG_TAG,
JDWPConstants.Tag.OBJECT_TAG,
diff --git a/support/src/test/java/tests/support/Support_FakePKCS12Keystore.java b/support/src/test/java/tests/support/Support_DummyPKCS12Keystore.java
similarity index 96%
rename from support/src/test/java/tests/support/Support_FakePKCS12Keystore.java
rename to support/src/test/java/tests/support/Support_DummyPKCS12Keystore.java
index 7a13af4..9dedff3 100644
--- a/support/src/test/java/tests/support/Support_FakePKCS12Keystore.java
+++ b/support/src/test/java/tests/support/Support_DummyPKCS12Keystore.java
@@ -33,9 +33,9 @@
/**
* Empty implementation used to enable unit tests to run.
*/
-public class Support_FakePKCS12Keystore extends KeyStoreSpi {
+public class Support_DummyPKCS12Keystore extends KeyStoreSpi {
- public Support_FakePKCS12Keystore() {
+ public Support_DummyPKCS12Keystore() {
super();
}
diff --git a/support/src/test/java/tests/support/Support_ProviderJCE.java b/support/src/test/java/tests/support/Support_ProviderJCE.java
index 7949e51..6687a33 100644
--- a/support/src/test/java/tests/support/Support_ProviderJCE.java
+++ b/support/src/test/java/tests/support/Support_ProviderJCE.java
@@ -22,7 +22,7 @@
import java.security.Provider;
/**
- * This class implements a fake security provider
+ * This class implements a dummy security provider
*/
public class Support_ProviderJCE extends Provider {
private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@
+ " DSA key, parameter generation and signing; SHA-1 digest";
/**
- * Constructs a new instance of the fake provider.
+ * Constructs a new instance of the dummy provider.
*/
public Support_ProviderJCE() {
super(NAME, VERSION, INFO);
diff --git a/support/src/test/java/tests/support/Support_ProviderRSA.java b/support/src/test/java/tests/support/Support_ProviderRSA.java
index 26fa6f2..4db0043 100644
--- a/support/src/test/java/tests/support/Support_ProviderRSA.java
+++ b/support/src/test/java/tests/support/Support_ProviderRSA.java
@@ -22,7 +22,7 @@
import java.security.Provider;
/**
- * This class implements a fake provider.
+ * This class implements a dummy provider.
*/
public class Support_ProviderRSA extends Provider {
private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@
+ " DSA key, parameter generation and signing; SHA-1 digest";
/**
- * Constructs a new instance of the fake provider.
+ * Constructs a new instance of the dummy provider.
*/
public Support_ProviderRSA() {
super(NAME, VERSION, INFO);
