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

Commit a0aafc99 authored by Faye Yan's avatar Faye Yan Committed by Android (Google) Code Review
Browse files

Merge "Rename OP_RECEIVE_SANDBOX_NEGATIVE_DATA_AUDIO to... 

Merge "Rename OP_RECEIVE_SANDBOX_NEGATIVE_DATA_AUDIO to OP_RECEIVE_SANDBOX_TRAINING_DATA per AGSA team request based on the design API for more generic cases." into main
parents 6402b996 88d0671a

core/java/android/app/AppOpsManager.java

+10 −10
Original line number Diff line number Diff line
@@ -1486,13 +1486,13 @@ public class AppOpsManager { 
            AppProtoEnums.APP_OP_RECEIVE_SANDBOX_TRIGGER_AUDIO;



    /**

     * Allows the assistant app to get the negative trigger data from the PCC sandbox to improve the

     * Allows the assistant app to get the training data from the PCC sandbox to improve the

     * hotword training model.

     *

     * @hide

     */

    public static final int OP_RECEIVE_SANDBOX_NEGATIVE_DATA_AUDIO =

            AppProtoEnums.APP_OP_RECEIVE_SANDBOX_NEGATIVE_DATA_AUDIO;

    public static final int OP_RECEIVE_SANDBOX_TRAINING_DATA =

            AppProtoEnums.APP_OP_RECEIVE_SANDBOX_TRAINING_DATA;



    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@@ -1640,7 +1640,7 @@ public class AppOpsManager { 
            OPSTR_CAMERA_SANDBOXED,

            OPSTR_RECORD_AUDIO_SANDBOXED,

            OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO,

            OPSTR_RECEIVE_SANDBOX_NEGATIVE_DATA_AUDIO

            OPSTR_RECEIVE_SANDBOX_TRAINING_DATA

    })

    public @interface AppOpString {}
@@ -2261,13 +2261,13 @@ public class AppOpsManager { 
            "android:receive_sandbox_trigger_audio";



    /**

     * Allows the assistant app to get the negative trigger data from the PCC sandbox to improve

     * Allows the assistant app to get the training data from the PCC sandbox to improve

     * the hotword training model.

     *

     * @hide

     */

    public static final String OPSTR_RECEIVE_SANDBOX_NEGATIVE_DATA_AUDIO =

            "android:receive_sandbox_negative_data_audio";

    public static final String OPSTR_RECEIVE_SANDBOX_TRAINING_DATA =

            "android:receive_sandbox_training_data";



    /** {@link #sAppOpsToNote} not initialized yet for this op */

    private static final byte SHOULD_COLLECT_NOTE_OP_NOT_INITIALIZED = 0;
@@ -2811,9 +2811,9 @@ public class AppOpsManager { 
                OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO,

                "RECEIVE_SANDBOX_TRIGGER_AUDIO")

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

        new AppOpInfo.Builder(OP_RECEIVE_SANDBOX_NEGATIVE_DATA_AUDIO,

                OPSTR_RECEIVE_SANDBOX_NEGATIVE_DATA_AUDIO,

                "RECEIVE_SANDBOX_NEGATIVE_DATA_AUDIO").build()

        new AppOpInfo.Builder(OP_RECEIVE_SANDBOX_TRAINING_DATA,

                OPSTR_RECEIVE_SANDBOX_TRAINING_DATA,

                "RECEIVE_SANDBOX_TRAINING_DATA").build()

    };



    // The number of longs needed to form a full bitmask of app ops