Snap for 8730993 from ecd25decb84824c60cbef7270ebd3aa930d31f5f to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: I876b09adb7b13efedc5e1c2f87207e58d2545b6e

4 files changed, 3 insertions, 32 deletions

diff --git a/Android.bp b/Android.bp
index 2778c13..e01b0af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,9 +75,6 @@ java_test {
 
     // b/73499927
     errorprone: {
-        javacflags: [
-            "-Xep:MissingOverride:OFF",
-            "-Xep:DoNotCall:OFF",
-        ],
+        javacflags: ["-Xep:MissingOverride:OFF"],
     },
 }
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java
index f36da99..fa9882d 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java
@@ -82,7 +82,7 @@ import java.util.HashMap;
 public class TestOptions {
 
     /** Default timeout value for various operations. */
-    public static final int DEFAULT_TIMEOUT = 2 * 60 * 1000; // 2 minutes
+    public static final int DEFAULT_TIMEOUT = 1 * 60 * 1000; // 1 minute
 
     /** Default time interval for waiting for various events. */
     public static final int DEFAULT_WAITING_TIME = DEFAULT_TIMEOUT;
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
index 36583c6..22409f7 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
+++ b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
@@ -19,12 +19,8 @@ package org.apache.harmony.sql.tests.java.sql;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
 import java.util.HashMap;
 
-import java.util.Properties;
 import junit.framework.TestCase;
 
 public class ConnectionTest extends TestCase {
@@ -89,25 +85,5 @@ public class ConnectionTest extends TestCase {
 
     } // end method testPublicStatics
 
-    private static final String CONNECTION_URL = TestHelper_Driver4.URL_SCHEME + ":data2";
-
-    public void testGetConnection_unauthenticated() {
-        try {
-            DriverManager.getConnection(CONNECTION_URL);
-            fail("TestHelper_Driver4 should throw SQLException for unauthenicated connection");
-        } catch (SQLException e) {
-            // expected
-        }
-    }
-
-    public void testGetConnection_authenticated() throws SQLException {
-        Properties credentials = new Properties();
-        credentials.put(TestHelper_Driver4.userProperty, TestHelper_Driver4.validuser);
-        credentials.put(TestHelper_Driver4.passwordProperty, TestHelper_Driver4.validpassword);
-        Connection conn = DriverManager.getConnection(CONNECTION_URL, credentials);
-        assertTrue(conn instanceof TestHelper_Connection1);
-    }
-
-
 } // end class ConnectionTest
 
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
index a44ab2e..f4fa4d8 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
+++ b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
@@ -28,8 +28,6 @@ import java.util.Properties;
  * Basic JDBC driver implementation to help with tests
  */
 public class TestHelper_Driver4 implements Driver {
-    static final String URL_SCHEME = "jdbc:mikes4";
-
     int majorVersion = 1;
 
     int minorVersion = 0;
@@ -49,7 +47,7 @@ public class TestHelper_Driver4 implements Driver {
 
     protected TestHelper_Driver4() {
         super();
-        baseURL = URL_SCHEME;
+        baseURL = "jdbc:mikes4";
     } // end constructor TestHelper_Driver4()
 
     public boolean acceptsURL(String url) throws SQLException {