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

Commit 3979c0bf authored by Michael Wright's avatar Michael Wright
Browse files

resolve merge conflicts of 342e9030 to master. 

Change-Id: Id8404cce5c1c8e7818e5d164f93207a8c17cf7bb
parents aa118f67 342e9030

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -2143,6 +2143,7 @@ public abstract class Context { 
            MEDIA_SESSION_SERVICE,

            BATTERY_SERVICE,

            JOB_SCHEDULER_SERVICE,

            MEDIA_PROJECTION_SERVICE,

            MIDI_SERVICE,

    })

    @Retention(RetentionPolicy.SOURCE)