commit 78faa5d0374a1a9674498f358e1cbd70a6f57961
author Svetoslav Ganov <svetoslavganov@google.com> Fri Feb 26 20:29:58 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 26 20:29:58 2016 +0000
tree 33f7f587f18fb40c7487b16137bf5aeb08affb18
parent 4928386d23e5851ac48cc14a33408969d799df1f
parent 21696381afb69703bef709f151b6a1885582b5ca

Merge "Refresh the native app ops manager's token if needed." into nyc-dev

libs/binder/AppOpsManager.cpp

diff --git a/libs/binder/AppOpsManager.cpp b/libs/binder/AppOpsManager.cpp
index e4d8201..9a061a0 100644
--- a/libs/binder/AppOpsManager.cpp
+++ b/libs/binder/AppOpsManager.cpp
@@ -28,7 +28,7 @@
 
 static const sp<IBinder>& getToken(const sp<IAppOpsService>& service) {
     pthread_mutex_lock(&gTokenMutex);
-    if (gToken == NULL) {
+    if (gToken == NULL || gToken->pingBinder() != NO_ERROR) {
         gToken = service->getToken(new BBinder());
     }
     pthread_mutex_unlock(&gTokenMutex);