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

Commit 228f5258 authored by Guang Zhu's avatar Guang Zhu Committed by Android (Google) Code Review
Browse files

Merge "Fix DeviceBootTest failures in master."

parents 53306b40 4495e10a

core/java/android/app/AppOpsManager.java

+3 −1
Original line number Diff line number Diff line
@@ -2434,8 +2434,10 @@ public class AppOpsManager { 
            AppProtoEnums.APP_OP_ACTIVATE_PLATFORM_VPN, // OP_ACTIVATE_PLATFORM_VPN

            AppProtoEnums.APP_OP_LOADER_USAGE_STATS, // OP_LOADER_USAGE_STATS

            AppProtoEnums.APP_OP_ACCESS_CALL_AUDIO, // OP_ACCESS_CALL_AUDIO

            AppProtoEnums.APP_OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED

            AppProtoEnums.APP_OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED,

            // OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED

            AppProtoEnums.APP_OP_AUTO_REVOKE_MANAGED_BY_INSTALLER

            // OP_AUTO_REVOKE_MANAGED_BY_INSTALLER

    };

core/proto/android/app/enums.proto

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ enum AppOpEnum { 
    APP_OP_LOADER_USAGE_STATS = 95;

    APP_OP_ACCESS_CALL_AUDIO = 96;

    APP_OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED = 97;

    APP_OP_AUTO_REVOKE_MANAGED_BY_INSTALLER = 98;

}