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

Commit b759d605 authored by Yuting Fang's avatar Yuting Fang Committed by Android (Google) Code Review
Browse files

Merge "Add OP_EMERGENCY_LOCATION appop to allowed appops in the Privacy Dashboard" into main

parents b54a7bb9 c35c1422

core/java/android/permission/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -213,3 +213,11 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "location_bypass_privacy_dashboard_enabled"

    is_exported: true

    namespace: "permissions"

    description: "Show access entry of location bypass permission in the Privacy Dashboard"

    bug: "325536053"

}

services/core/java/com/android/server/appop/DiscreteRegistry.java

+5 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.app.AppOpsManager.FILTER_BY_PACKAGE_NAME; 
import static android.app.AppOpsManager.FILTER_BY_UID;

import static android.app.AppOpsManager.OP_CAMERA;

import static android.app.AppOpsManager.OP_COARSE_LOCATION;

import static android.app.AppOpsManager.OP_EMERGENCY_LOCATION;

import static android.app.AppOpsManager.OP_FINE_LOCATION;

import static android.app.AppOpsManager.OP_FLAGS_ALL;

import static android.app.AppOpsManager.OP_FLAG_SELF;
@@ -135,9 +136,10 @@ final class DiscreteRegistry { 
    private static final String PROPERTY_DISCRETE_FLAGS = "discrete_history_op_flags";

    private static final String PROPERTY_DISCRETE_OPS_LIST = "discrete_history_ops_cslist";

    private static final String DEFAULT_DISCRETE_OPS = OP_FINE_LOCATION + "," + OP_COARSE_LOCATION

            + "," + OP_CAMERA + "," + OP_RECORD_AUDIO + "," + OP_PHONE_CALL_MICROPHONE + ","

            + OP_PHONE_CALL_CAMERA + "," + OP_RECEIVE_AMBIENT_TRIGGER_AUDIO + ","

            + OP_RECEIVE_SANDBOX_TRIGGER_AUDIO + "," + OP_RESERVED_FOR_TESTING;

            + "," + OP_EMERGENCY_LOCATION + "," + OP_CAMERA + "," + OP_RECORD_AUDIO + ","

            + OP_PHONE_CALL_MICROPHONE + "," + OP_PHONE_CALL_CAMERA + ","

            + OP_RECEIVE_AMBIENT_TRIGGER_AUDIO + "," + OP_RECEIVE_SANDBOX_TRIGGER_AUDIO

            + "," + OP_RESERVED_FOR_TESTING;

    private static final long DEFAULT_DISCRETE_HISTORY_CUTOFF = Duration.ofDays(7).toMillis();

    private static final long MAXIMUM_DISCRETE_HISTORY_CUTOFF = Duration.ofDays(30).toMillis();

    private static final long DEFAULT_DISCRETE_HISTORY_QUANTIZATION =