commit 7b5f9cde6ac6d949d0227eb47aa2c5de4aea71d9
author Bryce Lee <brycelee@google.com> Fri Feb 06 19:09:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 06 19:09:28 2015 +0000
tree 63480927c37d495a968404204084d6f1b508fc73
parent c63efbd928cc14e32fe19b2dec41d15ffc584182
parent 4cccd58e4219ff1e974db201e064c85063dd262f

am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev

* commit '4cccd58e4219ff1e974db201e064c85063dd262f':
  Expose userActivityTimeout through @SystemApi getter/setter.

core/java/android/view/WindowManager.java

diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 094a8a1..84434f7 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -16,6 +16,7 @@
 
 package android.view;
 
+import android.annotation.SystemApi;
 import android.app.Presentation;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -1590,7 +1591,19 @@
         public final CharSequence getTitle() {
             return mTitle;
         }
-    
+
+        /** @hide */
+        @SystemApi
+        public final void setUserActivityTimeout(long timeout) {
+            userActivityTimeout = timeout;
+        }
+
+        /** @hide */
+        @SystemApi
+        public final long getUserActivityTimeout() {
+            return userActivityTimeout;
+        }
+
         public int describeContents() {
             return 0;
         }