diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 51870e2e958ed..077337cdc8c3e 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -3624,7 +3624,7 @@ public class SettingsProvider extends ContentProvider {
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 209;
+            private static final int SETTINGS_VERSION = 210;
 
             private final int mUserId;
 
@@ -5498,17 +5498,21 @@ public class SettingsProvider extends ContentProvider {
                 }
 
                 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
                     // to post notifications.
                     final SettingsState secureSettings = getSecureSettingsLocked(userId);
                     secureSettings.insertSettingLocked(
                             Secure.NOTIFICATION_PERMISSION_ENABLED,
-                            /* enabled= */" 1",
+                            /* enabled= */ "1",
                             /* tag= */ null,
                             /* makeDefault= */ false,
                             SettingsState.SYSTEM_PACKAGE_NAME);
-                    currentVersion = 209;
+                    currentVersion = 210;
                 }
 
                 // vXXX: Add new settings above this point.
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
index 9f92294135c0b..d4d076566fb36 100755
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
@@ -372,6 +372,9 @@ 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);