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

Commit b66196c9 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Remove functionality to change allowed NAS adjustments in NMS. 

Bug: 268604587
Test: NotificationAssistantServiceTest (in cts repo in same topic)
Test: NotificationManagerServiceTest
Test: NotificationAssistantsTest
Change-Id: If92c88d89a4a70709822fe149f2f60ae6c9b5fcb
parent b3f04cce

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12381,7 +12381,7 @@ package android.service.notification { 
    method public final void adjustNotification(@NonNull android.service.notification.Adjustment);

    method public final void adjustNotifications(@NonNull java.util.List<android.service.notification.Adjustment>);

    method public void onActionInvoked(@NonNull String, @NonNull android.app.Notification.Action, int);

    method public void onAllowedAdjustmentsChanged();

    method @Deprecated public void onAllowedAdjustmentsChanged();

    method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent);

    method public void onNotificationClicked(@NonNull String);

    method public void onNotificationDirectReplied(@NonNull String);

core/api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -349,9 +349,7 @@ package android.app { 
  }



  public class NotificationManager {

    method public void allowAssistantAdjustment(String);

    method public void cleanUpCallersAfter(long);

    method public void disallowAssistantAdjustment(String);

    method public android.content.ComponentName getEffectsSuppressor();

    method public boolean isNotificationPolicyAccessGrantedForPackage(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean, boolean);

core/java/android/app/INotificationManager.aidl

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ interface INotificationManager 
    boolean isImportanceLocked(String pkg, int uid);



    List<String> getAllowedAssistantAdjustments(String pkg);

    void allowAssistantAdjustment(String adjustmentType);

    void disallowAssistantAdjustment(String adjustmentType);



    boolean shouldHideSilentStatusIcons(String callingPkg);

    void setHideSilentStatusIcons(boolean hide);

core/java/android/app/NotificationManager.java

+0 −26
Original line number Diff line number Diff line
@@ -1577,32 +1577,6 @@ public class NotificationManager { 
        }

    }



    /**

     * @hide

     */

    @TestApi

    public void allowAssistantAdjustment(String capability) {

        INotificationManager service = getService();

        try {

            service.allowAssistantAdjustment(capability);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @hide

     */

    @TestApi

    public void disallowAssistantAdjustment(String capability) {

        INotificationManager service = getService();

        try {

            service.disallowAssistantAdjustment(capability);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /** @hide */

    @TestApi

    public boolean isNotificationPolicyAccessGrantedForPackage(@NonNull String pkg) {

core/java/android/service/notification/Adjustment.java

+13 −2
Original line number Diff line number Diff line
@@ -51,8 +51,17 @@ public final class Adjustment implements Parcelable { 


    /** @hide */

    @StringDef (prefix = { "KEY_" }, value = {

            KEY_CONTEXTUAL_ACTIONS, KEY_GROUP_KEY, KEY_IMPORTANCE, KEY_PEOPLE, KEY_SNOOZE_CRITERIA,

            KEY_TEXT_REPLIES, KEY_USER_SENTIMENT, KEY_IMPORTANCE_PROPOSAL, KEY_SENSITIVE_CONTENT

            KEY_PEOPLE,

            KEY_SNOOZE_CRITERIA,

            KEY_GROUP_KEY,

            KEY_USER_SENTIMENT,

            KEY_CONTEXTUAL_ACTIONS,

            KEY_TEXT_REPLIES,

            KEY_IMPORTANCE,

            KEY_IMPORTANCE_PROPOSAL,

            KEY_SENSITIVE_CONTENT,

            KEY_RANKING_SCORE,

            KEY_NOT_CONVERSATION

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Keys {}
@@ -65,6 +74,7 @@ public final class Adjustment implements Parcelable { 
     */

    @SystemApi

    public static final String KEY_PEOPLE = "key_people";



    /**

     * Parcelable {@code ArrayList} of {@link SnoozeCriterion}. These criteria may be visible to

     * users. If a user chooses to snooze a notification until one of these criterion, the
@@ -72,6 +82,7 @@ public final class Adjustment implements Parcelable { 
     * {@link NotificationAssistantService#onNotificationSnoozedUntilContext}.

     */

    public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";



    /**

     * Data type: String. Used to change what {@link Notification#getGroup() group} a notification

     * belongs to.