commit cd668554417f089aa0ae013a29ab81864b4b4685
author Amith Yamasani <yamasani@google.com> Wed Oct 24 13:29:52 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 24 13:30:01 2012 -0700
tree 665a357ea303eec7404887fe6cb282c71a43a704
parent f704e9f67745d1f1c01058f4c74b06d157b4054d
parent f043de93ebb5178fb4b5c8f14e143c6f08bcc26f

Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev

services/java/com/android/server/InputMethodManagerService.java

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 679a22a..0e51c47 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1561,7 +1561,12 @@
                 intent.putExtra(SuggestionSpan.SUGGESTION_SPAN_PICKED_BEFORE, originalString);
                 intent.putExtra(SuggestionSpan.SUGGESTION_SPAN_PICKED_AFTER, suggestions[index]);
                 intent.putExtra(SuggestionSpan.SUGGESTION_SPAN_PICKED_HASHCODE, span.hashCode());
-                mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
+                final long ident = Binder.clearCallingIdentity();
+                try {
+                    mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
+                } finally {
+                    Binder.restoreCallingIdentity(ident);
+                }
                 return true;
             }
         }