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

Commit 7ccd3241 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge \"Print names of observers causing timeout\" into nyc-mr1-dev 

am: 38d78976

Change-Id: I45f06a2167e11733829c660c7baaae3996d8c7eb
parents 373b8d8f 38d78976

core/java/android/app/ActivityManagerNative.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -2371,7 +2371,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            data.enforceInterface(IActivityManager.descriptor);

            data.enforceInterface(IActivityManager.descriptor);

            IUserSwitchObserver observer = IUserSwitchObserver.Stub.asInterface(

            IUserSwitchObserver observer = IUserSwitchObserver.Stub.asInterface(

                    data.readStrongBinder());

                    data.readStrongBinder());

            registerUserSwitchObserver(observer);

            String name = data.readString();

            registerUserSwitchObserver(observer, name);

            reply.writeNoException();

            reply.writeNoException();

            return true;

            return true;

        }

        }
@@ -6060,11 +6061,13 @@ class ActivityManagerProxy implements IActivityManager 
        return result;

        return result;

    }

    }





    public void registerUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException {

    public void registerUserSwitchObserver(IUserSwitchObserver observer,

            String name) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(observer != null ? observer.asBinder() : null);

        data.writeStrongBinder(observer != null ? observer.asBinder() : null);

        data.writeString(name);

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

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

        reply.readException();

        reply.readException();

        data.recycle();

        data.recycle();

core/java/android/app/IActivityManager.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -512,7 +512,8 @@ public interface IActivityManager extends IInterface { 
    public int getLaunchedFromUid(IBinder activityToken) throws RemoteException;

    public int getLaunchedFromUid(IBinder activityToken) throws RemoteException;

    public String getLaunchedFromPackage(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 unregisterUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException;





    public void requestBugReport(int bugreportType) throws RemoteException;

    public void requestBugReport(int bugreportType) throws RemoteException;

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -1040,10 +1040,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                        public void onForegroundProfileSwitch(int newProfileId) {

                        public void onForegroundProfileSwitch(int newProfileId) {

                            // Ignore.

                            // Ignore.

                        }

                        }

                    });

                    }, TAG);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            // TODO Auto-generated catch block

            e.rethrowAsRuntimeException();

            e.printStackTrace();

        }

        }





        IntentFilter strongAuthTimeoutFilter = new IntentFilter();

        IntentFilter strongAuthTimeoutFilter = new IntentFilter();

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro 




        // listen for user / profile change.

        // listen for user / profile change.

        try {

        try {

            ActivityManagerNative.getDefault().registerUserSwitchObserver(mUserSwitchListener);

            ActivityManagerNative.getDefault().registerUserSwitchObserver(mUserSwitchListener, TAG);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            // Ignore

            // Ignore

        }

        }

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -21374,8 +21374,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
    }

    }

















    @Override







    @Override











    public void registerUserSwitchObserver(IUserSwitchObserver observer) {







    public void registerUserSwitchObserver(IUserSwitchObserver observer, String name) {











        mUserController.registerUserSwitchObserver(observer);







        mUserController.registerUserSwitchObserver(observer, name);











    }







    }



























    @Override







    @Override