diff options
author | Yao Chen <yaochen@google.com> | 2014-07-28 20:25:50 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 20:48:02 +0000 |
commit | c2c0bdc10a16bb78979533093a021470071bbecb (patch) | |
tree | 97bda10486e77999d02bce2f8ac903b8638fb9d1 /tests | |
parent | bd9b106806f9792be210cc2d9848d8b1f4b9664d (diff) | |
parent | 5f3e1f2a2dfaa4d1abdda4d0cd7871aea82ffcbd (diff) | |
download | frameworks_base-c2c0bdc10a16bb78979533093a021470071bbecb.zip frameworks_base-c2c0bdc10a16bb78979533093a021470071bbecb.tar.gz frameworks_base-c2c0bdc10a16bb78979533093a021470071bbecb.tar.bz2 |
Merge "s/thumbnail/icon in the browsing api." into lmp-dev
Diffstat (limited to 'tests')
-rw-r--r-- | tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java b/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java index 035b3ea..937f1e6 100644 --- a/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java +++ b/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java @@ -142,7 +142,7 @@ public class BrowserService extends MediaBrowserService { } @Override - public void onLoadThumbnail(Uri uri, int width, int height, Result<Bitmap> result) { + public void onLoadIcon(Uri uri, int width, int height, Result<Bitmap> result) { result.sendResult(null); } |