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

Merge \"Merge \\"Print names of observers causing timeout\\" into nyc-mr1-dev am: 38d7897690\" into nyc-mr1-dev-plus-aosp

Browse Source 
am: a5b7b96500

Change-Id: I04decfb9d3988e5080ab3ff5c88032836dd1306a
This commit is contained in:
Fyodor Kupolov
2016-06-23 22:11:49 +00:00
committed by android-build-merger
parent be007c2619 a5b7b96500
commit 1d84a7ffef
8 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/ActivityManagerNative.java
View File

@@ -2371,7 +2371,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
data.enforceInterface(IActivityManager.descriptor);
IUserSwitchObserver observer = IUserSwitchObserver.Stub.asInterface(
data.readStrongBinder());
registerUserSwitchObserver(observer);
String name = data.readString();
registerUserSwitchObserver(observer, name);
reply.writeNoException();
return true;
}
@@ -6060,11 +6061,13 @@ class ActivityManagerProxy implements IActivityManager
return result;
}
public void registerUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException {
public void registerUserSwitchObserver(IUserSwitchObserver observer,
String name) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(observer != null ? observer.asBinder() : null);
data.writeString(name);
mRemote.transact(REGISTER_USER_SWITCH_OBSERVER_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();

3
core/java/android/app/IActivityManager.java
View File

@@ -512,7 +512,8 @@ public interface IActivityManager extends IInterface {
public int getLaunchedFromUid(IBinder activityToken) throws RemoteException;
public String getLaunchedFromPackage(IBinder activityToken) throws RemoteException;
public void registerUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException;
public void registerUserSwitchObserver(IUserSwitchObserver observer,
String name) throws RemoteException;
public void unregisterUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException;
public void requestBugReport(int bugreportType) throws RemoteException;