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

Commit 96a73973 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 7beb70a9: am e5456645: am 840590dd: Merge "Fix issue #7311376: Add API to... 

am 7beb70a9: am e5456645: am 840590dd: Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev

* commit '7beb70a9':
  Fix issue #7311376: Add API to allow apps to know if they are...
parents d8d279a9 7beb70a9

api/17.txt

+2 −0
Original line number Diff line number Diff line
@@ -16620,6 +16620,8 @@ package android.os { 
    method public android.os.UserHandle getUserForSerialNumber(long);

    method public java.lang.String getUserName();

    method public boolean isUserAGoat();

    method public boolean isUserRunning(android.os.UserHandle);

    method public boolean isUserRunningOrStopping(android.os.UserHandle);

  }















  public abstract class Vibrator {

























api/current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -16620,6 +16620,8 @@ package android.os {













    method public android.os.UserHandle getUserForSerialNumber(long);















    method public java.lang.String getUserName();















    method public boolean isUserAGoat();













    method public boolean isUserRunning(android.os.UserHandle);













    method public boolean isUserRunningOrStopping(android.os.UserHandle);















  }





























  public abstract class Vibrator {

























core/java/android/app/ActivityManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1981,7 +1981,7 @@ public class ActivityManager {













     */















    public boolean isUserRunning(int userid) {















        try {













            return ActivityManagerNative.getDefault().isUserRunning(userid);













            return ActivityManagerNative.getDefault().isUserRunning(userid, false);















        } catch (RemoteException e) {















            return false;















        }

































core/java/android/app/ActivityManagerNative.java



+4
−2




























Original line number
Diff line number
Diff line








@@ -1608,7 +1608,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM













        case IS_USER_RUNNING_TRANSACTION: {















            data.enforceInterface(IActivityManager.descriptor);















            int userid = data.readInt();













            boolean result = isUserRunning(userid);













            boolean orStopping = data.readInt() != 0;













            boolean result = isUserRunning(userid, orStopping);















            reply.writeNoException();















            reply.writeInt(result ? 1 : 0);















            return true;










@@ -3865,11 +3866,12 @@ class ActivityManagerProxy implements IActivityManager













        return userInfo;















    }





























    public boolean isUserRunning(int userid) throws RemoteException {













    public boolean isUserRunning(int userid, boolean orStopping) throws RemoteException {















        Parcel data = Parcel.obtain();















        Parcel reply = Parcel.obtain();















        data.writeInterfaceToken(IActivityManager.descriptor);















        data.writeInt(userid);













        data.writeInt(orStopping ? 1 : 0);















        mRemote.transact(IS_USER_RUNNING_TRANSACTION, data, reply, 0);















        reply.readException();















        boolean result = reply.readInt() != 0;

































core/java/android/app/IActivityManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -326,7 +326,7 @@ public interface IActivityManager extends IInterface {













    public boolean switchUser(int userid) throws RemoteException;















    public int stopUser(int userid, IStopUserCallback callback) throws RemoteException;















    public UserInfo getCurrentUser() throws RemoteException;













    public boolean isUserRunning(int userid) throws RemoteException;













    public boolean isUserRunning(int userid, boolean orStopping) throws RemoteException;















    public int[] getRunningUserIds() throws RemoteException;































    public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException;