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

Commit 98cd054c authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Revert "Remove the version check for opting apps with SAW into bubbles" 

This reverts commit b4fd0a4a.

Reason for revert: b/397973496 - boot time regression :(

Change-Id: Ia2d2adbda7f322923ecbd46b2b49f956d8f6acca
parent b4fd0a4a

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

+10 −15
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_P 
import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__DENIED;

import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__GRANTED;

import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_PREFERENCES__FSI_STATE__NOT_REQUESTED;

import static com.android.server.notification.PreferencesHelper.LockableAppFields.USER_LOCKED_BUBBLE;

import static com.android.server.notification.PreferencesHelper.LockableAppFields.USER_LOCKED_PROMOTABLE;



import android.annotation.FlaggedApi;
@@ -287,7 +286,7 @@ public class PreferencesHelper implements RankingConfig { 
        if (!TAG_RANKING.equals(tag)) return;



        final int xmlVersion = parser.getAttributeInt(null, ATT_VERSION, -1);

        boolean upgradeForBubbles = xmlVersion >= XML_VERSION_BUBBLES_UPGRADE;

        boolean upgradeForBubbles = xmlVersion == XML_VERSION_BUBBLES_UPGRADE;

        boolean migrateToPermission = (xmlVersion < XML_VERSION_NOTIF_PERMISSION);

        if (mShowReviewPermissionsNotification

                && (xmlVersion < XML_VERSION_REVIEW_PERMISSIONS_NOTIFICATION)) {
@@ -338,19 +337,15 @@ public class PreferencesHelper implements RankingConfig { 
            }

            boolean skipWarningLogged = false;

            boolean skipGroupWarningLogged = false;

            int bubblePref = parser.getAttributeInt(null, ATT_ALLOW_BUBBLE,

                    DEFAULT_BUBBLE_PREFERENCE);

            boolean bubbleLocked = (parser.getAttributeInt(null,

                    ATT_APP_USER_LOCKED_FIELDS, DEFAULT_LOCKED_APP_FIELDS) & USER_LOCKED_BUBBLE)

                    != 0;

            if (!bubbleLocked

                    && upgradeForBubbles

                    && uid != UNKNOWN_UID

                    && mAppOps.noteOpNoThrow(OP_SYSTEM_ALERT_WINDOW, uid, name, null,

                    "check-notif-bubble") == AppOpsManager.MODE_ALLOWED) {

                // User hasn't changed bubble pref & the app has SAW, so allow all bubbles.

                bubblePref = BUBBLE_PREFERENCE_ALL;

            }

            boolean hasSAWPermission = false;

            if (upgradeForBubbles && uid != UNKNOWN_UID) {

                hasSAWPermission = mAppOps.noteOpNoThrow(

                        OP_SYSTEM_ALERT_WINDOW, uid, name, null,

                        "check-notif-bubble") == AppOpsManager.MODE_ALLOWED;

            }

            int bubblePref = hasSAWPermission

                    ? BUBBLE_PREFERENCE_ALL

                    : parser.getAttributeInt(null, ATT_ALLOW_BUBBLE, DEFAULT_BUBBLE_PREFERENCE);

            int appImportance = parser.getAttributeInt(null, ATT_IMPORTANCE, DEFAULT_IMPORTANCE);



            // when data is loaded from disk it's loaded as USER_ALL, but restored data that

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

+0 −21
Original line number Diff line number Diff line
@@ -4494,27 +4494,6 @@ public class PreferencesHelperTest extends UiServiceTestCase { 
        assertEquals(0, mHelper.getAppLockedFields(PKG_O, UID_O));

    }



    @Test

    public void testBubblePreference_sameVersionWithSAWPermission() throws Exception {

        when(mAppOpsManager.noteOpNoThrow(eq(OP_SYSTEM_ALERT_WINDOW), anyInt(),

                anyString(), eq(null), anyString())).thenReturn(MODE_ALLOWED);



        final String xml = "<ranking version=\"4\">\n"

                + "<package name=\"" + PKG_O + "\" uid=\"" + UID_O + "\">\n"

                + "<channel id=\"someId\" name=\"hi\""

                + " importance=\"3\"/>"

                + "</package>"

                + "</ranking>";

        TypedXmlPullParser parser = Xml.newFastPullParser();

        parser.setInput(new BufferedInputStream(new ByteArrayInputStream(xml.getBytes())),

                null);

        parser.nextTag();

        mHelper.readXml(parser, false, UserHandle.USER_ALL);



        assertEquals(BUBBLE_PREFERENCE_ALL, mHelper.getBubblePreference(PKG_O, UID_O));

        assertEquals(0, mHelper.getAppLockedFields(PKG_O, UID_O));

    }



    @Test

    public void testBubblePreference_upgradeWithSAWThenUserOverride() throws Exception {

        when(mAppOpsManager.noteOpNoThrow(eq(OP_SYSTEM_ALERT_WINDOW), anyInt(),