Snap for 11206181 from 33d59e3de8dcdb590b3ecc67bbf1b34cfd7ca2ab to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ib6a0e9e5f6927d0e4d82ccc5196a712097d41ba8

3 files changed, 30 insertions, 3 deletions

diff --git a/app/src/com/android/car/carlauncher/CarLauncherUtils.java b/app/src/com/android/car/carlauncher/CarLauncherUtils.java
index 822e88e9..9440ed07 100644
--- a/app/src/com/android/car/carlauncher/CarLauncherUtils.java
+++ b/app/src/com/android/car/carlauncher/CarLauncherUtils.java
@@ -91,6 +91,7 @@ public class CarLauncherUtils {
     public static boolean isSmallCanvasOptimizedMapIntentConfigured(Context context) {
         String intentString = context.getString(R.string.config_smallCanvasOptimizedMapIntent);
         if (intentString.isEmpty()) {
+            Log.d(TAG, "Empty intent URI in config_smallCanvasOptimizedMapIntent");
             return false;
         }
 
@@ -98,6 +99,8 @@ public class CarLauncherUtils {
             Intent.parseUri(intentString, Intent.URI_INTENT_SCHEME);
             return true;
         } catch (URISyntaxException e) {
+            Log.w(TAG, "Invalid intent URI in config_smallCanvasOptimizedMapIntent: \""
+                    + intentString);
             return false;
         }
     }
diff --git a/app/src/com/android/car/carlauncher/homescreen/HomeCardFragment.java b/app/src/com/android/car/carlauncher/homescreen/HomeCardFragment.java
index 3a09a00f..51a1eb3c 100644
--- a/app/src/com/android/car/carlauncher/homescreen/HomeCardFragment.java
+++ b/app/src/com/android/car/carlauncher/homescreen/HomeCardFragment.java
@@ -18,6 +18,7 @@ package com.android.car.carlauncher.homescreen;
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.util.Log;
 import android.util.Size;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,6 +29,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 
 import com.android.car.apps.common.CrossfadeImageView;
 import com.android.car.carlauncher.R;
@@ -51,6 +53,8 @@ import com.android.internal.util.ArrayUtils;
  */
 public class HomeCardFragment extends Fragment implements HomeCardInterface.View {
 
+    private static final String TAG = HomeCardFragment.class.getSimpleName();
+
     private Size mSize;
     private View mCardBackground;
     private CrossfadeImageView mCardBackgroundImage;
@@ -192,7 +196,12 @@ public class HomeCardFragment extends Fragment implements HomeCardInterface.View
      * Updates the card's header: name and icon of source app
      */
     public void updateHeaderView(CardHeader header) {
-        requireActivity().runOnUiThread(() -> {
+        FragmentActivity activity = getActivity();
+        if (activity == null) {
+            Log.w(TAG, "attempting to update header without activity");
+            return;
+        }
+        activity.runOnUiThread(() -> {
             mRootView.setVisibility(View.VISIBLE);
             mCardTitle.setText(header.getCardTitle());
             mCardIcon.setImageDrawable(header.getCardIcon());
@@ -203,7 +212,12 @@ public class HomeCardFragment extends Fragment implements HomeCardInterface.View
      * Updates the card's content
      */
     public final void updateContentView(CardContent content) {
-        requireActivity().runOnUiThread(() -> {
+        FragmentActivity activity = getActivity();
+        if (activity == null) {
+            Log.w(TAG, "attempting to update content without activity");
+            return;
+        }
+        activity.runOnUiThread(() -> {
             hideAllViews();
             updateContentViewInternal(content);
         });
diff --git a/app/src/com/android/car/carlauncher/homescreen/audio/AudioFragment.java b/app/src/com/android/car/carlauncher/homescreen/audio/AudioFragment.java
index 25abd144..af9db40b 100644
--- a/app/src/com/android/car/carlauncher/homescreen/audio/AudioFragment.java
+++ b/app/src/com/android/car/carlauncher/homescreen/audio/AudioFragment.java
@@ -20,6 +20,7 @@ import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.Size;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,6 +30,8 @@ import android.widget.ProgressBar;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import androidx.fragment.app.FragmentActivity;
+
 import com.android.car.apps.common.BitmapUtils;
 import com.android.car.apps.common.ImageUtils;
 import com.android.car.carlauncher.R;
@@ -56,6 +59,8 @@ public class AudioFragment extends HomeCardFragment {
         void onMediaViewInitialized();
     }
 
+    private static final String TAG = AudioFragment.class.getSimpleName();
+
     private Chronometer mChronometer;
     private View mChronometerSeparator;
     private float mBlurRadius;
@@ -251,7 +256,12 @@ public class AudioFragment extends HomeCardFragment {
      * Updates the seekbar/progress bar progress and times
      */
     public void updateProgress(SeekBarViewModel seekBarViewModel, boolean updateProgress) {
-        requireActivity().runOnUiThread(() -> {
+        FragmentActivity activity = getActivity();
+        if (activity == null) {
+            Log.w(TAG, "attempting to update progress without activity");
+            return;
+        }
+        activity.runOnUiThread(() -> {
             updateSeekBarAndTimes(seekBarViewModel, updateProgress);
         });
     }