Snap for 8369763 from 80a9cf561fa8b7b72f8beee692f42e48fc678350 to mainline-go-adservices-releaseaml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-mainline-go-adservices-release

Change-Id: I64ddcd5f36f06e36874d20a9414e2757fa5ffa15

2 files changed, 20 insertions, 22 deletions

diff --git a/src/com/android/imsserviceentitlement/fcm/FcmRegistrationService.java b/src/com/android/imsserviceentitlement/fcm/FcmRegistrationService.java
index 8aaf419..184740d 100644
--- a/src/com/android/imsserviceentitlement/fcm/FcmRegistrationService.java
+++ b/src/com/android/imsserviceentitlement/fcm/FcmRegistrationService.java
@@ -68,21 +68,23 @@ public class FcmRegistrationService extends JobService {
         super.attachBaseContext(base);
     }
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        try {
-            mApp = FirebaseApp.getInstance();
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "initialize FirebaseApp");
-            mApp = FirebaseApp.initializeApp(
-                    this,
-                    new FirebaseOptions.Builder()
-                            .setApplicationId(getResources().getString(R.string.fcm_app_id))
-                            .setProjectId(getResources().getString(R.string.fcm_project_id))
-                            .setApiKey(getResources().getString(R.string.fcm_api_key))
-                            .build());
+    /** Returns a {@link FirebaseApp} instance, lazily initialized. */
+    private FirebaseApp getFirebaseApp() {
+        if (mApp == null) {
+            try {
+                mApp = FirebaseApp.getInstance();
+            } catch (IllegalStateException e) {
+                Log.d(TAG, "initialize FirebaseApp");
+                mApp = FirebaseApp.initializeApp(
+                        this,
+                        new FirebaseOptions.Builder()
+                                .setApplicationId(getResources().getString(R.string.fcm_app_id))
+                                .setProjectId(getResources().getString(R.string.fcm_project_id))
+                                .setApiKey(getResources().getString(R.string.fcm_api_key))
+                                .build());
+            }
         }
+        return mApp;
     }
 
     @Override
@@ -109,13 +111,8 @@ public class FcmRegistrationService extends JobService {
      */
     protected void onHandleWork(JobParameters params) {
         boolean wantsReschedule = false;
-        FirebaseInstanceId instanceID = getFirebaseInstanceId();
-        if (instanceID == null) {
-            Log.d(TAG, "Cannot get fcm token because FirebaseInstanceId is null");
-            return;
-        }
         for (int subId : TelephonyUtils.getSubIdsWithFcmSupported(this)) {
-            if (!updateFcmToken(instanceID, subId)) {
+            if (!updateFcmToken(getFirebaseInstanceId(), subId)) {
                 wantsReschedule = true;
             }
         }
@@ -137,7 +134,9 @@ public class FcmRegistrationService extends JobService {
     }
 
     private FirebaseInstanceId getFirebaseInstanceId() {
-        return (mFakeInstanceID != null) ? mFakeInstanceID : FirebaseInstanceId.getInstance(mApp);
+        return (mFakeInstanceID != null)
+                ? mFakeInstanceID
+                : FirebaseInstanceId.getInstance(getFirebaseApp());
     }
 
     private String getTokenForSubId(FirebaseInstanceId instanceID, int subId) {
diff --git a/tests/unittests/Android.bp b/tests/unittests/Android.bp
index 262aa1e..a93cd1e 100644
--- a/tests/unittests/Android.bp
+++ b/tests/unittests/Android.bp
@@ -33,6 +33,5 @@ android_test {
         "testng",
         "truth-prebuilt",
     ],
-    certificate: "platform",
     test_suites: ["device-tests"],
 }