Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter.""... (13c70441) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManager.java

+1 −14

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

	package android.view;		package android.view;

	import android.annotation.SystemApi;
	import android.app.Presentation;		import android.app.Presentation;
	import android.content.Context;		import android.content.Context;
	import android.content.pm.ActivityInfo;		import android.content.pm.ActivityInfo;
	@@ -1592,18 +1591,6 @@ public interface WindowManager extends ViewManager {
	return mTitle;		return mTitle;
	}		}

	/** @hide */
	@SystemApi
	public final void setUserActivityTimeout(long timeout) {
	userActivityTimeout = timeout;
	}

	/** @hide */
	@SystemApi
	public final long getUserActivityTimeout() {
	return userActivityTimeout;
	}

	public int describeContents() {		public int describeContents() {
	return 0;		return 0;
	}		}