summaryrefslogtreecommitdiffstats
path: root/core/java/android/service/wallpaper
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-02-01 16:53:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-01 16:53:09 -0800
commitd48ba867d69159542cf967d5fcaba41c5474f134 (patch)
tree8633ce6c08ab68a1925efdc60211dc1ed36f0d85 /core/java/android/service/wallpaper
parent2a70a1e349cb982ae68196195d4745474d8f2568 (diff)
parente77f99144f015d9044909a4c128fa916465b0671 (diff)
downloadframeworks_base-d48ba867d69159542cf967d5fcaba41c5474f134.zip
frameworks_base-d48ba867d69159542cf967d5fcaba41c5474f134.tar.gz
frameworks_base-d48ba867d69159542cf967d5fcaba41c5474f134.tar.bz2
am e77f9914: Merge "Whoops, need to put this check back." into honeycomb
* commit 'e77f99144f015d9044909a4c128fa916465b0671': Whoops, need to put this check back.
Diffstat (limited to 'core/java/android/service/wallpaper')
-rw-r--r--core/java/android/service/wallpaper/WallpaperService.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 1dfc469..662bbb5 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -36,6 +36,7 @@ import android.os.Bundle;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
+import android.os.Process;
import android.os.RemoteException;
import android.util.Log;
import android.util.LogPrinter;
@@ -204,6 +205,17 @@ public abstract class WallpaperService extends Service {
return mIsCreating;
}
+ @Override
+ public void setFixedSize(int width, int height) {
+ if (Process.myUid() != Process.SYSTEM_UID) {
+ // Regular apps can't do this. It can only work for
+ // certain designs of window animations, so you can't
+ // rely on it.
+ throw new UnsupportedOperationException(
+ "Wallpapers currently only support sizing from layout");
+ }
+ }
+
public void setKeepScreenOn(boolean screenOn) {
throw new UnsupportedOperationException(
"Wallpapers do not support keep screen on");