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

Commit f06f289a authored by Chloris Kuo's avatar Chloris Kuo
Browse files

NAS setting migration 

Cancel onboarding notification when user migrates from settings

Test: make RunSettingsRoboTests
Bug: 185428329
Change-Id: I8b6b2eb8340442907c363e686bbd0b32b62d0db0
parent 2affde32

src/com/android/settings/notification/NotificationAssistantPreferenceController.java

+1 −5
Original line number Diff line number Diff line
@@ -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);

    }

src/com/android/settings/notification/NotificationBackend.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }

tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java

+6 −6
Original line number Diff line number Diff line
@@ -122,13 +122,13 @@ public class NotificationAssistantPreferenceControllerTest { 
        assertEquals(1, Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.NAS_SETTINGS_UPDATED, 0, 10));

        verify(mBackend, times(1))

                .resetDefaultNotificationAssistant(eq(true));

                .setNASMigrationDoneAndResetDefault(eq(0), eq(true));



        //Test user enable again, migration should not happen

        mPreferenceController.setNotificationAssistantGranted(mNASComponent);

        //Number of invocations should not increase

        verify(mBackend, times(1))

                .resetDefaultNotificationAssistant(eq(true));

                .setNASMigrationDoneAndResetDefault(eq(0), eq(true));

    }



    @Test
@@ -146,13 +146,13 @@ public class NotificationAssistantPreferenceControllerTest { 
        assertEquals(0, Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.NAS_SETTINGS_UPDATED, 0, 20));

        verify(mBackend, times(1))

                .resetDefaultNotificationAssistant(eq(true));

                .setNASMigrationDoneAndResetDefault(eq(0), eq(true));



        //Test user enable again, migration should not happen

        mPreferenceController.setNotificationAssistantGranted(mNASComponent);

        //Number of invocations should not increase

        verify(mBackend, times(1))

                .resetDefaultNotificationAssistant(eq(true));

                .setNASMigrationDoneAndResetDefault(eq(0), eq(true));

    }



    @Test
@@ -170,13 +170,13 @@ public class NotificationAssistantPreferenceControllerTest { 
        assertEquals(1, Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.NAS_SETTINGS_UPDATED, 0, 10));

        verify(mBackend, times(1))

                .resetDefaultNotificationAssistant(eq(false));

                .setNASMigrationDoneAndResetDefault(eq(0), eq(false));



        //Test user disable again, migration should not happen

        mPreferenceController.setChecked(false);

        //Number of invocations should not increase

        verify(mBackend, times(1))

                .resetDefaultNotificationAssistant(eq(false));

                .setNASMigrationDoneAndResetDefault(eq(0), eq(false));

    }



}