commit bbcc221a87dbafbf0b03d65fa19dbd414cd45315
author Julia Reynolds <juliacr@google.com> Fri Mar 16 16:41:52 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 16 16:41:52 2018 +0000
tree 6c6a16eb0fa3333a398bdcfc1d4a358d55e5ba05
parent b9ef0adf66e642d8eec2f9e35ccab83343003737
parent cc611845bfc41472ea6aa36cac0055bfd8eb46a2

Merge "Fix channel screen launching" into pi-dev am: a0cb928098
am: cc611845bf

Change-Id: I1ec1459dd06065228957991ce4a04954dcd3c1dd

src/com/android/settings/notification/NotificationSettingsBase.java

diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 01f9e88..7583ec9 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -44,6 +44,7 @@
 import android.widget.Toast;
 
 import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
@@ -143,9 +144,13 @@
             return;
         }
         collectConfigActivities();
-        Bundle args = getArguments();
-        mChannel = (args != null && args.containsKey(Settings.EXTRA_CHANNEL_ID)) ?
-                mBackend.getChannel(mPkg, mUid, args.getString(Settings.EXTRA_CHANNEL_ID)) : null;
+        Intent intent = getActivity().getIntent();
+        String channelId = intent != null ? intent.getStringExtra(Settings.EXTRA_CHANNEL_ID) : null;
+        if (channelId == null && intent != null) {
+            Bundle args = intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+            channelId = args != null ? args.getString(Settings.EXTRA_CHANNEL_ID) : null;
+        }
+        mChannel = mBackend.getChannel(mPkg, mUid, channelId);
 
         NotificationChannelGroup group = null;