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

Commit 3f73f5d7 authored by Sam Mortimer's avatar Sam Mortimer Committed by Steve Kondik
Browse files

Restore ProfileGroup notification override functionality 

Also clean up a little.

JIRA: CYAN-3164
Change-Id: I9b71a225996315f517b59d2d6f4074175bbf2d64
parent e1a7cef6

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public abstract class SystemService { 
     */

    public static final int PHASE_BOOT_COMPLETED = 1000;



    private final Context mContext;

    protected final Context mContext;



    /**

     * Initializes the system service.

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

+7 −9
Original line number Diff line number Diff line
@@ -1955,17 +1955,15 @@ public class NotificationManagerService extends SystemService { 
        } finally {

            Binder.restoreCallingIdentity(token);

        }

/* hharte

        try {



        final ProfileManager profileManager =

                (ProfileManager) mContext.getSystemService(Context.PROFILE_SERVICE);



        ProfileGroup group = profileManager.getActiveProfileGroup(pkg);

            notification = group.processNotification(notification);

        } catch(Throwable th) {

            Log.e(TAG, "An error occurred profiling the notification.", th);

        if (group != null) {

            group.applyOverridesToNotification(notification);

        }

*/



        // If we're not supposed to beep, vibrate, etc. then don't.

        final String disableEffects = disableNotificationEffects(record);

        if (disableEffects != null) {