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

Commit af798227 authored May 09, 2022 by Julia Reynolds Committed by Android (Google) Code Review May 09, 2022

Merge "Remove notification permission feature flag" into tm-dev

parents 19b11131 0be19ec3

core/api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -314,7 +314,6 @@ package android.app {
		public final class NotificationChannel implements android.os.Parcelable {
		method public int getOriginalImportance();
		method public boolean isImportanceLockedByCriticalDeviceFunction();
		method public boolean isImportanceLockedByOEM();
		method public void lockFields(int);
		method public void setDeleted(boolean);
		method public void setDeletedTimeMs(long);

core/java/android/app/NotificationChannel.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -863,14 +863,6 @@ public final class NotificationChannel implements Parcelable {
		mImportanceLockedDefaultApp = locked;
		}

		/**
		* @hide
		*/
		@TestApi
		public boolean isImportanceLockedByOEM() {
		return mImportanceLockedByOEM;
		}

		/**
		* @hide
		*/

core/java/android/provider/Settings.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -10154,15 +10154,6 @@ public final class Settings {
		@Readable
		public static final String NOTIFICATION_DISMISS_RTL = "notification_dismiss_rtl";

		/**
		* Whether the app-level notification setting is represented by a manifest permission.
		*
		* @hide
		*/
		@Readable
		public static final String NOTIFICATION_PERMISSION_ENABLED =
		"notification_permission_enabled";

		/**
		* Comma separated list of QS tiles that have been auto-added already.
		* @hide

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+1 −10

Original line number	Diff line number	Diff line
		@@ -5509,16 +5509,7 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 209;
		}
		if (currentVersion == 209) {
		// Version 209: Enable enforcement of
		// android.Manifest.permission#POST_NOTIFICATIONS in order for applications
		// to post notifications.
		final SettingsState secureSettings = getSecureSettingsLocked(userId);
		secureSettings.insertSettingLocked(
		Secure.NOTIFICATION_PERMISSION_ENABLED,
		/* enabled= */ "1",
		/* tag= */ null,
		/* makeDefault= */ false,
		SettingsState.SYSTEM_PACKAGE_NAME);
		// removed now that feature is enabled for everyone
		currentVersion = 210;
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -160,7 +160,6 @@ class ChannelEditorDialogController @Inject constructor(
		val channels = groupList
		.flatMap { group ->
		group.channels.asSequence().filterNot { channel ->
		channel.isImportanceLockedByOEM \|\|
		channel.importance == IMPORTANCE_NONE \|\|
		channel.isImportanceLockedByCriticalDeviceFunction
		}