Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0cb9280 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix channel screen launching" into pi-dev

parents 97f63ba9 ee5870ba

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

+8 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.util.Log; 
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 @@ abstract public class NotificationSettingsBase extends DashboardFragment { 
            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;