From 1c542bbeb01b7c110d3416fcaf6469906cb1977c Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Mon, 22 Jan 2018 17:21:58 -0500 Subject: [PATCH] Remove unused intent. Test: cts-verifier Bug: 63927402 Change-Id: I0ae2f33f7e8f1cce9dbe8166b522eb9cbde4c8b5 --- AndroidManifest.xml | 4 - .../notification/AppNotificationSettings.java | 9 -- .../NotificationSettingsBase.java | 9 +- .../ChannelGroupNotificationSettingsTest.java | 133 ------------------ 4 files changed, 1 insertion(+), 154 deletions(-) delete mode 100644 tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a36ec8ba29c..115d3b483cb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2714,10 +2714,6 @@ - - - - diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index ef0f40bb571..333e0600118 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -176,15 +176,6 @@ public class AppNotificationSettings extends NotificationSettingsBase { } else { groupCategory.setTitle(group.getName()); groupCategory.setKey(group.getId()); - Bundle groupArgs = new Bundle(); - groupArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid); - groupArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg); - groupArgs.putString(Settings.EXTRA_CHANNEL_GROUP_ID, group.getId()); - Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(), - ChannelGroupNotificationSettings.class.getName(), - groupArgs, null, R.string.notification_group_title, - null, false, getMetricsCategory()); - groupCategory.setIntent(channelIntent); populateGroupToggle(groupCategory, group); } diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java index 2a7e7d55848..8b0ed463a80 100644 --- a/src/com/android/settings/notification/NotificationSettingsBase.java +++ b/src/com/android/settings/notification/NotificationSettingsBase.java @@ -168,14 +168,7 @@ abstract public class NotificationSettingsBase extends DashboardFragment { mChannel = (args != null && args.containsKey(Settings.EXTRA_CHANNEL_ID)) ? mBackend.getChannel(mPkg, mUid, args.getString(Settings.EXTRA_CHANNEL_ID)) : null; - NotificationChannelGroup group = - (args != null && args.containsKey(Settings.EXTRA_CHANNEL_GROUP_ID)) - ? mBackend.getGroupWithChannels(mPkg, mUid, - args.getString(Settings.EXTRA_CHANNEL_GROUP_ID)) - : null; - if (group != null) { - mChannelGroup = new NotificationChannelGroupWrapper(group); - } + NotificationChannelGroup group = null; mSuspendedAppsAdmin = RestrictedLockUtils.checkIfApplicationIsSuspended( mContext, mPkg, mUserId); diff --git a/tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.java deleted file mode 100644 index ce2c408fa50..00000000000 --- a/tests/unit/src/com/android/settings/notification/ChannelGroupNotificationSettingsTest.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.notification; - -import static android.app.NotificationManager.IMPORTANCE_HIGH; -import static android.app.NotificationManager.IMPORTANCE_MIN; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; - -import static org.hamcrest.Matchers.allOf; -import static org.junit.Assert.fail; - -import android.app.INotificationManager; -import android.app.Instrumentation; -import android.app.NotificationChannel; -import android.app.NotificationChannelGroup; -import android.app.NotificationManager; -import android.content.Context; -import android.content.Intent; -import android.os.Process; -import android.os.ServiceManager; -import android.provider.Settings; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(AndroidJUnit4.class) -@SmallTest -public class ChannelGroupNotificationSettingsTest { - - private Context mTargetContext; - private Instrumentation mInstrumentation; - private NotificationManager mNm; - - @Before - public void setUp() { - mInstrumentation = InstrumentationRegistry.getInstrumentation(); - mTargetContext = mInstrumentation.getTargetContext(); - mNm = (NotificationManager) mTargetContext.getSystemService(Context.NOTIFICATION_SERVICE); - } - - @Test - public void launchNotificationSetting_displaysChannels() { - NotificationChannelGroup group = - new NotificationChannelGroup(this.getClass().getName(), this.getClass().getName()); - group.setDescription("description"); - NotificationChannel channel = new NotificationChannel(this.getClass().getName(), - "channel" + this.getClass().getName(), IMPORTANCE_MIN); - channel.setGroup(this.getClass().getName()); - NotificationChannel channel2 = new NotificationChannel("2"+this.getClass().getName(), - "2channel" + this.getClass().getName(), IMPORTANCE_MIN); - channel2.setGroup(this.getClass().getName()); - - mNm.createNotificationChannelGroup(group); - mNm.createNotificationChannel(channel); - mNm.createNotificationChannel(channel2); - - final Intent intent = new Intent(Settings.ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS) - .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName()) - .putExtra(Settings.EXTRA_CHANNEL_GROUP_ID, group.getId()); - - mInstrumentation.startActivitySync(intent); - - onView(allOf(withText(group.getName().toString()))).check(matches(isDisplayed())); - onView(allOf(withText(channel.getName().toString()))).check( - matches(isDisplayed())); - onView(allOf(withText(group.getDescription().toString()))).check( - matches(isDisplayed())); - onView(allOf(withText(channel2.getName().toString()))).check( - matches(isDisplayed())); - try { - onView(allOf(withText("Android is blocking this group of notifications from" - + " appearing on this device"))).check(matches(isDisplayed())); - fail("Blocking footer erroneously appearing"); - } catch (Exception e) { - // expected - } - } - - @Test - public void launchNotificationSettings_blockedGroup() throws Exception { - NotificationChannelGroup blocked = - new NotificationChannelGroup("blocked", "blocked"); - NotificationChannel channel = - new NotificationChannel("channel", "channel", IMPORTANCE_HIGH); - channel.setGroup(blocked.getId()); - mNm.createNotificationChannelGroup(blocked); - mNm.createNotificationChannel(channel); - - INotificationManager sINM = INotificationManager.Stub.asInterface( - ServiceManager.getService(Context.NOTIFICATION_SERVICE)); - blocked.setBlocked(true); - sINM.updateNotificationChannelGroupForPackage( - mTargetContext.getPackageName(), Process.myUid(), blocked); - - final Intent intent = new Intent(Settings.ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS) - .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName()) - .putExtra(Settings.EXTRA_CHANNEL_GROUP_ID, blocked.getId()); - mInstrumentation.startActivitySync(intent); - - onView(allOf(withText("Off"), isDisplayed())).check(matches(isDisplayed())); - onView(allOf(withText("Android is blocking this group of notifications from" - + " appearing on this device"))).check(matches(isDisplayed())); - - try { - onView(allOf(withText(channel.getName().toString()))).check(matches(isDisplayed())); - fail("settings appearing for blocked group"); - } catch (Exception e) { - // expected - } - } -}