commit b1c7666a8006e9c36290ae685488a0df203ebe30
author Gustav Sennton <gsennton@google.com> Mon Apr 11 17:40:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 11 17:40:46 2016 +0000
tree 8e3a613133c0910f975e72e18ceb71802fb47122
parent 1fd853468f4071cbdeb913954c9786d6cb6347ef
parent 95cd5d58a8d34b926ed2c89d7547974fa1a19223

Merge "Clear calling identity when enabling WebView fallback logic." into nyc-dev
am: 95cd5d5

* commit '95cd5d58a8d34b926ed2c89d7547974fa1a19223':
  Clear calling identity when enabling WebView fallback logic.

Change-Id: I8d717fd9ad467f4ee8d7e204d9c1e3e84ff5af27

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 1f6fb2a..bbb4951 100644
--- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java
+++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java
@@ -242,7 +242,12 @@
                 throw new SecurityException(msg);
             }
 
-            WebViewUpdateService.this.mImpl.enableFallbackLogic(enable);
+            long callingId = Binder.clearCallingIdentity();
+            try {
+                WebViewUpdateService.this.mImpl.enableFallbackLogic(enable);
+            } finally {
+                Binder.restoreCallingIdentity(callingId);
+            }
         }
     }
 }