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

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

Browse Source
This commit is contained in:
Bryce Lee
2015-02-06 19:35:42 +00:00
committed by Android (Google) Code Review
parent 4a88acfcc3 0dad572090
commit 13c7044186
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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