Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '13c7044186b90f7f63e7a17996222edfb18460f5':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."
This commit is contained in:
Bryce Lee
2015-02-06 19:42:38 +00:00
committed by Android Git Automerger
parent a5669730d0 13c7044186
commit a20e430d0a
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/view/WindowManager.java
View File

@@ -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;
}