Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev

1 files changed, 1 insertions, 14 deletions

diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 84434f7e07aa..094a8a13653c 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -16,7 +16,6 @@
 
 package android.view;
 
-import android.annotation.SystemApi;
 import android.app.Presentation;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -1591,19 +1590,7 @@ public interface WindowManager extends ViewManager {
         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;
         }