diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-09-16 00:05:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-16 00:05:46 -0700 |
| commit | d65afc65ea5b2bf83889dd88a9c94f895da8aece (patch) | |
| tree | 128e635a32ae4ca7b2ecbe72f616d6c01702ad77 /core/java/android/service | |
| parent | 398bad04a0ced9dacda185db8af7526002631f62 (diff) | |
| parent | 5dc5a00e7ebadc085ded7e29feacd17e53698486 (diff) | |
| download | frameworks_base-d65afc65ea5b2bf83889dd88a9c94f895da8aece.zip frameworks_base-d65afc65ea5b2bf83889dd88a9c94f895da8aece.tar.gz frameworks_base-d65afc65ea5b2bf83889dd88a9c94f895da8aece.tar.bz2 | |
Merge "More multi-user stuff." into jb-mr1-dev
Diffstat (limited to 'core/java/android/service')
| -rw-r--r-- | core/java/android/service/wallpaper/IWallpaperConnection.aidl | 1 | ||||
| -rw-r--r-- | core/java/android/service/wallpaper/WallpaperService.java | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/service/wallpaper/IWallpaperConnection.aidl b/core/java/android/service/wallpaper/IWallpaperConnection.aidl index b09ccab..f9c5aaa 100644 --- a/core/java/android/service/wallpaper/IWallpaperConnection.aidl +++ b/core/java/android/service/wallpaper/IWallpaperConnection.aidl @@ -24,5 +24,6 @@ import android.service.wallpaper.IWallpaperEngine; */ interface IWallpaperConnection { void attachEngine(IWallpaperEngine engine); + void engineShown(IWallpaperEngine engine); ParcelFileDescriptor setWallpaper(String name); } diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index efa8911..86bbc55 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -1020,6 +1020,12 @@ public abstract class WallpaperService extends Service { mEngine = engine; mActiveEngines.add(engine); engine.attach(this); + try { + mConnection.engineShown(this); + } catch (RemoteException e) { + Log.w(TAG, "Wallpaper host disappeared", e); + return; + } return; } case DO_DETACH: { |