summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-08-22 14:14:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-22 14:14:54 -0700
commitb9b56954ec5a242f7c4945942539106539f98ffb (patch)
tree8a65b45600e476175401783557b880f2bee9d130 /core/java/android
parent6cf3b925ca2640c5c5e7e91ffd91749c0b5b2560 (diff)
parent259328c04ce16c554b48a14f68d8af94dc54d7ec (diff)
downloadframeworks_base-b9b56954ec5a242f7c4945942539106539f98ffb.zip
frameworks_base-b9b56954ec5a242f7c4945942539106539f98ffb.tar.gz
frameworks_base-b9b56954ec5a242f7c4945942539106539f98ffb.tar.bz2
Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/PowerManager.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index 83267af..a1901a5 100644
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -268,13 +268,6 @@ public final class PowerManager {
public static final int USER_ACTIVITY_FLAG_NO_CHANGE_LIGHTS = 1 << 0;
/**
- * Special wake lock tag used for the wake lock in the Window Manager that handles the
- * {@link android.view.WindowManager.LayoutParams#FLAG_KEEP_SCREEN_ON} flag.
- * @hide
- */
- public static final String KEEP_SCREEN_ON_FLAG_TAG = "KEEP_SCREEN_ON_FLAG";
-
- /**
* Go to sleep reason code: Going to sleep due by user request.
* @hide
*/