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

Commit 46ff5dd8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[audio] Flag cleanup for OP_TAKE_AUDIO_FOCUS" into main

parents 99bc7977 3e249825

core/java/android/app/AppOpsManager.java

+1 −5
Original line number Diff line number Diff line
@@ -2814,7 +2814,7 @@ public class AppOpsManager { 
            .setDefaultMode(AppOpsManager.MODE_ALLOWED)

            .build(),

        new AppOpInfo.Builder(OP_TAKE_AUDIO_FOCUS, OPSTR_TAKE_AUDIO_FOCUS, "TAKE_AUDIO_FOCUS")

            .setDefaultMode(AppOpsManager.MODE_ALLOWED).build(),

            .setDefaultMode(AppOpsManager.MODE_FOREGROUND).build(),

        new AppOpInfo.Builder(OP_AUDIO_MASTER_VOLUME, OPSTR_AUDIO_MASTER_VOLUME,

                "AUDIO_MASTER_VOLUME").setSwitchCode(OP_AUDIO_MASTER_VOLUME)

            .setRestriction(UserManager.DISALLOW_ADJUST_VOLUME)
@@ -3377,10 +3377,6 @@ public class AppOpsManager { 
     * @hide

     */

    public static @Mode int opToDefaultMode(int op) {

        if (op == OP_TAKE_AUDIO_FOCUS && roForegroundAudioControl()) {

            // when removing the flag, change the entry in sAppOpInfos for OP_TAKE_AUDIO_FOCUS

            return AppOpsManager.MODE_FOREGROUND;

        }

        return sAppOpInfos[op].defaultMode;

    }