Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2915)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/media/ui/NotificationMediaPlaybackControls.java

Issue 1328663003: [Custom tab]Fix a bug that clicking media notification opens blank tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final touch Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/media/ui/NotificationMediaPlaybackControls.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/NotificationMediaPlaybackControls.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/NotificationMediaPlaybackControls.java
index 7df892a41985ad0137cb1e37ceb91f1d8315c470..6fe95f76dfdb7c91d046f0f3cf3734840cedd624 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/NotificationMediaPlaybackControls.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/NotificationMediaPlaybackControls.java
@@ -346,12 +346,6 @@ public class NotificationMediaPlaybackControls {
return title.startsWith("\u25B6") ? title.substring(1).trim() : title;
}
- private PendingIntent createContentIntent() {
- int tabId = mMediaNotificationInfo.tabId;
- return PendingIntent.getActivity(
- mContext, tabId, Tab.createBringTabToFrontIntent(tabId), 0);
- }
-
private MediaMetadataCompat createMetadata() {
MediaMetadataCompat.Builder metadataBuilder = new MediaMetadataCompat.Builder();
@@ -398,10 +392,15 @@ public class NotificationMediaPlaybackControls {
.setDeleteIntent(mService.getPendingIntent(ListenerService.ACTION_STOP));
}
mNotificationBuilder.setOngoing(!mMediaNotificationInfo.isPaused);
- mNotificationBuilder.setContentIntent(createContentIntent());
- RemoteViews contentView = createContentView();
+ int tabId = mMediaNotificationInfo.tabId;
+ Intent tabIntent = Tab.createBringTabToFrontIntent(tabId);
+ if (tabIntent != null) {
+ mNotificationBuilder
+ .setContentIntent(PendingIntent.getActivity(mContext, tabId, tabIntent, 0));
+ }
+ RemoteViews contentView = createContentView();
contentView.setTextViewText(R.id.title, mMediaNotificationInfo.title);
contentView.setTextViewText(R.id.status, mMediaNotificationInfo.origin);
if (mNotificationIcon != null) {

Powered by Google App Engine
This is Rietveld 408576698