Merge branch 'dev' into patch-1
This commit is contained in:
commit
9cdaa37519
2 changed files with 1 additions and 6 deletions
|
@ -35,12 +35,6 @@
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<activity
|
|
||||||
android:name=".player.old.PlayVideoActivity"
|
|
||||||
android:configChanges="orientation|keyboardHidden|screenSize"
|
|
||||||
android:theme="@style/OldVideoPlayerTheme"
|
|
||||||
tools:ignore="UnusedAttribute"/>
|
|
||||||
|
|
||||||
<service
|
<service
|
||||||
android:name=".player.BackgroundPlayer"
|
android:name=".player.BackgroundPlayer"
|
||||||
android:exported="false">
|
android:exported="false">
|
||||||
|
|
|
@ -626,6 +626,7 @@ public final class PopupVideoPlayer extends Service {
|
||||||
@Override
|
@Override
|
||||||
public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
|
public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
|
||||||
super.onLoadingComplete(imageUri, view, loadedImage);
|
super.onLoadingComplete(imageUri, view, loadedImage);
|
||||||
|
if (playerImpl == null) return;
|
||||||
// rebuild notification here since remote view does not release bitmaps,
|
// rebuild notification here since remote view does not release bitmaps,
|
||||||
// causing memory leaks
|
// causing memory leaks
|
||||||
resetNotification();
|
resetNotification();
|
||||||
|
|
Loading…
Add table
Reference in a new issue