FcmRegistration: lazily initialize Firebase objects am: a8683c33e6 am: 8e0a40638d am: 2e031b271d am: 80a9cf561faml_wif_331910020aml_wif_331810010aml_wif_331710030aml_wif_331613000aml_wif_331511020aml_wif_331414000aml_wif_331310070aml_wif_331112000aml_wif_331016070aml_wif_330910030aml_wif_330810040aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_tet_331910040aml_tet_331820050aml_tet_331711040aml_tet_331511160aml_tet_331511000aml_tet_331412030aml_tet_331312080aml_tet_331117000aml_tet_331012080aml_tet_330911010aml_tet_330812150aml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020aml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000aml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010aml_sch_331113000aml_sch_331111000aml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000aml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030aml_neu_331310000aml_neu_331113000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020aml_med_331911000aml_med_331712010aml_med_331612000aml_med_331511000aml_med_331410000aml_med_331318000aml_med_331115000aml_med_331012020aml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020aml_ext_331814220aml_ext_331412000aml_ext_331312000aml_ext_331112010aml_ext_331012020aml_doc_331120000aml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010aml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_adb_331610000aml_adb_331314020aml_adb_331113120aml_adb_331011050aml_adb_331011040android13-mainline-wifi-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-tethering-releaseandroid13-mainline-sdkext-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-resolv-releaseandroid13-mainline-permission-releaseandroid13-mainline-os-statsd-releaseandroid13-mainline-networking-releaseandroid13-mainline-mediaprovider-releaseandroid13-mainline-media-swcodec-releaseandroid13-mainline-media-releaseandroid13-mainline-ipsec-releaseandroid13-mainline-extservices-releaseandroid13-mainline-conscrypt-releaseandroid13-mainline-cellbroadcast-releaseandroid13-mainline-art-releaseandroid13-mainline-adbd-releaseaml_tz4_332714010

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ImsServiceEntitlement/+/2021376

Change-Id: I827de98ef124b3bd6410f0c3aaab4519f0b92b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 20 insertions, 21 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) {