summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-09-09 14:28:05 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-09 14:28:05 -0700
commit104f6a07c9b0613c8a8332eba91e3f93dcb6f083 (patch)
tree331c1010ed7bd064293b0b59077a13986420b6e6
parentd67ff5c41d9267dab101f46476474813eb94bfa4 (diff)
parent9fe6cb5cc2cc86a370d47afc44d27fa7086a15be (diff)
downloadframeworks_base-104f6a07c9b0613c8a8332eba91e3f93dcb6f083.zip
frameworks_base-104f6a07c9b0613c8a8332eba91e3f93dcb6f083.tar.gz
frameworks_base-104f6a07c9b0613c8a8332eba91e3f93dcb6f083.tar.bz2
Merge "Fix issue #5273986: The power usage of the mp3 background playback..."
-rw-r--r--core/java/android/service/wallpaper/WallpaperService.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 39f9367..713bb91 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.PowerManager;
import android.os.Process;
import android.os.RemoteException;
import android.util.Log;
@@ -716,7 +717,9 @@ public abstract class WallpaperService extends Service {
mSession = ViewRootImpl.getWindowSession(getMainLooper());
mWindow.setSession(mSession);
-
+
+ mScreenOn = ((PowerManager)getSystemService(Context.POWER_SERVICE)).isScreenOn();
+
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_SCREEN_ON);
filter.addAction(Intent.ACTION_SCREEN_OFF);