diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-05-13 00:07:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 00:07:07 +0000 |
| commit | 2882bb9a94bba6477552e7f696984e8e1ce052ff (patch) | |
| tree | d9c3a4121bc65f1f160f9cfb520a6ba10bf9989d /services/camera/libcameraservice/CameraService.h | |
| parent | 94183482a089690278fbe2346fa6946c9c7d97ef (diff) | |
| parent | be0b6b4a3770a9dd2ff357fe3e88a6ba11a976ff (diff) | |
| download | frameworks_av-2882bb9a94bba6477552e7f696984e8e1ce052ff.zip frameworks_av-2882bb9a94bba6477552e7f696984e8e1ce052ff.tar.gz frameworks_av-2882bb9a94bba6477552e7f696984e8e1ce052ff.tar.bz2 | |
Merge "camera2: Fix arbitration priority calculation." into mnc-dev
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 8df746a..1041550 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -71,22 +71,8 @@ public: API_2 = 2 }; - // Process States (mirrors frameworks/base/core/java/android/app/ActivityManager.java) + // Process state (mirrors frameworks/base/core/java/android/app/ActivityManager.java) static const int PROCESS_STATE_NONEXISTENT = -1; - static const int PROCESS_STATE_PERSISTENT = 0; - static const int PROCESS_STATE_PERSISTENT_UI = 1; - static const int PROCESS_STATE_TOP = 2; - static const int PROCESS_STATE_IMPORTANT_FOREGROUND = 3; - static const int PROCESS_STATE_IMPORTANT_BACKGROUND = 4; - static const int PROCESS_STATE_BACKUP = 5; - static const int PROCESS_STATE_HEAVY_WEIGHT = 6; - static const int PROCESS_STATE_SERVICE = 7; - static const int PROCESS_STATE_RECEIVER = 8; - static const int PROCESS_STATE_HOME = 9; - static const int PROCESS_STATE_LAST_ACTIVITY = 10; - static const int PROCESS_STATE_CACHED_ACTIVITY = 11; - static const int PROCESS_STATE_CACHED_ACTIVITY_CLIENT = 12; - static const int PROCESS_STATE_CACHED_EMPTY = 13; // 3 second busy timeout when other clients are connecting static const nsecs_t DEFAULT_CONNECT_TIMEOUT_NS = 3000000000; |