From 22b7a7dc39a755668e3f447fa90e1360cabe675d Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 10 Jul 2023 17:47:18 +0100
Subject: [PATCH] Tidy handling of package not found exception in demo

PiperOrigin-RevId: 546900066
---
 .../demo/transformer/TransformerActivity.java | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java
index 9de92e6b32..e5c3875e1c 100644
--- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java
+++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java
@@ -229,15 +229,11 @@ public final class TransformerActivity extends AppCompatActivity {
     String filePath = externalCacheFile.getAbsolutePath();
     @Nullable Bundle bundle = intent.getExtras();
     MediaItem mediaItem = createMediaItem(bundle, inputUri);
-    try {
-      Transformer transformer = createTransformer(bundle, inputUri, filePath);
-      Composition composition = createComposition(mediaItem, bundle);
-      exportStopwatch.start();
-      transformer.start(composition, filePath);
-      this.transformer = transformer;
-    } catch (PackageManager.NameNotFoundException e) {
-      throw new IllegalStateException(e);
-    }
+    Transformer transformer = createTransformer(bundle, inputUri, filePath);
+    Composition composition = createComposition(mediaItem, bundle);
+    exportStopwatch.start();
+    transformer.start(composition, filePath);
+    this.transformer = transformer;
     displayInputButton.setVisibility(View.GONE);
     inputCardView.setVisibility(View.GONE);
     outputPlayerView.setVisibility(View.GONE);
@@ -358,8 +354,7 @@ public final class TransformerActivity extends AppCompatActivity {
     "exportStopwatch",
     "progressViewGroup",
   })
-  private Composition createComposition(MediaItem mediaItem, @Nullable Bundle bundle)
-      throws PackageManager.NameNotFoundException {
+  private Composition createComposition(MediaItem mediaItem, @Nullable Bundle bundle) {
     EditedMediaItem.Builder editedMediaItemBuilder = new EditedMediaItem.Builder(mediaItem);
     // For image inputs. Automatically ignored if input is audio/video.
     editedMediaItemBuilder.setDurationUs(5_000_000).setFrameRate(30);
@@ -419,8 +414,7 @@ public final class TransformerActivity extends AppCompatActivity {
     return processors.build();
   }
 
-  private ImmutableList<Effect> createVideoEffectsFromBundle(Bundle bundle)
-      throws PackageManager.NameNotFoundException {
+  private ImmutableList<Effect> createVideoEffectsFromBundle(Bundle bundle) {
     boolean[] selectedEffects =
         checkStateNotNull(bundle.getBooleanArray(ConfigurationActivity.VIDEO_EFFECTS_SELECTIONS));
     ImmutableList.Builder<Effect> effects = new ImmutableList.Builder<>();
@@ -568,8 +562,7 @@ public final class TransformerActivity extends AppCompatActivity {
   }
 
   @Nullable
-  private OverlayEffect createOverlayEffectFromBundle(Bundle bundle, boolean[] selectedEffects)
-      throws PackageManager.NameNotFoundException {
+  private OverlayEffect createOverlayEffectFromBundle(Bundle bundle, boolean[] selectedEffects) {
     ImmutableList.Builder<TextureOverlay> overlaysBuilder = new ImmutableList.Builder<>();
     if (selectedEffects[ConfigurationActivity.OVERLAY_LOGO_AND_TIMER_INDEX]) {
       float[] logoPositioningMatrix = GlUtil.create4x4IdentityMatrix();
@@ -580,7 +573,12 @@ public final class TransformerActivity extends AppCompatActivity {
               .setMatrix(logoPositioningMatrix)
               .setAnchor(/* x= */ -1f, /* y= */ -1f)
               .build();
-      Drawable logo = getPackageManager().getApplicationIcon(getPackageName());
+      Drawable logo;
+      try {
+        logo = getPackageManager().getApplicationIcon(getPackageName());
+      } catch (PackageManager.NameNotFoundException e) {
+        throw new IllegalStateException(e);
+      }
       logo.setBounds(
           /* left= */ 0, /* top= */ 0, logo.getIntrinsicWidth(), logo.getIntrinsicHeight());
       TextureOverlay logoOverlay = DrawableOverlay.createStaticDrawableOverlay(logo, logoSettings);