From 1e219c147e9b6ab34058613424a3c86b69b5e6dc Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Thu, 27 Feb 2020 16:27:49 -0800
Subject: libbinder: move AppOpManager globals into function

Bug: 148177595
Test: N/A
Change-Id: Ibf19d8fbe82595f249fddf8c918c1750bc750f66
---
 libs/binder/AppOpsManager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libs/binder/AppOpsManager.cpp')

diff --git a/libs/binder/AppOpsManager.cpp b/libs/binder/AppOpsManager.cpp
index aeca12b582..b2a6f3bbe9 100644
--- a/libs/binder/AppOpsManager.cpp
+++ b/libs/binder/AppOpsManager.cpp
@@ -43,11 +43,10 @@ const int APP_OPS_MANAGER_UNAVAILABLE_MODE = AppOpsManager::MODE_IGNORED;
 
 }  // namespace
 
-static String16 _appops("appops");
-static pthread_mutex_t gClientIdMutex = PTHREAD_MUTEX_INITIALIZER;
-static sp<IBinder> gClientId;
-
 static const sp<IBinder>& getClientId() {
+    static pthread_mutex_t gClientIdMutex = PTHREAD_MUTEX_INITIALIZER;
+    static sp<IBinder> gClientId;
+
     pthread_mutex_lock(&gClientIdMutex);
     if (gClientId == nullptr) {
         gClientId = new BBinder();
@@ -72,6 +71,7 @@ sp<IAppOpsService> AppOpsManager::getService() { return NULL; }
 #else
 sp<IAppOpsService> AppOpsManager::getService()
 {
+    static String16 _appops("appops");
 
     std::lock_guard<Mutex> scoped_lock(mLock);
     int64_t startTime = 0;
-- 
cgit v1.2.3-59-g8ed1b