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

Commit 88facd4d authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Fix xml loading for managed services 

Noticed while adding a shell cmd to toggle notification assistants,
which is also included

Test: runtest systemui-notification
Change-Id: I9bc0ee857abb8b9f60ab18ad740ca0a3b7d754ff
parent 3698fc8e

core/java/android/service/notification/ZenModeConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class ZenModeConfig implements Parcelable { 
    private static final boolean DEFAULT_ALLOW_SCREEN_ON = true;



    private static final int XML_VERSION = 2;

    private static final String ZEN_TAG = "zen";

    public static final String ZEN_TAG = "zen";

    private static final String ZEN_ATT_VERSION = "version";

    private static final String ZEN_ATT_USER = "user";

    private static final String ALLOW_TAG = "allow";

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

+4 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.util.ArraySet; 
import android.util.Slog;



import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.server.notification.NotificationManagerService.DumpFilter;



import java.io.PrintWriter;
@@ -43,7 +44,8 @@ import java.util.Arrays; 


public class ConditionProviders extends ManagedServices {



    private static final String TAG_ENABLED_DND_APPS = "dnd_apps";

    @VisibleForTesting

    static final String TAG_ENABLED_DND_APPS = "dnd_apps";



    private final ArrayList<ConditionRecord> mRecords = new ArrayList<>();

    private final ArraySet<String> mSystemConditionProviderNames;
@@ -84,7 +86,7 @@ public class ConditionProviders extends ManagedServices { 
        c.caption = "condition provider";

        c.serviceInterface = ConditionProviderService.SERVICE_INTERFACE;

        c.secureSettingName = Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES;

        c.managedServiceTypeTag = TAG_ENABLED_DND_APPS;

        c.xmlTag = TAG_ENABLED_DND_APPS;

        c.secondarySettingName = Settings.Secure.ENABLED_NOTIFICATION_LISTENERS;

        c.bindPermission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;

        c.settingsAction = Settings.ACTION_CONDITION_PROVIDER_SETTINGS;

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

+25 −33
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.util.Log; 
import android.util.Slog;

import android.util.SparseArray;



import com.android.internal.util.XmlUtils;

import com.android.server.notification.NotificationManagerService.DumpFilter;



import org.xmlpull.v1.XmlPullParser;
@@ -226,7 +227,7 @@ abstract public class ManagedServices { 
    }



    public void writeXml(XmlSerializer out, boolean forBackup) throws IOException {

        out.startTag(null, getConfig().managedServiceTypeTag);

        out.startTag(null, getConfig().xmlTag);



        if (forBackup) {

            trimApprovedListsAccordingToInstalledServices();
@@ -241,7 +242,7 @@ abstract public class ManagedServices { 
                for (int j = 0; j < M; j++) {

                    final boolean isPrimary = approvedByType.keyAt(j);

                    final Set<String> approved = approvedByType.valueAt(j);

                    if (approved != null && approved.size() > 0) {

                    if (approved != null) {

                        String allowedItems = String.join(ENABLED_SERVICES_SEPARATOR, approved);

                        out.startTag(null, TAG_MANAGED_SERVICES);

                        out.attribute(null, ATT_APPROVED_LIST, allowedItems);
@@ -260,43 +261,34 @@ abstract public class ManagedServices { 
            }

        }



        out.endTag(null, getConfig().managedServiceTypeTag);

        out.endTag(null, getConfig().xmlTag);

    }



    /**

     * @return false if modifications were made to the data on load that requires the xml file

     * to be re-written

     */

    public boolean readXml(XmlPullParser parser)

            throws XmlPullParserException, IOException {

        boolean rewriteXml = false;

        int type = parser.getEventType();

        String tag = parser.getName();

        if (type != XmlPullParser.START_TAG || !getConfig().managedServiceTypeTag.equals(tag)) {

            // xml empty/invalid - read from setting instead

    protected void migrateToXml() {

        loadAllowedComponentsFromSettings();

            rewriteXml = true;

        } else {

    }



    public void readXml(XmlPullParser parser)

            throws XmlPullParserException, IOException {

        int type;

        while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {

                tag = parser.getName();

            String tag = parser.getName();

            if (type == XmlPullParser.END_TAG

                        && getConfig().managedServiceTypeTag.equals(tag)) {

                    && getConfig().xmlTag.equals(tag)) {

                break;

            }

            if (type == XmlPullParser.START_TAG) {

                if (TAG_MANAGED_SERVICES.equals(tag)) {

                        final String approved = XmlUtils.safeString(parser, ATT_APPROVED_LIST, "");

                        final int userId = XmlUtils.safeInt(parser, ATT_USER_ID, 0);

                        final boolean isPrimary = XmlUtils.safeBool(parser, ATT_IS_PRIMARY, true);

                    final String approved = XmlUtils.readStringAttribute(parser, ATT_APPROVED_LIST);

                    final int userId = XmlUtils.readIntAttribute(parser, ATT_USER_ID, 0);

                    final boolean isPrimary =

                            XmlUtils.readBooleanAttribute(parser, ATT_IS_PRIMARY, true);

                    addApprovedList(approved, userId, isPrimary);

                    mUseXml = true;

                }

            }

        }

            mUseXml = true;

        }

        rebindServices(false);



        return rewriteXml;

    }



    private void loadAllowedComponentsFromSettings() {
@@ -1119,7 +1111,7 @@ abstract public class ManagedServices { 
        public String serviceInterface;

        public String secureSettingName;

        public String secondarySettingName;

        public String managedServiceTypeTag;

        public String xmlTag;

        public String bindPermission;

        public String settingsAction;

        public int clientLabel;

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

+48 −35
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import static android.service.notification.NotificationListenerService.TRIM_LIGH 


import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.WindowManager.LayoutParams.TYPE_TOAST;

import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;



import android.Manifest;

import android.annotation.NonNull;
@@ -162,6 +161,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.DumpUtils;

import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.Preconditions;

import com.android.internal.util.XmlUtils;

import com.android.server.DeviceIdleController;

import com.android.server.EventLogTags;

import com.android.server.LocalServices;
@@ -342,7 +342,7 @@ public class NotificationManagerService extends SystemService { 


    private final UserProfiles mUserProfiles = new UserProfiles();

    private NotificationListeners mListeners;

    private NotificationAssistants mNotificationAssistants;

    private NotificationAssistants mAssistants;

    private ConditionProviders mConditionProviders;

    private NotificationUsageStats mUsageStats;
@@ -441,24 +441,38 @@ public class NotificationManagerService extends SystemService { 
        }

    }



    private void readPolicyXml(InputStream stream, boolean forRestore)

    void readPolicyXml(InputStream stream, boolean forRestore)

            throws XmlPullParserException, NumberFormatException, IOException {

        final XmlPullParser parser = Xml.newPullParser();

        parser.setInput(stream, StandardCharsets.UTF_8.name());



        boolean saveXml = false;

        while (parser.next() != END_DOCUMENT) {

        XmlUtils.beginDocument(parser, TAG_NOTIFICATION_POLICY);

        boolean migratedManagedServices = false;

        int outerDepth = parser.getDepth();

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

            if (ZenModeConfig.ZEN_TAG.equals(parser.getName())) {

                mZenModeHelper.readXml(parser, forRestore);

            } else if (RankingHelper.TAG_RANKING.equals(parser.getName())){

                mRankingHelper.readXml(parser, forRestore);

            }

            // No non-system managed services are allowed on low ram devices

            if (!ActivityManager.isLowRamDeviceStatic()) {

                saveXml |= mListeners.readXml(parser);

                saveXml |= mNotificationAssistants.readXml(parser);

                saveXml |= mConditionProviders.readXml(parser);

                if (mListeners.getConfig().xmlTag.equals(parser.getName())) {

                    mListeners.readXml(parser);

                    migratedManagedServices = true;

                } else if (mAssistants.getConfig().xmlTag.equals(parser.getName())) {

                    mAssistants.readXml(parser);

                    migratedManagedServices = true;

                } else if (mConditionProviders.getConfig().xmlTag.equals(parser.getName())) {

                    mConditionProviders.readXml(parser);

                    migratedManagedServices = true;

                }

            }

        }



        if (saveXml) {

        if (!migratedManagedServices) {

            mListeners.migrateToXml();

            mAssistants.migrateToXml();

            mConditionProviders.migrateToXml();

            savePolicyFile();

        }

    }
@@ -467,7 +481,7 @@ public class NotificationManagerService extends SystemService { 
        if (DBG) Slog.d(TAG, "loadPolicyFile");

        synchronized (mPolicyFile) {



            FileInputStream infile = null;

            InputStream infile = null;

            try {

                infile = mPolicyFile.openRead();

                readPolicyXml(infile, false /*forRestore*/);
@@ -523,7 +537,7 @@ public class NotificationManagerService extends SystemService { 
        mZenModeHelper.writeXml(out, forBackup);

        mRankingHelper.writeXml(out, forBackup);

        mListeners.writeXml(out, forBackup);

        mNotificationAssistants.writeXml(out, forBackup);

        mAssistants.writeXml(out, forBackup);

        mConditionProviders.writeXml(out, forBackup);

        out.endTag(null, TAG_NOTIFICATION_POLICY);

        out.endDocument();
@@ -898,7 +912,7 @@ public class NotificationManagerService extends SystemService { 
                    }

                }

                mListeners.onPackagesChanged(removingPackage, pkgList, uidList);

                mNotificationAssistants.onPackagesChanged(removingPackage, pkgList, uidList);

                mAssistants.onPackagesChanged(removingPackage, pkgList, uidList);

                mConditionProviders.onPackagesChanged(removingPackage, pkgList, uidList);

                mRankingHelper.onPackagesChanged(removingPackage, changeUserId, pkgList, uidList);

                savePolicyFile();
@@ -970,7 +984,7 @@ public class NotificationManagerService extends SystemService { 
                // Refresh managed services

                mConditionProviders.onUserSwitched(user);

                mListeners.onUserSwitched(user);

                mNotificationAssistants.onUserSwitched(user);

                mAssistants.onUserSwitched(user);

                mZenModeHelper.onUserSwitched(user);

            } else if (action.equals(Intent.ACTION_USER_ADDED)) {

                mUserProfiles.updateCache(context);
@@ -983,7 +997,7 @@ public class NotificationManagerService extends SystemService { 
                final int user = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);

                mConditionProviders.onUserUnlocked(user);

                mListeners.onUserUnlocked(user);

                mNotificationAssistants.onUserUnlocked(user);

                mAssistants.onUserUnlocked(user);

                mZenModeHelper.onUserUnlocked(user);

            }

        }
@@ -1231,7 +1245,7 @@ public class NotificationManagerService extends SystemService { 
        mListeners = notificationListeners;



        // This is a MangedServices object that keeps track of the assistant.

        mNotificationAssistants = notificationAssistants;

        mAssistants = notificationAssistants;



        mPolicyFile = policyFile;

        loadPolicyFile();
@@ -1399,7 +1413,7 @@ public class NotificationManagerService extends SystemService { 
            // bind to listener services.

            mSettingsObserver.observe();

            mListeners.onBootPhaseAppsCanStart();

            mNotificationAssistants.onBootPhaseAppsCanStart();

            mAssistants.onBootPhaseAppsCanStart();

            mConditionProviders.onBootPhaseAppsCanStart();

        }

    }
@@ -1568,7 +1582,6 @@ public class NotificationManagerService extends SystemService { 
                Slog.e(TAG, "Not doing toast. pkg=" + pkg + " callback=" + callback);

                return ;

            }



            final boolean isSystemToast = isCallerSystemOrPhone() || ("android".equals(pkg));

            final boolean isPackageSuspended =

                    isPackageSuspendedForUser(pkg, Binder.getCallingUid());
@@ -1927,7 +1940,7 @@ public class NotificationManagerService extends SystemService { 


            // Listener & assistant

            mListeners.onPackagesChanged(true, packages, uids);

            mNotificationAssistants.onPackagesChanged(true, packages, uids);

            mAssistants.onPackagesChanged(true, packages, uids);



            // Zen

            mConditionProviders.onPackagesChanged(true, packages, uids);
@@ -2133,8 +2146,8 @@ public class NotificationManagerService extends SystemService { 
            long identity = Binder.clearCallingIdentity();

            try {

                ManagedServices manager =

                        mNotificationAssistants.isComponentEnabledForCurrentProfiles(component)

                        ? mNotificationAssistants

                        mAssistants.isComponentEnabledForCurrentProfiles(component)

                        ? mAssistants

                        : mListeners;

                manager.setComponentState(component, true);

            } finally {
@@ -2254,7 +2267,7 @@ public class NotificationManagerService extends SystemService { 
            try {

                synchronized (mNotificationLock) {

                    final ManagedServiceInfo info =

                            mNotificationAssistants.checkServiceTokenLocked(token);

                            mAssistants.checkServiceTokenLocked(token);

                    unsnoozeNotificationInt(key, info);

                }

            } finally {
@@ -2787,7 +2800,7 @@ public class NotificationManagerService extends SystemService { 
        public boolean isNotificationAssistantAccessGranted(ComponentName assistant) {

            Preconditions.checkNotNull(assistant);

            checkCallerIsSystemOrSameApp(assistant.getPackageName());

            return mNotificationAssistants.isPackageOrComponentAllowed(assistant.flattenToString(),

            return mAssistants.isPackageOrComponentAllowed(assistant.flattenToString(),

                    getCallingUserHandle().getIdentifier());

        }
@@ -2834,7 +2847,7 @@ public class NotificationManagerService extends SystemService { 
            if (!mActivityManager.isLowRamDevice()) {

                mConditionProviders.setPackageOrComponentEnabled(assistant.flattenToString(),

                        userId, false, granted);

                mNotificationAssistants.setPackageOrComponentEnabled(assistant.flattenToString(),

                mAssistants.setPackageOrComponentEnabled(assistant.flattenToString(),

                        userId, true, granted);



                getContext().sendBroadcastAsUser(new Intent(
@@ -2853,7 +2866,7 @@ public class NotificationManagerService extends SystemService { 
            final long identity = Binder.clearCallingIdentity();

            try {

                synchronized (mNotificationLock) {

                    mNotificationAssistants.checkServiceTokenLocked(token);

                    mAssistants.checkServiceTokenLocked(token);

                    int N = mEnqueuedNotifications.size();

                    for (int i = 0; i < N; i++) {

                        final NotificationRecord n = mEnqueuedNotifications.get(i);
@@ -2875,7 +2888,7 @@ public class NotificationManagerService extends SystemService { 
            final long identity = Binder.clearCallingIdentity();

            try {

                synchronized (mNotificationLock) {

                    mNotificationAssistants.checkServiceTokenLocked(token);

                    mAssistants.checkServiceTokenLocked(token);

                    NotificationRecord n = mNotificationsByKey.get(adjustment.getKey());

                    applyAdjustment(n, adjustment);

                }
@@ -2892,7 +2905,7 @@ public class NotificationManagerService extends SystemService { 
            final long identity = Binder.clearCallingIdentity();

            try {

                synchronized (mNotificationLock) {

                    mNotificationAssistants.checkServiceTokenLocked(token);

                    mAssistants.checkServiceTokenLocked(token);

                    for (Adjustment adjustment : adjustments) {

                        NotificationRecord n = mNotificationsByKey.get(adjustment.getKey());

                        applyAdjustment(n, adjustment);
@@ -3272,7 +3285,7 @@ public class NotificationManagerService extends SystemService { 
                }

                pw.println(')');

                pw.println("\n  Notification assistant services:");

                mNotificationAssistants.dump(pw, filter);

                mAssistants.dump(pw, filter);

            }



            if (!filter.filtered || zenOnly) {
@@ -3663,7 +3676,7 @@ public class NotificationManagerService extends SystemService { 
            cancelNotificationLocked(r, false, REASON_SNOOZED, wasPosted);

            updateLightsLocked();

            if (mSnoozeCriterionId != null) {

                mNotificationAssistants.notifyAssistantSnoozedLocked(r.sbn, mSnoozeCriterionId);

                mAssistants.notifyAssistantSnoozedLocked(r.sbn, mSnoozeCriterionId);

                mSnoozeHelper.snooze(r);

            } else {

                mSnoozeHelper.snooze(r, mDuration);
@@ -3727,8 +3740,8 @@ public class NotificationManagerService extends SystemService { 
                mRankingHelper.extractSignals(r);



                // tell the assistant service about the notification

                if (mNotificationAssistants.isEnabled()) {

                    mNotificationAssistants.onNotificationEnqueued(r);

                if (mAssistants.isEnabled()) {

                    mAssistants.onNotificationEnqueued(r);

                    mHandler.postDelayed(new PostNotificationRunnable(r.getKey()),

                            DELAY_FOR_ASSISTANT_TIME);

                } else {
@@ -5237,7 +5250,7 @@ public class NotificationManagerService extends SystemService { 
            Config c = new Config();

            c.caption = "notification assistant service";

            c.serviceInterface = NotificationAssistantService.SERVICE_INTERFACE;

            c.managedServiceTypeTag = TAG_ENABLED_NOTIFICATION_ASSISTANTS;

            c.xmlTag = TAG_ENABLED_NOTIFICATION_ASSISTANTS;

            c.secureSettingName = Settings.Secure.ENABLED_NOTIFICATION_ASSISTANT;

            c.bindPermission = Manifest.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE;

            c.settingsAction = Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS;
@@ -5349,7 +5362,7 @@ public class NotificationManagerService extends SystemService { 
            Config c = new Config();

            c.caption = "notification listener";

            c.serviceInterface = NotificationListenerService.SERVICE_INTERFACE;

            c.managedServiceTypeTag = TAG_ENABLED_NOTIFICATION_LISTENERS;

            c.xmlTag = TAG_ENABLED_NOTIFICATION_LISTENERS;

            c.secureSettingName = Settings.Secure.ENABLED_NOTIFICATION_LISTENERS;

            c.bindPermission = android.Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE;

            c.settingsAction = Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS;

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

+19 −11
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.util.Preconditions;

import com.android.internal.util.XmlUtils;



import android.app.Notification;

import android.app.NotificationChannel;
@@ -64,7 +65,7 @@ public class RankingHelper implements RankingConfig { 


    private static final int XML_VERSION = 1;



    private static final String TAG_RANKING = "ranking";

    static final String TAG_RANKING = "ranking";

    private static final String TAG_PACKAGE = "package";

    private static final String TAG_CHANNEL = "channel";

    private static final String TAG_GROUP = "channelGroup";
@@ -169,7 +170,7 @@ public class RankingHelper implements RankingConfig { 
            }

            if (type == XmlPullParser.START_TAG) {

                if (TAG_PACKAGE.equals(tag)) {

                    int uid = XmlUtils.safeInt(parser, ATT_UID, Record.UNKNOWN_UID);

                    int uid = XmlUtils.readIntAttribute(parser, ATT_UID, Record.UNKNOWN_UID);

                    String name = parser.getAttributeValue(null, ATT_NAME);

                    if (!TextUtils.isEmpty(name)) {

                        if (forRestore) {
@@ -182,14 +183,21 @@ public class RankingHelper implements RankingConfig { 
                        }



                        Record r = getOrCreateRecord(name, uid,

                                XmlUtils.safeInt(parser, ATT_IMPORTANCE, DEFAULT_IMPORTANCE),

                                XmlUtils.safeInt(parser, ATT_PRIORITY, DEFAULT_PRIORITY),

                                XmlUtils.safeInt(parser, ATT_VISIBILITY, DEFAULT_VISIBILITY),

                                XmlUtils.safeBool(parser, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE));

                        r.importance = XmlUtils.safeInt(parser, ATT_IMPORTANCE, DEFAULT_IMPORTANCE);

                        r.priority = XmlUtils.safeInt(parser, ATT_PRIORITY, DEFAULT_PRIORITY);

                        r.visibility = XmlUtils.safeInt(parser, ATT_VISIBILITY, DEFAULT_VISIBILITY);

                        r.showBadge = XmlUtils.safeBool(parser, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE);

                                XmlUtils.readIntAttribute(

                                        parser, ATT_IMPORTANCE, DEFAULT_IMPORTANCE),

                                XmlUtils.readIntAttribute(parser, ATT_PRIORITY, DEFAULT_PRIORITY),

                                XmlUtils.readIntAttribute(

                                        parser, ATT_VISIBILITY, DEFAULT_VISIBILITY),

                                XmlUtils.readBooleanAttribute(

                                        parser, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE));

                        r.importance = XmlUtils.readIntAttribute(

                                parser, ATT_IMPORTANCE, DEFAULT_IMPORTANCE);

                        r.priority = XmlUtils.readIntAttribute(

                                parser, ATT_PRIORITY, DEFAULT_PRIORITY);

                        r.visibility = XmlUtils.readIntAttribute(

                                parser, ATT_VISIBILITY, DEFAULT_VISIBILITY);

                        r.showBadge = XmlUtils.readBooleanAttribute(

                                parser, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE);



                        final int innerDepth = parser.getDepth();

                        while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
@@ -214,7 +222,7 @@ public class RankingHelper implements RankingConfig { 
                            if (TAG_CHANNEL.equals(tagName)) {

                                String id = parser.getAttributeValue(null, ATT_ID);

                                String channelName = parser.getAttributeValue(null, ATT_NAME);

                                int channelImportance = XmlUtils.safeInt(

                                int channelImportance = XmlUtils.readIntAttribute(

                                        parser, ATT_IMPORTANCE, DEFAULT_IMPORTANCE);

                                if (!TextUtils.isEmpty(id) && !TextUtils.isEmpty(channelName)) {

                                    NotificationChannel channel = new NotificationChannel(id,