commit 6bf395c984ed3f69711663b006aeffbb0f7e8a90
author Jeff Hamilton <jham@google.com> Tue Aug 06 19:44:52 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 06 19:44:52 2013 +0000
tree 245eddc4d5eebaeef388f865e18e85ef930a2f71
parent fd457c259610a8a7533482b160ffd8607db78b40
parent b276278567ee51bf43669a5da4b55deea8e4df09

Merge "Fix Wallet robolectric tests, Part 1"

Android.mk

diff --git a/Android.mk b/Android.mk
index 7f8f2c4..c114e88 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := robolectric
-LOCAL_SDK_VERSION := 16
+LOCAL_SDK_VERSION := 17
 LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
 LOCAL_STATIC_JAVA_LIBRARIES := \
         robolectric-android-support-v4 \

src/main/java/com/xtremelabs/robolectric/Robolectric.java

diff --git a/src/main/java/com/xtremelabs/robolectric/Robolectric.java b/src/main/java/com/xtremelabs/robolectric/Robolectric.java
index c00d5bc..f7934d0 100644
--- a/src/main/java/com/xtremelabs/robolectric/Robolectric.java
+++ b/src/main/java/com/xtremelabs/robolectric/Robolectric.java
@@ -297,6 +297,7 @@
                 ShadowSensorManager.class,
                 ShadowService.class,
                 ShadowSettings.class,
+                ShadowSettings.ShadowGlobal.class,
                 ShadowSettings.ShadowSecure.class,
                 ShadowSettings.ShadowSystem.class,
                 ShadowSignature.class,

src/main/java/com/xtremelabs/robolectric/shadows/ShadowSettings.java

diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSettings.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSettings.java
index 521091d..f8787ea 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSettings.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowSettings.java
@@ -127,6 +127,10 @@
     public static class ShadowSecure extends SettingsImpl {
     }
 
+    @Implements(Settings.Global.class)
+    public static class ShadowGlobal extends SettingsImpl {
+    }
+
     /**
      * Non-Android accessor that allows the value of the AIRPLANE_MODE_ON setting to be set.
      *

src/main/java/com/xtremelabs/robolectric/tester/android/content/pm/StubPackageManager.java

diff --git a/src/main/java/com/xtremelabs/robolectric/tester/android/content/pm/StubPackageManager.java b/src/main/java/com/xtremelabs/robolectric/tester/android/content/pm/StubPackageManager.java
index 7f49282..b3a795d 100644
--- a/src/main/java/com/xtremelabs/robolectric/tester/android/content/pm/StubPackageManager.java
+++ b/src/main/java/com/xtremelabs/robolectric/tester/android/content/pm/StubPackageManager.java
@@ -290,9 +290,12 @@
         return false;
     }
 
-	@Override public void verifyPendingInstall(int id, int verificationCode) {
-	}
+    @Override public void verifyPendingInstall(int id, int verificationCode) {
+    }
 
-	@Override public void setInstallerPackageName(String targetPackage, String installerPackageName) {
-	}
+    @Override public void setInstallerPackageName(String targetPackage, String installerPackageName) {
+    }
+
+    @Override public void extendVerificationTimeout(int id, int verificationCodeAtTimeout, long millisecondsToDelay) {
+    }
 }