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

Amith Yamasani · Android (Google) Code Review · commit cd668554417f · 2012-10-24T13:30:01.000-07:00
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
@@ -1561,7 +1561,12 @@ public boolean notifySuggestionPicked(SuggestionSpan span, String originalString
                 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;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1561,7 +1561,12 @@ public boolean notifySuggestionPicked(SuggestionSpan span, String originalString`
`1561`	`1561`	`intent.putExtra(SuggestionSpan.SUGGESTION_SPAN_PICKED_BEFORE, originalString);`
`1562`	`1562`	`intent.putExtra(SuggestionSpan.SUGGESTION_SPAN_PICKED_AFTER, suggestions[index]);`
`1563`	`1563`	`intent.putExtra(SuggestionSpan.SUGGESTION_SPAN_PICKED_HASHCODE, span.hashCode());`
`1564`		`- mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);`
	`1564`	`+ final long ident = Binder.clearCallingIdentity();`
	`1565`	`+ try {`
	`1566`	`+ mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);`
	`1567`	`+ } finally {`
	`1568`	`+ Binder.restoreCallingIdentity(ident);`
	`1569`	`+ }`
`1565`	`1570`	`return true;`
`1566`	`1571`	`}`
`1567`	`1572`	`}`