Merge pull request #6884 from utzcoz/only-using-AttributionSource-for…

…-compile-SDK-31-and-above Only using AttributionSource for compile sdk 31 and above
robolectric · Nov 27, 2021 · 2ca5469 · 2ca5469
2 parents bda68fd + e54a4cc
commit 2ca5469
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 
     dependencies {
         gradle
-        classpath 'com.android.tools.build:gradle:7.1.0-beta03'
+        classpath 'com.android.tools.build:gradle:7.1.0-beta04'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
         classpath 'com.netflix.nebula:gradle-aggregate-javadocs-plugin:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     api "com.google.guava:guava:27.0.1-jre"
     api 'org.jetbrains:annotations:16.0.2'
     implementation "org.ow2.asm:asm-tree:9.2"
-    implementation 'com.android.tools.build:gradle:7.1.0-beta03'
+    implementation 'com.android.tools.build:gradle:7.1.0-beta04'
 }
diff --git a/integration_tests/compat-target29/build.gradle b/integration_tests/compat-target29/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     testCompileOnly AndroidSdk.Q.coordinates
     testRuntime AndroidSdk.Q.coordinates
-    testImplementation("androidx.test:core:$axtVersion")
+    testImplementation "androidx.test:core:$axtVersion"
     testImplementation "junit:junit:$junitVersion"
     testImplementation "com.google.truth:truth:$truthVersion"
 }
diff --git a/...29/src/test/java/org/robolectric/integration/compat/target29/Target29CompatibilityTest.kt b/...29/src/test/java/org/robolectric/integration/compat/target29/Target29CompatibilityTest.kt
@@ -5,14 +5,22 @@ import androidx.test.core.app.ApplicationProvider
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
 class Target29CompatibilityTest {
+    private val application = ApplicationProvider.getApplicationContext<Context>();
+
     @Test
     fun `Initialize LocationManager succeed`() {
-        val application = ApplicationProvider.getApplicationContext<Context>()
         val locationManager = application.getSystemService(Context.LOCATION_SERVICE)
         assertThat(locationManager).isNotNull()
     }
+
+    @Test
+    fun `Initialize AppOpsManager succeed`() {
+        val appOpsManager = application.getSystemService(Context.APP_OPS_SERVICE);
+        assertThat(appOpsManager).isNotNull();
+    }
 }
diff --git a/...or/src/main/java/org/robolectric/annotation/processing/validator/ImplementsValidator.java b/...or/src/main/java/org/robolectric/annotation/processing/validator/ImplementsValidator.java
@@ -156,7 +156,7 @@ public Void visitType(TypeElement shadowType, Element parent) {
     AnnotationValue looseSignaturesAttr =
         Helpers.getAnnotationTypeMirrorValue(am, "looseSignatures");
     boolean looseSignatures =
-        looseSignaturesAttr == null ? false : (Boolean) looseSignaturesAttr.getValue();
+        looseSignaturesAttr != null && (Boolean) looseSignaturesAttr.getValue();
     validateShadowMethods(actualType, shadowType, minSdk, maxSdk, looseSignatures);
 
     modelBuilder.addShadowType(shadowType, actualType,

diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppOpsManager.java
@@ -30,8 +30,10 @@
 import android.util.ArrayMap;
 import android.util.LongSparseArray;
 import android.util.LongSparseLongArray;
+import androidx.annotation.RequiresApi;
 import com.android.internal.app.IAppOpsService;
 import com.google.auto.value.AutoValue;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
@@ -57,7 +59,7 @@
 import org.robolectric.util.ReflectionHelpers;
 import org.robolectric.util.ReflectionHelpers.ClassParameter;
 
-@Implements(value = AppOpsManager.class)
+@Implements(value = AppOpsManager.class, looseSignatures = true)
 public class ShadowAppOpsManager {
 
   // OpEntry fields that the shadow doesn't currently allow the test to configure.
@@ -394,18 +396,21 @@ protected int noteProxyOpNoThrow(
     return checkOpNoThrow(op, proxiedUid, proxiedPackageName);
   }
 
+  @RequiresApi(api = Build.VERSION_CODES.S)
   @Implementation(minSdk = Build.VERSION_CODES.S)
   protected int noteProxyOpNoThrow(
-      int op,
-      AttributionSource attributionSource,
-      String message,
-      boolean ignoredSkipProxyOperation) {
+      Object op, Object attributionSource, Object message, Object ignoredSkipProxyOperation) {
+    Preconditions.checkArgument(op instanceof Integer);
+    Preconditions.checkArgument(attributionSource instanceof AttributionSource);
+    Preconditions.checkArgument(message == null || message instanceof String);
+    Preconditions.checkArgument(ignoredSkipProxyOperation instanceof Boolean);
+    AttributionSource castedAttributionSource = (AttributionSource) attributionSource;
     return noteProxyOpNoThrow(
-        op,
-        attributionSource.getNextPackageName(),
-        attributionSource.getNextUid(),
-        attributionSource.getNextAttributionTag(),
-        message);
+        (int) op,
+        castedAttributionSource.getNextPackageName(),
+        castedAttributionSource.getNextUid(),
+        castedAttributionSource.getNextAttributionTag(),
+        (String) message);
   }
 
   @Implementation(minSdk = KITKAT)