Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Enable notification permission feature"

Browse Source 
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
This commit is contained in:
Shubham Dubey
2022-02-06 04:15:32 +00:00
committed by Chris Li
parent dcdc3e3272
commit 7940ad02a7
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -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,21 +5498,17 @@ 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);
secureSettings.insertSettingLocked(
Secure.NOTIFICATION_PERMISSION_ENABLED,
/* enabled= */ "1",
/* enabled= */" 1",
/* tag= */ null,
/* makeDefault= */ false,
SettingsState.SYSTEM_PACKAGE_NAME);
currentVersion = 210;
currentVersion = 209;
}
// vXXX: Add new settings above this point.

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

@@ -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);