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

Commit c6420540 authored by Faye Yan's avatar Faye Yan
Browse files

Rename OP_RECEIVE_SANDBOX_TRAINING_DATA to... 

Rename OP_RECEIVE_SANDBOX_TRAINING_DATA to OP_RECEIVE_TRUSTED_PROCESS_TRAINING_DATA per AGSA team request based on the API designed for trusted process.

Bug: 287084455

Change-Id: I1fdbc6232e38f1b3ce5513d35b78309550bed194
Test: presubmit
parent e0abf543

core/java/android/app/AppOpsManager.java

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

            AppProtoEnums.APP_OP_RECEIVE_SANDBOX_TRIGGER_AUDIO;





    /**

    /**

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

     * Allows the assistant app to get the training data from the trusted process to improve the

     * hotword training model.

     * hotword training model.

     *

     *

     * @hide

     * @hide

     */

     */

    public static final int OP_RECEIVE_SANDBOX_TRAINING_DATA =

    public static final int OP_RECEIVE_TRUSTED_PROCESS_TRAINING_DATA =

            AppProtoEnums.APP_OP_RECEIVE_SANDBOX_TRAINING_DATA;

            AppProtoEnums.APP_OP_RECEIVE_TRUSTED_PROCESS_TRAINING_DATA;





    /** @hide */

    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

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

            OPSTR_CAMERA_SANDBOXED,

            OPSTR_RECORD_AUDIO_SANDBOXED,

            OPSTR_RECORD_AUDIO_SANDBOXED,

            OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO,

            OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO,

            OPSTR_RECEIVE_SANDBOX_TRAINING_DATA

            OPSTR_RECEIVE_TRUSTED_PROCESS_TRAINING_DATA

    })

    })

    public @interface AppOpString {}

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

            "android:receive_sandbox_trigger_audio";





    /**

    /**

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

     * Allows the assistant app to get the training data from the trusted process to improve

     * the hotword training model.

     * the hotword training model.

     *

     *

     * @hide

     * @hide

     */

     */

    public static final String OPSTR_RECEIVE_SANDBOX_TRAINING_DATA =

    public static final String OPSTR_RECEIVE_TRUSTED_PROCESS_TRAINING_DATA =

            "android:receive_sandbox_training_data";

            "android:receive_trusted_process_training_data";





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

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

    private static final byte SHOULD_COLLECT_NOTE_OP_NOT_INITIALIZED = 0;

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

                OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO,

                "RECEIVE_SANDBOX_TRIGGER_AUDIO")

                "RECEIVE_SANDBOX_TRIGGER_AUDIO")

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

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

        new AppOpInfo.Builder(OP_RECEIVE_SANDBOX_TRAINING_DATA,

        new AppOpInfo.Builder(OP_RECEIVE_TRUSTED_PROCESS_TRAINING_DATA,

                OPSTR_RECEIVE_SANDBOX_TRAINING_DATA,

                OPSTR_RECEIVE_TRUSTED_PROCESS_TRAINING_DATA,

                "RECEIVE_SANDBOX_TRAINING_DATA").build()

                "RECEIVE_TRUSTED_PROCESS_TRAINING_DATA").build()

    };

    };





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

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