Skip to content

Commit b0bc783

Browse files
committed
crash fixes
1 parent 8db9b7a commit b0bc783

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

exoplayer-amzn-2.10.6/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,12 @@ public final void invalidateMediaSessionMetadata() {
686686
mediaMetadataProvider != null && player != null
687687
? mediaMetadataProvider.getMetadata(player)
688688
: METADATA_EMPTY;
689-
mediaSession.setMetadata(metadata != null ? metadata : METADATA_EMPTY);
689+
// MOD: fix NullPointerException: Attempt to invoke virtual method 'int java.lang.String.length()' on a null object reference
690+
try {
691+
mediaSession.setMetadata(metadata != null ? metadata : METADATA_EMPTY);
692+
} catch (NullPointerException e) {
693+
e.printStackTrace();
694+
}
690695
}
691696

692697
/**

smarttubetv/multidex-keep.pro

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,17 @@
180180
-keepclassmembers interface com.google.android.exoplayer2.Player$EventListener {
181181
void onPlaybackParametersChanged(com.google.android.exoplayer2.PlaybackParameters);
182182
}
183+
-keepclassmembers interface com.google.android.exoplayer2.Player {
184+
boolean isPlaying();
185+
}
186+
-keepclassmembers class com.liskovsoft.sharedutils.locale.LocaleContextWrapper {
187+
public static android.content.Context wrap(android.content.Context, java.util.Locale, android.util.DisplayMetrics);
188+
}
189+
-keepclassmembers class kotlin.collections.ArraysKt___ArraysKt {
190+
public static java.lang.Object firstOrNull(java.lang.Object[]);
191+
}
192+
193+
# NOTE: Debug build: VirusTotal (Google: Detected, Ikarus: Trojan.AndroidOS.Agent)
183194
#-keep class androidx.recyclerview.widget.RecyclerView { *; }
184195
#-keep class com.google.android.exoplayer2.C { *; }
185196
#-keep class kotlin.collections.CollectionsKt__CollectionsKt { *; }

0 commit comments

Comments
 (0)