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

Commit 2da8d8cb authored by Roman Birg's avatar Roman Birg
Browse files

Revert "frameworks: disable loading notification groups in System profiles" 

This reverts commit e09c82d3.

Change-Id: I47fca536bd70fcf8236b1fcfbdca45ea5372497a
parent cd69d1bf

core/res/res/xml/profile_default.xml

+17 −0
Original line number Diff line number Diff line
@@ -165,4 +165,21 @@ 
            <lightsMode>DEFAULT</lightsMode>

        </profileGroup>

    </profile>

    <notificationGroup nameres="profileGroupPhone" uuid="d393035d-ea71-4f2a-bdbd-b65f6bf298f1">

        <package>com.android.phone</package>

    </notificationGroup>

    <notificationGroup nameres="profileGroupCalendar" uuid="66bc93e4-775a-4ac2-9da1-752178fcdcaf">

        <package>com.android.calendar</package>

        <package>com.google.android.calendar</package>

    </notificationGroup>

    <notificationGroup nameres="profileGroupGmail" uuid="d2ebb02a-5205-47c5-8e39-f55823d4082a">

        <package>com.google.android.gm</package>

    </notificationGroup>

    <notificationGroup nameres="profileGroupEmail" uuid="db3318cd-1964-4732-b913-1f83d73a3dea">

        <package>com.android.email</package>

    </notificationGroup>

    <notificationGroup nameres="profileGroupSMS" uuid="da4f1e2d-0e50-4789-acd4-5ca2b53a981b">

        <package>com.android.mms</package>

        <package>com.google.android.talk</package>

    </notificationGroup>

</profiles>

services/core/java/com/android/server/ProfileManagerService.java

+1 −3
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ public class ProfileManagerService extends IProfileManager.Stub { 
    // Enable the below for detailed logging of this class

    private static final boolean LOCAL_LOGV = false;



    private static final boolean USE_NOTIFICATION_GROUPS = false;



    public static final String PERMISSION_CHANGE_SETTINGS = "android.permission.WRITE_SETTINGS";



    /* package */ static final File PROFILE_FILE =
@@ -487,7 +485,7 @@ public class ProfileManagerService extends IProfileManager.Stub { 
                    if (active == null) {

                        active = prof.getUuid().toString();

                    }

                } else if (USE_NOTIFICATION_GROUPS && name.equals("notificationGroup")) {

                } else if (name.equals("notificationGroup")) {

                    NotificationGroup ng = NotificationGroup.fromXml(xpp, context);

                    addNotificationGroupInternal(ng);

                }