Merge a9231f3 into 6bf9316

Author: berile

gma/integration_test/AndroidManifest.xml

@@ -23,12 +23,14 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
-  <application android:label="@string/app_name">
+  <application android:label="@string/app_name"
+    android:taskAffinity="">
     <!-- You may replace the sample App ID below with your own App ID. -->
     <meta-data
         android:name="com.google.android.gms.ads.APPLICATION_ID"
         android:value="ca-app-pub-3940256099942544~3347511713"/>
     <activity android:name="android.app.NativeActivity"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"

gma/src_java/com/google/firebase/gma/internal/cpp/AdInspectorHelper.java

@@ -16,10 +16,8 @@
 
 package com.google.firebase.gma.internal.cpp;
 
-import android.util.Log;
 import com.google.android.gms.ads.AdError;
 import com.google.android.gms.ads.AdInspectorError;
-import com.google.android.gms.ads.MobileAds;
 import com.google.android.gms.ads.OnAdInspectorClosedListener;
 
 /** Helper class for listening to AdInspector closed events. */
@@ -28,17 +26,17 @@ public final class AdInspectorHelper implements OnAdInspectorClosedListener {
    * Pointer to the C++ AdInspectorClosedListener object to invoke when the AdInspector has been
    * closed.
    */
-  private long mNativeCallbackPtr;
+  private final long nativeCallbackPtr;
 
   /** Constructor. */
   AdInspectorHelper(long nativeCallbackPtr) {
-    mNativeCallbackPtr = nativeCallbackPtr;
+    this.nativeCallbackPtr = nativeCallbackPtr;
   }
 
   /** Method that the Android GMA SDK invokes when the AdInspector has been closed. */
   @Override
   public void onAdInspectorClosed(AdInspectorError error) {
-    adInspectorClosedCallback(mNativeCallbackPtr, error);
+    adInspectorClosedCallback(nativeCallbackPtr, error);
   }
 
   /**

gma/src_java/com/google/firebase/gma/internal/cpp/AdRequestHelper.java

@@ -16,6 +16,7 @@
 
 package com.google.firebase.gma.internal.cpp;
 
+import androidx.annotation.Nullable;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -35,6 +36,7 @@ public AdRequestHelper() {}
    * @param day The day to use in creating the Date object
    * @return A Date object with the appropriate date
    */
+  @Nullable
   public Date createDate(int year, int month, int day) {
     try {
       Calendar cal = Calendar.getInstance();