diff options
| -rw-r--r-- | test-rules/src/platform_compat/java/android/compat/CompatChangeRule.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test-rules/src/platform_compat/java/android/compat/CompatChangeRule.java b/test-rules/src/platform_compat/java/android/compat/CompatChangeRule.java index 1bae1a2c31..d9c800ab44 100644 --- a/test-rules/src/platform_compat/java/android/compat/CompatChangeRule.java +++ b/test-rules/src/platform_compat/java/android/compat/CompatChangeRule.java @@ -108,19 +108,20 @@ public class CompatChangeRule implements TestRule { Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); String packageName = instrumentation.getTargetContext().getPackageName(); IPlatformCompat platformCompat = IPlatformCompat.Stub - .asInterface(ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); + .asInterface(ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); if (platformCompat == null) { throw new IllegalStateException("Could not get IPlatformCompat service!"); } Compatibility.setOverrides(config); try { - platformCompat.setOverrides(new CompatibilityChangeConfig(config), packageName); + platformCompat.setOverridesForTest(new CompatibilityChangeConfig(config), + packageName); try { testStatement.evaluate(); } finally { platformCompat.clearOverrides(packageName); } - } catch(RemoteException e) { + } catch (RemoteException e) { throw new RuntimeException("Could not call IPlatformCompat binder method!", e); } finally { Compatibility.clearOverrides(); |