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

Commit 03f78dd2 authored by Alexander Roederer's avatar Alexander Roederer
Browse files

Modify API to save package bundle type prefs 

Adds an API that allows us to persist per-app per-type bundle
preferences (enable/disable).

Bug: 377697241
Flag: android.app.notification_classification_ui
Test: atest NotificationManagerServiceTest
Change-Id: I2aff8c375604c460bd8a899675967c02babc99eb
parent fac1e2d4

core/java/android/app/INotificationManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -270,6 +270,6 @@ interface INotificationManager 


    int[] getAllowedAdjustmentKeyTypes();

    void setAssistantAdjustmentKeyTypeState(int type, boolean enabled);

    String[] getTypeAdjustmentDeniedPackages();

    void setTypeAdjustmentForPackageState(String pkg, boolean enabled);

    int[] getAllowedAdjustmentKeyTypesForPackage(String pkg);

    void setAssistantAdjustmentKeyTypeStateForPackage(String pkg, int type, boolean enabled);

}

core/java/android/app/NotificationManager.java

+4 −2
Original line number Diff line number Diff line
@@ -1928,10 +1928,12 @@ public class NotificationManager { 
     * @hide

     */

    @FlaggedApi(android.app.Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI)

    public void setTypeAdjustmentForPackageState(@NonNull String pkg, boolean enabled) {

    public void setAssistantAdjustmentKeyTypeStateForPackage(@NonNull String pkg,

                                                             @Adjustment.Types int type,

                                                             boolean enabled) {

        INotificationManager service = service();

        try {

            service.setTypeAdjustmentForPackageState(pkg, enabled);

            service.setAssistantAdjustmentKeyTypeStateForPackage(pkg, type, enabled);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

services/core/java/com/android/server/notification/NotificationManagerService.java

+106 −27
Original line number Diff line number Diff line
@@ -4276,16 +4276,16 @@ public class NotificationManagerService extends SystemService { 














        @Override















        @FlaggedApi(android.app.Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI)













        public @NonNull String[] getTypeAdjustmentDeniedPackages() {













        public @NonNull int[] getAllowedAdjustmentKeyTypesForPackage(String pkg) {















            checkCallerIsSystemOrSystemUiOrShell();













            return mAssistants.getTypeAdjustmentDeniedPackages();













            return mAssistants.getAllowedAdjustmentKeyTypesForPackage(pkg);















        }



























        @Override















        @FlaggedApi(android.app.Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI)













        public void setTypeAdjustmentForPackageState(String pkg, boolean enabled) {













        public void setAssistantAdjustmentKeyTypeStateForPackage(String pkg, int type,













                                                                 boolean enabled) {















            checkCallerIsSystemOrSystemUiOrShell();













            mAssistants.setTypeAdjustmentForPackageState(pkg, enabled);













            mAssistants.setAssistantAdjustmentKeyTypeStateForPackage(pkg, type, enabled);





























            handleSavePolicyFile();















        }










@@ -7083,7 +7083,7 @@ public class NotificationManagerService extends SystemService {













                        toRemove.add(potentialKey);















                    } else if (notificationClassificationUi()















                            && !mAssistants.isTypeAdjustmentAllowedForPackage(













                            r.getSbn().getPackageName())) {













                            r.getSbn().getPackageName(), adjustments.getInt(KEY_TYPE))) {















                        toRemove.add(potentialKey);















                    }















                }










@@ -11740,7 +11740,11 @@ public class NotificationManagerService extends SystemService {













        private static final String ATT_DENIED = "denied_adjustments";















        private static final String ATT_ENABLED_TYPES = "enabled_key_types";















        private static final String ATT_NAS_UNSUPPORTED = "unsupported_adjustments";













        private static final String ATT_TYPES_DENIED_APPS = "types_denied_apps";













        // Encapsulates a list of packages and the bundle types enabled for each package.













        private static final String TAG_TYPES_ENABLED_FOR_APPS = "types_enabled_for_apps";













        // Encapsulates the bundle types enabled for a package.













        private static final String ATT_APP_ENABLED_TYPES = "app_enabled_types";













        private static final String ATT_PACKAGE = "package";





























        private final Object mLock = new Object();























@@ -11756,8 +11760,14 @@ public class NotificationManagerService extends SystemService {













        @GuardedBy("mLock")















        private Map<Integer, HashSet<String>> mNasUnsupported = new ArrayMap<>();



























        // Types of classifications (aka bundles) enabled/allowed for this package.













        // If the set is NULL (or package is not in the list), default classification allow list













        // (the global one) should be used.













        // If the set is empty, that indicates the package explicitly has all classifications













        // disallowed.















        @GuardedBy("mLock")













        private Set<String> mClassificationTypeDeniedPackages = new ArraySet<>();













        private Map<String, Set<Integer>> mClassificationTypePackagesEnabledTypes =













                new ArrayMap<>();





























        protected ComponentName mDefaultFromConfig = null;
























@@ -11958,41 +11968,88 @@ public class NotificationManagerService extends SystemService {













            }















        }



























        /**













         * Returns whether the type adjustment is allowed for this particular package.













         * If no package-specific restrictions have been set, defaults to the same value as













         * isAdjustmentKeyTypeAllowed(type).













         */















        @FlaggedApi(android.app.Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI)













        protected @NonNull boolean isTypeAdjustmentAllowedForPackage(String pkg) {













        protected boolean isTypeAdjustmentAllowedForPackage(String pkg,













                                                                     @Adjustment.Types int type) {















            synchronized (mLock) {















                if (notificationClassificationUi()) {













                    return !mClassificationTypeDeniedPackages.contains(pkg);













                    if (mClassificationTypePackagesEnabledTypes.containsKey(pkg)) {













                        Set<Integer> enabled = mClassificationTypePackagesEnabledTypes.get(pkg);













                        if (enabled != null) {













                            return enabled.contains(type);















                        }















                    }













            return true;













                    // If mClassificationTypePackagesEnabledTypes does not contain the pkg, or













                    // the stored set is null, return the default.













                    return isAdjustmentKeyTypeAllowed(type);













                }













            }













            return false;















        }





























        @FlaggedApi(android.app.Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI)













        protected @NonNull String[] getTypeAdjustmentDeniedPackages() {













        protected @NonNull int[] getAllowedAdjustmentKeyTypesForPackage(String pkg) {















            synchronized (mLock) {















                if (notificationClassificationUi()) {













                    return mClassificationTypeDeniedPackages.toArray(new String[0]);













                    if (mClassificationTypePackagesEnabledTypes.containsKey(pkg)) {













                        Set<Integer> enabled = mClassificationTypePackagesEnabledTypes.get(pkg);













                        if (enabled != null) {













                            // Convert Set to int[] for return.













                            int[] returnEnabled = new int[enabled.size()];













                            int i = 0;













                            for (int val: enabled) {













                                returnEnabled[i] = val;













                                i++;













                            }













                            return returnEnabled;













                        }















                    }













                    // If package is not in the map, or the value is null, return the default.













                    return getAllowedAdjustmentKeyTypes();















                }













            return new String[]{};













            }













            return new int[]{};















        }





























        /**















         * Set whether a particular package can have its notification channels adjusted to have a















         * different type by NotificationAssistants.













         * Note: once this method is called to enable or disable a specific type for a package,













         * the global default is set as the starting point, and the type is enabled/disabled from













         * there. Future changes to the global default will not apply automatically to this package.















         */















        @FlaggedApi(android.app.Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI)













        public void setTypeAdjustmentForPackageState(String pkg, boolean enabled) {













        public void setAssistantAdjustmentKeyTypeStateForPackage(String pkg,













                                                       @Adjustment.Types int type,













                                                       boolean enabled) {















            if (!notificationClassificationUi()) {















                return;















            }















            synchronized (mLock) {













                Set<Integer> enabledTypes = null;













                if (mClassificationTypePackagesEnabledTypes.containsKey(pkg)) {













                    enabledTypes = mClassificationTypePackagesEnabledTypes.get(pkg);













                }













                if (enabledTypes == null) {













                    // Use global default to start.













                    enabledTypes = new ArraySet<Integer>();













                    // Convert from int[] to Set<Integer>













                    for (int value : getAllowedAdjustmentKeyTypes()) {













                        enabledTypes.add(value);













                    }













                }



























                if (enabled) {













                    mClassificationTypeDeniedPackages.remove(pkg);













                    enabledTypes.add(type);















                } else {













                    mClassificationTypeDeniedPackages.add(pkg);













                    enabledTypes.remove(type);















                }













                mClassificationTypePackagesEnabledTypes.put(pkg, enabledTypes);















            }















        }
























@@ -12459,16 +12516,25 @@ public class NotificationManagerService extends SystemService {













                        TextUtils.join(",", mAllowedAdjustmentKeyTypes));















                out.endTag(null, ATT_ENABLED_TYPES);















                if (notificationClassificationUi()) {













                    out.startTag(null, ATT_TYPES_DENIED_APPS);













                    out.attribute(null, ATT_TYPES,













                            TextUtils.join(",", mClassificationTypeDeniedPackages));













                    out.endTag(null, ATT_TYPES_DENIED_APPS);













                    out.startTag(null, TAG_TYPES_ENABLED_FOR_APPS);













                    for (String pkg: mClassificationTypePackagesEnabledTypes.keySet()) {













                        Set<Integer> allowedTypes =













                                mClassificationTypePackagesEnabledTypes.get(pkg);













                        if (allowedTypes != null) {













                            out.startTag(null, ATT_APP_ENABLED_TYPES);













                            out.attribute(null, ATT_PACKAGE, pkg);













                            out.attribute(null, ATT_TYPES, TextUtils.join(",", allowedTypes));













                            out.endTag(null, ATT_APP_ENABLED_TYPES);













                        }













                    }













                    out.endTag(null, TAG_TYPES_ENABLED_FOR_APPS);















                }















            }















        }





























        @Override













        protected void readExtraTag(String tag, TypedXmlPullParser parser) throws IOException {













        protected void readExtraTag(String tag, TypedXmlPullParser parser) throws IOException,













                XmlPullParserException {















            if (!notificationClassification()) {















                return;















            }









@@ -12495,12 +12561,25 @@ public class NotificationManagerService extends SystemService {













                        }















                    }















                }













            } else if (notificationClassificationUi() && ATT_TYPES_DENIED_APPS.equals(tag)) {













                final String apps = XmlUtils.readStringAttribute(parser, ATT_TYPES);













            } else if (TAG_TYPES_ENABLED_FOR_APPS.equals(tag)) {













                final int appsOuterDepth = parser.getDepth();















                synchronized (mLock) {













                    mClassificationTypeDeniedPackages.clear();













                    if (!TextUtils.isEmpty(apps)) {













                        mClassificationTypeDeniedPackages.addAll(Arrays.asList(apps.split(",")));













                    mClassificationTypePackagesEnabledTypes.clear();













                    while (XmlUtils.nextElementWithin(parser, appsOuterDepth)) {













                        if (!ATT_APP_ENABLED_TYPES.equals(parser.getName())) {













                            continue;













                        }













                        final String app = XmlUtils.readStringAttribute(parser, ATT_PACKAGE);













                        Set<Integer> allowedTypes = new ArraySet<>();













                        final String typesString = XmlUtils.readStringAttribute(parser, ATT_TYPES);













                        if (!TextUtils.isEmpty(typesString)) {













                            allowedTypes = Arrays.stream(typesString.split(","))













                                    .map(Integer::valueOf)













                                    .collect(Collectors.toSet());













                        }













                        // Empty type list is allowed, because empty type list signifies the user













                        // has manually cleared the package of allowed types.













                        mClassificationTypePackagesEnabledTypes.put(app, allowedTypes);















                    }















                }















            }

























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



+135
−47


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+16
−11




























Original line number
Diff line number
Diff line








@@ -365,6 +365,9 @@ import org.mockito.MockitoAnnotations;













import org.mockito.invocation.InvocationOnMock;















import org.mockito.stubbing.Answer;



























import platform.test.runner.parameterized.ParameterizedAndroidJunit4;













import platform.test.runner.parameterized.Parameters;



























import java.io.BufferedInputStream;















import java.io.BufferedOutputStream;















import java.io.ByteArrayInputStream;









@@ -380,9 +383,6 @@ import java.util.Map;













import java.util.concurrent.CountDownLatch;















import java.util.function.Consumer;



























import platform.test.runner.parameterized.ParameterizedAndroidJunit4;













import platform.test.runner.parameterized.Parameters;



























@SmallTest















@RunWith(ParameterizedAndroidJunit4.class)















@RunWithLooper










@@ -7631,7 +7631,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













        when(mAssistants.isSameUser(any(), anyInt())).thenReturn(true);















        when(mAssistants.isServiceTokenValidLocked(any())).thenReturn(true);















        when(mAssistants.isAdjustmentKeyTypeAllowed(anyInt())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString(), anyInt())).thenReturn(true);





























        // Set up notifications that will be adjusted















        final NotificationRecord r1 = spy(generateNotificationRecord(










@@ -17305,7 +17305,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













                NotificationManagerService.WorkerHandler.class);















        mService.setHandler(handler);















        when(mAssistants.isAdjustmentKeyTypeAllowed(anyInt())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString(), anyInt())).thenReturn(true);





























        Bundle signals = new Bundle();















        signals.putInt(KEY_TYPE, TYPE_NEWS);










@@ -17349,7 +17349,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













                NotificationManagerService.WorkerHandler.class);















        mService.setHandler(handler);















        when(mAssistants.isAdjustmentKeyTypeAllowed(anyInt())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString(), eq(TYPE_NEWS)))













                .thenReturn(true);













        // Blocking adjustments for a different type does nothing













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString(), eq(TYPE_PROMOTION)))













                .thenReturn(false);





























        Bundle signals = new Bundle();















        signals.putInt(KEY_TYPE, TYPE_NEWS);









@@ -17364,8 +17368,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {



























        assertThat(r.getChannel().getId()).isEqualTo(NEWS_ID);



























        // When we block adjustments for this package













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString())).thenReturn(false);













        // When we block adjustments for this package/type













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString(), eq(TYPE_PROMOTION)))













                .thenReturn(false);





























        signals.putInt(KEY_TYPE, TYPE_PROMOTION);















        mBinderService.applyAdjustmentFromAssistant(null, adjustment);










@@ -17695,7 +17700,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













        when(mAssistants.isSameUser(any(), anyInt())).thenReturn(true);















        when(mAssistants.isServiceTokenValidLocked(any())).thenReturn(true);















        when(mAssistants.isAdjustmentKeyTypeAllowed(anyInt())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString(), anyInt())).thenReturn(true);





























        // Post a single notification















        final boolean hasOriginalSummary = false;










@@ -17735,7 +17740,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













        when(mAssistants.isSameUser(any(), anyInt())).thenReturn(true);















        when(mAssistants.isServiceTokenValidLocked(any())).thenReturn(true);















        when(mAssistants.isAdjustmentKeyTypeAllowed(anyInt())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString(), anyInt())).thenReturn(true);





























        // Post grouped notifications















        final String originalGroupName = "originalGroup";










@@ -17784,7 +17789,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













        when(mAssistants.isSameUser(any(), anyInt())).thenReturn(true);















        when(mAssistants.isServiceTokenValidLocked(any())).thenReturn(true);















        when(mAssistants.isAdjustmentKeyTypeAllowed(anyInt())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString())).thenReturn(true);













        when(mAssistants.isTypeAdjustmentAllowedForPackage(anyString(), anyInt())).thenReturn(true);





























        // Post grouped notifications















        final String originalGroupName = "originalGroup";