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

Commit d48796bd authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Android (Google) Code Review
Browse files

Merge "Move enums file to new directory"

parents e03063e1 677a0df0

Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -747,6 +747,7 @@ gensrcs { 


    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        "core/proto/**/*.proto",

        "libs/incident/**/*.proto",

    ],
@@ -773,6 +774,7 @@ gensrcs { 


    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        "core/proto/**/*.proto",

        "libs/incident/**/*.proto",

    ],
@@ -912,6 +914,7 @@ java_library_host { 
    name: "platformprotos",

    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        ":libstats_internal_protos",

        "cmds/am/proto/instrumentation_data.proto",

        "cmds/statsd/src/**/*.proto",
@@ -947,6 +950,7 @@ java_library { 
    sdk_version: "9",

    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        "core/proto/**/*.proto",

        "libs/incident/proto/android/os/**/*.proto",

    ],
@@ -962,6 +966,7 @@ java_library { 


    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        "core/proto/**/*.proto",

        "libs/incident/proto/android/os/**/*.proto",

    ],
@@ -983,7 +988,9 @@ cc_defaults { 


    proto: {

        export_proto_headers: true,

        include_dirs: ["external/protobuf/src"],

        include_dirs: [

            "external/protobuf/src",

        ],

    },



    cflags: [
@@ -994,6 +1001,7 @@ cc_defaults { 


    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        "core/proto/**/*.proto",

    ],

}

cmds/statsd/tests/LogEvent_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#include <gtest/gtest.h>



#include "frameworks/base/core/proto/android/stats/launcher/launcher.pb.h"

#include "frameworks/proto_logging/stats/atoms.pb.h"

#include "frameworks/proto_logging/stats/enums/stats/launcher/launcher.pb.h"

#include "log/log_event_list.h"

#include "stats_event.h"

core/proto/Android.bp

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
// Copyright (C) 2018 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



// C++ library for Bluetooth platform wide protobuf definitions

cc_library_static {

    name: "libbt-platform-protos-lite",

    host_supported: true,

    proto: {

        export_proto_headers: true,

        type: "lite",

    },

    srcs: [

        "android/bluetooth/a2dp/enums.proto",

        "android/bluetooth/enums.proto",

        "android/bluetooth/hci/enums.proto",

        "android/bluetooth/hfp/enums.proto",

        "android/bluetooth/smp/enums.proto",

    ],

}

core/proto/android/app/enums.proto

deleted100644 → 0
+0 −215
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



syntax = "proto2";



package android.app;



option java_outer_classname = "AppProtoEnums";

option java_multiple_files = true;



// ActivityManagerInternal.java's APP_TRANSITION reasons.

enum AppTransitionReasonEnum {

    APP_TRANSITION_REASON_UNKNOWN = 0;

    // The transition was started because we drew the splash screen.

    APP_TRANSITION_SPLASH_SCREEN = 1;

    // The transition was started because we all app windows were drawn.

    APP_TRANSITION_WINDOWS_DRAWN = 2;

    // The transition was started because of a timeout.

    APP_TRANSITION_TIMEOUT = 3;

    // The transition was started because of a we drew a task snapshot.

    APP_TRANSITION_SNAPSHOT = 4;

    // The transition was started because it was a recents animation and we only needed to wait on

    // the wallpaper.

    APP_TRANSITION_RECENTS_ANIM = 5;

}



// ActivityManager.java PROCESS_STATEs

// Next tag: 1021

enum ProcessStateEnum {

    // Unlike the ActivityManager PROCESS_STATE values, the ordering and numerical values

    // here are completely fixed and arbitrary. Order is irrelevant.

    // No attempt need be made to keep them in sync.

    // The values here must not be modified. Any new process states can be appended to the end.



    // Process state that is unknown to this proto file (i.e. is not mapped

    // by ActivityManager.processStateAmToProto()). Can only happen if there's a bug in the mapping.

    PROCESS_STATE_UNKNOWN_TO_PROTO = 998;

    // Not a real process state.

    PROCESS_STATE_UNKNOWN = 999;

    // Process is a persistent system process.

    PROCESS_STATE_PERSISTENT = 1000;

    // Process is a persistent system process and is doing UI.

    PROCESS_STATE_PERSISTENT_UI = 1001;

    // Process is hosting the current top activities. Note that this covers

    // all activities that are visible to the user.

    PROCESS_STATE_TOP = 1002;

    // Process is bound to a TOP app.

    PROCESS_STATE_BOUND_TOP = 1020;

    // Process is hosting a foreground service.

    PROCESS_STATE_FOREGROUND_SERVICE = 1003;

    // Process is hosting a service bound by the system or another foreground app.

    PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 1004;

    // Process is important to the user, and something they are aware of.

    PROCESS_STATE_IMPORTANT_FOREGROUND = 1005;

    // Process is important to the user, but not something they are aware of.

    PROCESS_STATE_IMPORTANT_BACKGROUND = 1006;

    // Process is in the background transient so we will try to keep running.

    PROCESS_STATE_TRANSIENT_BACKGROUND = 1007;

    // Process is in the background running a backup/restore operation.

    PROCESS_STATE_BACKUP = 1008;

    // Process is in the background running a service. Unlike oom_adj, this

    // level is used for both the normal running in background state and the

    // executing operations state.

    PROCESS_STATE_SERVICE = 1009;

    // Process is in the background running a receiver. Note that from the

    // perspective of oom_adj, receivers run at a higher foreground level, but

    // for our prioritization here that is not necessary and putting them

    // below services means many fewer changes in some process states as they

    // receive broadcasts.

    PROCESS_STATE_RECEIVER = 1010;

    // Same as PROCESS_STATE_TOP but while device is sleeping.

    PROCESS_STATE_TOP_SLEEPING = 1011;

    // Process is in the background, but it can't restore its state so we want

    // to try to avoid killing it.

    PROCESS_STATE_HEAVY_WEIGHT = 1012;

    // Process is in the background but hosts the home activity.

    PROCESS_STATE_HOME = 1013;

    // Process is in the background but hosts the last shown activity.

    PROCESS_STATE_LAST_ACTIVITY = 1014;

    // Process is being cached for later use and contains activities.

    PROCESS_STATE_CACHED_ACTIVITY = 1015;

    // Process is being cached for later use and is a client of another cached

    // process that contains activities.

    PROCESS_STATE_CACHED_ACTIVITY_CLIENT = 1016;

    // Process is being cached for later use and has an activity that corresponds

    // to an existing recent task.

    PROCESS_STATE_CACHED_RECENT = 1017;

    // Process is being cached for later use and is empty.

    PROCESS_STATE_CACHED_EMPTY = 1018;

    // Process does not exist.

    PROCESS_STATE_NONEXISTENT = 1019;

}



// AppOpsManager.java - operation ids for logging

enum AppOpEnum {

    APP_OP_NONE = -1;

    APP_OP_COARSE_LOCATION = 0;

    APP_OP_FINE_LOCATION = 1;

    APP_OP_GPS = 2;

    APP_OP_VIBRATE = 3;

    APP_OP_READ_CONTACTS = 4;

    APP_OP_WRITE_CONTACTS = 5;

    APP_OP_READ_CALL_LOG = 6;

    APP_OP_WRITE_CALL_LOG = 7;

    APP_OP_READ_CALENDAR = 8;

    APP_OP_WRITE_CALENDAR = 9;

    APP_OP_WIFI_SCAN = 10;

    APP_OP_POST_NOTIFICATION = 11;

    APP_OP_NEIGHBORING_CELLS = 12;

    APP_OP_CALL_PHONE = 13;

    APP_OP_READ_SMS = 14;

    APP_OP_WRITE_SMS = 15;

    APP_OP_RECEIVE_SMS = 16;

    APP_OP_RECEIVE_EMERGENCY_SMS = 17;

    APP_OP_RECEIVE_MMS = 18;

    APP_OP_RECEIVE_WAP_PUSH = 19;

    APP_OP_SEND_SMS = 20;

    APP_OP_READ_ICC_SMS = 21;

    APP_OP_WRITE_ICC_SMS = 22;

    APP_OP_WRITE_SETTINGS = 23;

    APP_OP_SYSTEM_ALERT_WINDOW = 24;

    APP_OP_ACCESS_NOTIFICATIONS = 25;

    APP_OP_CAMERA = 26;

    APP_OP_RECORD_AUDIO = 27;

    APP_OP_PLAY_AUDIO = 28;

    APP_OP_READ_CLIPBOARD = 29;

    APP_OP_WRITE_CLIPBOARD = 30;

    APP_OP_TAKE_MEDIA_BUTTONS = 31;

    APP_OP_TAKE_AUDIO_FOCUS = 32;

    APP_OP_AUDIO_MASTER_VOLUME = 33;

    APP_OP_AUDIO_VOICE_VOLUME = 34;

    APP_OP_AUDIO_RING_VOLUME = 35;

    APP_OP_AUDIO_MEDIA_VOLUME = 36;

    APP_OP_AUDIO_ALARM_VOLUME = 37;

    APP_OP_AUDIO_NOTIFICATION_VOLUME = 38;

    APP_OP_AUDIO_BLUETOOTH_VOLUME = 39;

    APP_OP_WAKE_LOCK = 40;

    APP_OP_MONITOR_LOCATION = 41;

    APP_OP_MONITOR_HIGH_POWER_LOCATION = 42;

    APP_OP_GET_USAGE_STATS = 43;

    APP_OP_MUTE_MICROPHONE = 44;

    APP_OP_TOAST_WINDOW = 45;

    APP_OP_PROJECT_MEDIA = 46;

    APP_OP_ACTIVATE_VPN = 47;

    APP_OP_WRITE_WALLPAPER = 48;

    APP_OP_ASSIST_STRUCTURE = 49;

    APP_OP_ASSIST_SCREENSHOT = 50;

    APP_OP_READ_PHONE_STATE = 51;

    APP_OP_ADD_VOICEMAIL = 52;

    APP_OP_USE_SIP = 53;

    APP_OP_PROCESS_OUTGOING_CALLS = 54;

    APP_OP_USE_FINGERPRINT = 55;

    APP_OP_BODY_SENSORS = 56;

    APP_OP_READ_CELL_BROADCASTS = 57;

    APP_OP_MOCK_LOCATION = 58;

    APP_OP_READ_EXTERNAL_STORAGE = 59;

    APP_OP_WRITE_EXTERNAL_STORAGE = 60;

    APP_OP_TURN_SCREEN_ON = 61;

    APP_OP_GET_ACCOUNTS = 62;

    APP_OP_RUN_IN_BACKGROUND = 63;

    APP_OP_AUDIO_ACCESSIBILITY_VOLUME = 64;

    APP_OP_READ_PHONE_NUMBERS = 65;

    APP_OP_REQUEST_INSTALL_PACKAGES = 66;

    APP_OP_PICTURE_IN_PICTURE = 67;

    APP_OP_INSTANT_APP_START_FOREGROUND = 68;

    APP_OP_ANSWER_PHONE_CALLS = 69;

    APP_OP_RUN_ANY_IN_BACKGROUND = 70;

    APP_OP_CHANGE_WIFI_STATE = 71;

    APP_OP_REQUEST_DELETE_PACKAGES = 72;

    APP_OP_BIND_ACCESSIBILITY_SERVICE = 73;

    APP_OP_ACCEPT_HANDOVER = 74;

    APP_OP_MANAGE_IPSEC_TUNNELS = 75;

    APP_OP_START_FOREGROUND = 76;

    APP_OP_BLUETOOTH_SCAN = 77;

    APP_OP_USE_BIOMETRIC = 78;

    APP_OP_ACTIVITY_RECOGNITION = 79;

    APP_OP_SMS_FINANCIAL_TRANSACTIONS = 80;

    APP_OP_READ_MEDIA_AUDIO = 81;

    APP_OP_WRITE_MEDIA_AUDIO = 82;

    APP_OP_READ_MEDIA_VIDEO = 83;

    APP_OP_WRITE_MEDIA_VIDEO = 84;

    APP_OP_READ_MEDIA_IMAGES = 85;

    APP_OP_WRITE_MEDIA_IMAGES = 86;

    APP_OP_LEGACY_STORAGE = 87;

    APP_OP_ACCESS_ACCESSIBILITY = 88;

    APP_OP_READ_DEVICE_IDENTIFIERS = 89;

    APP_OP_ACCESS_MEDIA_LOCATION = 90;

    APP_OP_QUERY_ALL_PACKAGES = 91;

    APP_OP_MANAGE_EXTERNAL_STORAGE = 92;

    APP_OP_INTERACT_ACROSS_PROFILES = 93;

    APP_OP_ACTIVATE_PLATFORM_VPN = 94;

    APP_OP_LOADER_USAGE_STATS = 95;

    APP_OP_DEPRECATED_1 = 96 [deprecated = true];

    APP_OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED = 97;

    APP_OP_AUTO_REVOKE_MANAGED_BY_INSTALLER = 98;

    APP_OP_NO_ISOLATED_STORAGE = 99;

    APP_OP_PHONE_CALL_MICROPHONE = 100;

    APP_OP_PHONE_CALL_CAMERA = 101;

    APP_OP_RECORD_AUDIO_HOTWORD = 102;

    APP_OP_MANAGE_ONGOING_CALLS = 103;

    APP_OP_MANAGE_CREDENTIALS = 104;

}

core/proto/android/app/job/enums.proto

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



syntax = "proto2";



package android.app.job;



// This file is for JobScheduler enums inside the app directory. If you're

// adding enums for system-server-side code, use the file in

// frameworks/base/core/proto/android/server/job.

option java_outer_classname = "JobProtoEnums";

option java_multiple_files = true;



// Reasons a job is stopped.

// Primarily used in android.app.job.JobParameters.java.

enum StopReasonEnum {

    STOP_REASON_UNKNOWN = -1;

    STOP_REASON_CANCELLED = 0;

    STOP_REASON_CONSTRAINTS_NOT_SATISFIED = 1;

    STOP_REASON_PREEMPT = 2;

    STOP_REASON_TIMEOUT = 3;

    STOP_REASON_DEVICE_IDLE = 4;

    STOP_REASON_DEVICE_THERMAL = 5;

    STOP_REASON_RESTRICTED_BUCKET = 6;

}