diff options
| author | 2018-06-08 15:11:57 -0700 | |
|---|---|---|
| committer | 2018-06-08 15:11:57 -0700 | |
| commit | f11e2bd016d886a333345dea853ebda23a408d5c (patch) | |
| tree | 905bd4d25d6ab2b046620ff459777d8dcfa5d7de /libs/binder/Static.cpp | |
| parent | aabd6b7fa343654cd85b3b2da392e424d037d15a (diff) | |
| parent | 5c947cdf72270fd1f766b2248d526ebc8c7227f6 (diff) | |
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I6d6bee71b9424eb478780bbfc06b830eb8ded342
Diffstat (limited to 'libs/binder/Static.cpp')
| -rw-r--r-- | libs/binder/Static.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/binder/Static.cpp b/libs/binder/Static.cpp index c3ba5a23c5..bd0e6f9a11 100644 --- a/libs/binder/Static.cpp +++ b/libs/binder/Static.cpp @@ -72,13 +72,16 @@ TextOutput& aerr(gStderrTextOutput); // ------------ ProcessState.cpp -Mutex gProcessMutex; +Mutex& gProcessMutex = *new Mutex; sp<ProcessState> gProcess; // ------------ IServiceManager.cpp Mutex gDefaultServiceManagerLock; sp<IServiceManager> gDefaultServiceManager; +#ifndef __ANDROID_VNDK__ sp<IPermissionController> gPermissionController; +#endif +bool gSystemBootCompleted = false; } // namespace android |