Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cd324d1 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi... 

am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev
automerge: 7b5f9cde

* commit '7b5f9cde':
  Expose userActivityTimeout through @SystemApi getter/setter.
parents a1c14fe9 7b5f9cde

core/java/android/view/WindowManager.java

+14 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.view;



import android.annotation.SystemApi;

import android.app.Presentation;

import android.content.Context;

import android.content.pm.ActivityInfo;
@@ -1594,6 +1595,18 @@ 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;

        }