commit 55ea20d9e22dec44b17352c4c9c17b49830ca40f
author Gustav Sennton <gsennton@google.com> Wed Feb 24 12:56:08 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 24 12:56:10 2016 +0000
tree 5c9988f4266ce8dc25389e9d9b4278e48258903d
parent cfdc99ef5e542f61cd405132fc140b14d9ec1620
parent 275d13c2c6c2f055b41b14b1c7ba78b838f03b4d

Merge "Call webview updating logic with the system UID when setup done." into nyc-dev

services/core/java/com/android/server/webkit/WebViewUpdateService.java

diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateService.java b/services/core/java/com/android/server/webkit/WebViewUpdateService.java
index f3b120f..5d0c22e 100644
--- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java
+++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java
@@ -364,9 +364,14 @@
                 return;
             }
 
-            synchronized (WebViewUpdateService.this) {
-                mNumRelroCreationsFinished++;
-                checkIfRelrosDoneLocked();
+            long callingId = Binder.clearCallingIdentity();
+            try {
+                synchronized (WebViewUpdateService.this) {
+                    mNumRelroCreationsFinished++;
+                    checkIfRelrosDoneLocked();
+                }
+            } finally {
+                Binder.restoreCallingIdentity(callingId);
             }
         }