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

Commit 7940ad02 authored by Shubham Dubey's avatar Shubham Dubey Committed by Chris Li
Browse files

Revert "Enable notification permission feature" 

Revert "Ask for notification permission"

Revert submission 16789354-jr-enable-perm-feature

Reason for revert: Breaking Camera and Notification tests
BUG:218116478
BUG:218116141
BUG:218220073
BUG:218219131

Reverted Changes:
Ife73f3d46:Ask for notification permission
I718cc8cb1:Enable notification permission feature

Change-Id: I9cb652b91861d0e68d8b0f783c0499f97bd6c291
parent dcdc3e32

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

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



        private final class UpgradeController {

            private static final int SETTINGS_VERSION = 210;

            private static final int SETTINGS_VERSION = 209;



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



                if (currentVersion == 208) {

                    // Unused

                    currentVersion = 209;

                }

                if (currentVersion == 209) {

                    // Version 209: Enable enforcement of

                    // Version 208: Enable enforcement of

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

                    // to post notifications.

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

                            /* makeDefault= */ false,

                            SettingsState.SYSTEM_PACKAGE_NAME);

                    currentVersion = 210;

                    currentVersion = 209;

                }



                // vXXX: Add new settings above this point.

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

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

                "android.permission.READ_DEVICE_CONFIG",

                "android.permission.READ_CONTACTS");

        Settings.Secure.putIntForUser(

                getContext().getContentResolver(),

                Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 0, USER_SYSTEM);



        MockitoAnnotations.initMocks(this);