diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-10-29 19:34:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 19:34:33 +0000 |
| commit | 9ca4f33e3a20e100af0390af4035382f7caa47eb (patch) | |
| tree | 1bc5ab5b7d835c4e3cdedcc6ae7c449012440d4d | |
| parent | 512dab0c0bc1590abc7032b262ccd33619eb0e9a (diff) | |
| parent | 3180c1cc68d4dd757705b0f1d89b97d5d3095536 (diff) | |
| download | android_frameworks_webview-9ca4f33e3a20e100af0390af4035382f7caa47eb.tar.gz android_frameworks_webview-9ca4f33e3a20e100af0390af4035382f7caa47eb.tar.bz2 android_frameworks_webview-9ca4f33e3a20e100af0390af4035382f7caa47eb.zip | |
am 3180c1cc: resolved conflicts for merge of 5a706141 to stage-aosp-master
* commit '3180c1cc68d4dd757705b0f1d89b97d5d3095536':
Remove the default text encoding resource.
Wrap one more Context
| -rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java index 8d92630..0c034b3 100644 --- a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java +++ b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java @@ -986,8 +986,9 @@ public class WebViewContentsClientAdapter extends AwContentsClient { if (result == null) { // The ic_media_video_poster icon is transparent so we need to draw it on a gray // background. + Context ctx = ResourcesContextWrapperFactory.get(mWebView.getContext()); Bitmap poster = BitmapFactory.decodeResource( - mWebView.getContext().getResources(), + ctx.getResources(), R.drawable.ic_media_video_poster); result = Bitmap.createBitmap(poster.getWidth(), poster.getHeight(), poster.getConfig()); result.eraseColor(Color.GRAY); |