Fixes

Author: emilypgoogle

firebase-messaging/src/test/AndroidManifest.xml

@@ -18,7 +18,7 @@
           android:versionCode="1"
           android:versionName="1">
 
-    <!--<uses-sdk android:minSdkVersion="21"/>-->
+    <!--<uses-sdk android:minSdkVersion="23"/>-->
     <application>
         <service android:exported="false"
             android:name="com.google.firebase.components.ComponentDiscoveryService">

firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationRoboTest.java

@@ -475,7 +475,7 @@ public void testClickActionAndLink() {
 
   /** Test that a valid notification with color is displayed. */
   @Test
-  @Config(sdk = Build.VERSION_CODES.LOLLIPOP)
+  @Config(sdk = Build.VERSION_CODES.M)
   public void testColor() {
     final String color = "#123456";
     Bundle data = new Bundle();
@@ -489,7 +489,7 @@ public void testColor() {
   }
 
   @Test
-  @Config(sdk = Build.VERSION_CODES.LOLLIPOP)
+  @Config(sdk = Build.VERSION_CODES.M)
   public void testNoColor() {
     Bundle data = new Bundle();
     data.putString(KEY_TITLE, "title 123");
@@ -503,7 +503,7 @@ public void testNoColor() {
 
   /** Test that the user can choose the default color via AndroidManifest metadata. */
   @Test
-  @Config(sdk = Build.VERSION_CODES.LOLLIPOP)
+  @Config(sdk = Build.VERSION_CODES.M)
   public void testColorFromMetadata() {
     Bundle metadata = new Bundle();
     metadata.putInt(

transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerSchedulerTest.java

@@ -14,7 +14,7 @@
 
 package com.google.android.datatransport.runtime.scheduling.jobscheduling;
 
-import static android.os.Build.VERSION_CODES.LOLLIPOP;
+import static android.os.Build.VERSION_CODES.M;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.AdditionalMatchers.gt;
 import static org.mockito.ArgumentMatchers.any;
@@ -47,7 +47,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-@Config(sdk = {LOLLIPOP})
+@Config(sdk = {M})
 @RunWith(RobolectricTestRunner.class)
 public class AlarmManagerSchedulerTest {
   private static final long TWENTY_FOUR_HOURS = 24 * 60 * 60 * 1000;

transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoSchedulerTest.java

@@ -14,7 +14,7 @@
 
 package com.google.android.datatransport.runtime.scheduling.jobscheduling;
 
-import static android.os.Build.VERSION_CODES.LOLLIPOP;
+import static android.os.Build.VERSION_CODES.M;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.app.job.JobInfo;
@@ -37,7 +37,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-@Config(sdk = {LOLLIPOP})
+@Config(sdk = {M})
 @RunWith(RobolectricTestRunner.class)
 public class JobInfoSchedulerTest {
   private static final long TWENTY_FOUR_HOURS = 24 * 60 * 60 * 1000;

transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/UploaderTest.java

@@ -14,7 +14,7 @@
 
 package com.google.android.datatransport.runtime.scheduling.jobscheduling;
 
-import static android.os.Build.VERSION_CODES.LOLLIPOP;
+import static android.os.Build.VERSION_CODES.M;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -52,7 +52,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-@Config(sdk = {LOLLIPOP})
+@Config(sdk = {M})
 @RunWith(RobolectricTestRunner.class)
 public class UploaderTest {
   private static final SynchronizationGuard guard =