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

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

Merge "Revert^2 "Enable notification permission feature""

parents d61906a5 556dfd8e

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

+8 −4
Original line number Original line Diff line number Diff line
@@ -3624,7 +3624,7 @@ public class SettingsProvider extends ContentProvider { 
        }

        }





        private final class UpgradeController {

        private final class UpgradeController {

            private static final int SETTINGS_VERSION = 209;

            private static final int SETTINGS_VERSION = 210;





            private final int mUserId;

            private final int mUserId;
@@ -5498,7 +5498,11 @@ public class SettingsProvider extends ContentProvider { 
                }

                }





                if (currentVersion == 208) {

                if (currentVersion == 208) {

                    // Version 208: Enable enforcement of

                    // Unused

                    currentVersion = 209;

                }

                if (currentVersion == 209) {

                    // Version 209: Enable enforcement of

                    // android.Manifest.permission#POST_NOTIFICATIONS in order for applications

                    // android.Manifest.permission#POST_NOTIFICATIONS in order for applications

                    // to post notifications.

                    // to post notifications.

                    final SettingsState secureSettings = getSecureSettingsLocked(userId);

                    final SettingsState secureSettings = getSecureSettingsLocked(userId);
@@ -5508,7 +5512,7 @@ public class SettingsProvider extends ContentProvider { 
                            /* tag= */ null,

                            /* tag= */ null,

                            /* makeDefault= */ false,

                            /* makeDefault= */ false,

                            SettingsState.SYSTEM_PACKAGE_NAME);

                            SettingsState.SYSTEM_PACKAGE_NAME);

                    currentVersion = 209;

                    currentVersion = 210;

                }

                }





                // vXXX: Add new settings above this point.

                // vXXX: Add new settings above this point.

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -372,6 +372,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
                "android.permission.WRITE_DEVICE_CONFIG",

                "android.permission.WRITE_DEVICE_CONFIG",

                "android.permission.READ_DEVICE_CONFIG",

                "android.permission.READ_DEVICE_CONFIG",

                "android.permission.READ_CONTACTS");

                "android.permission.READ_CONTACTS");

        Settings.Secure.putIntForUser(

                getContext().getContentResolver(),

                Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 0, USER_SYSTEM);





        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);