am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi... (404a1327) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManager.java

+1 −14

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.view;

		import android.annotation.SystemApi;
		import android.app.Presentation;
		import android.content.Context;
		import android.content.pm.ActivityInfo;
		@@ -1595,18 +1594,6 @@ public interface WindowManager extends ViewManager {
		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;
		}