PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NAS setting migration" into sc-dev am: 1a44af9585

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14259014

Change-Id: I5d853abd51ecc10c22cf0fd14df6e3c129bebc89
This commit is contained in:
Chloris Kuo
2021-04-22 00:41:22 +00:00
committed by Automerger Merge Worker
parent ddd6e8dde7 1a44af9585
commit 3694584c99
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/NotificationAssistantPreferenceController.java
View File

@@ -77,11 +77,7 @@ public class NotificationAssistantPreferenceController extends TogglePreferenceC
protected void setNotificationAssistantGranted(ComponentName cn) {
if (Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 0, mUserId) == 0) {
for (int profileId : mUserManager.getProfileIds(mUserId, false)) {
Settings.Secure.putIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 1, profileId);
}
mNotificationBackend.resetDefaultNotificationAssistant(cn != null);
mNotificationBackend.setNASMigrationDoneAndResetDefault(mUserId, cn != null);
}
mNotificationBackend.setNotificationAssistantGranted(cn);
}

4
src/com/android/settings/notification/NotificationBackend.java
View File

@@ -570,9 +570,9 @@ public class NotificationBackend {
}
}
public void resetDefaultNotificationAssistant(boolean loadFromConfig) {
public void setNASMigrationDoneAndResetDefault(int userId, boolean loadFromConfig) {
try {
sINM.resetDefaultNotificationAssistant(loadFromConfig);
sINM.setNASMigrationDoneAndResetDefault(userId, loadFromConfig);
} catch (Exception e) {
Log.w(TAG, "Error calling NoMan", e);
}