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

Commit 560f555c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am c0b59093: am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail... 

am c0b59093: am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev

* commit 'c0b59093':
  Try again to fix issue #6912004:tap on gmail notification sends me to home screen
parents 83f73408 c0b59093

core/java/android/app/ActivityManagerNative.java

+19 −0
Original line number Diff line number Diff line
@@ -404,6 +404,14 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case ACTIVITY_RESUMED_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();

            activityResumed(token);

            reply.writeNoException();

            return true;

        }



        case ACTIVITY_PAUSED_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();
@@ -2152,6 +2160,17 @@ class ActivityManagerProxy implements IActivityManager 
        data.recycle();

        reply.recycle();

    }

    public void activityResumed(IBinder token) throws RemoteException

    {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(token);

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

        reply.readException();

        data.recycle();

        reply.recycle();

    }

    public void activityPaused(IBinder token) throws RemoteException

    {

        Parcel data = Parcel.obtain();

core/java/android/app/ActivityThread.java

+14 −4
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ public final class ActivityThread { 
                case RESUME_ACTIVITY:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityResume");

                    handleResumeActivity((IBinder)msg.obj, true,

                            msg.arg1 != 0);

                            msg.arg1 != 0, true);

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case SEND_RESULT:
@@ -2175,7 +2175,8 @@ public final class ActivityThread { 
        if (a != null) {

            r.createdConfig = new Configuration(mConfiguration);

            Bundle oldState = r.state;

            handleResumeActivity(r.token, false, r.isForward);

            handleResumeActivity(r.token, false, r.isForward,

                    !r.activity.mFinished && !r.startsNotResumed);



            if (!r.activity.mFinished && r.startsNotResumed) {

                // The activity manager actually wants this one to start out
@@ -2684,7 +2685,8 @@ public final class ActivityThread { 
        r.mPendingRemoveWindowManager = null;

    }



    final void handleResumeActivity(IBinder token, boolean clearHide, boolean isForward) {

    final void handleResumeActivity(IBinder token, boolean clearHide, boolean isForward,

            boolean reallyResume) {

        // If we are getting ready to gc after going to the background, well

        // we are back active so skip it.

        unscheduleGcIdler();
@@ -2781,6 +2783,14 @@ public final class ActivityThread { 
            }

            r.onlyLocalRequest = false;



            // Tell the activity manager we have resumed.

            if (reallyResume) {

                try {

                    ActivityManagerNative.getDefault().activityResumed(token);

                } catch (RemoteException ex) {

                }

            }



        } else {

            // If an exception was thrown when trying to resume, then

            // just end this activity.

core/java/android/app/IActivityManager.java

+2 −6
Original line number Diff line number Diff line
@@ -87,19 +87,15 @@ public interface IActivityManager extends IInterface { 
            String resultData, Bundle map, String requiredPermission,

            boolean serialized, boolean sticky, int userId) throws RemoteException;

    public void unbroadcastIntent(IApplicationThread caller, Intent intent, int userId) throws RemoteException;

    /* oneway */

    public void finishReceiver(IBinder who, int resultCode, String resultData, Bundle map, boolean abortBroadcast) throws RemoteException;

    public void attachApplication(IApplicationThread app) throws RemoteException;

    /* oneway */

    public void activityResumed(IBinder token) throws RemoteException;

    public void activityIdle(IBinder token, Configuration config,

            boolean stopProfiling) throws RemoteException;

    public void activityPaused(IBinder token) throws RemoteException;

    /* oneway */

    public void activityStopped(IBinder token, Bundle state,

            Bitmap thumbnail, CharSequence description) throws RemoteException;

    /* oneway */

    public void activitySlept(IBinder token) throws RemoteException;

    /* oneway */

    public void activityDestroyed(IBinder token) throws RemoteException;

    public String getCallingPackage(IBinder token) throws RemoteException;

    public ComponentName getCallingActivity(IBinder token) throws RemoteException;
@@ -496,7 +492,7 @@ public interface IActivityManager extends IInterface { 
    int BIND_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+35;

    int UNBIND_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+36;

    int PUBLISH_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+37;



    int ACTIVITY_RESUMED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+38;

    int GOING_TO_SLEEP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+39;

    int WAKING_UP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+40;

    int SET_DEBUG_APP_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+41;

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

+16 −10
Original line number Diff line number Diff line
@@ -1796,7 +1796,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
    }















    private final void updateLruProcessInternalLocked(ProcessRecord app,













            boolean oomAdj, boolean updateActivityTime, int bestPos) {













            boolean updateActivityTime, int bestPos) {















        // put it on the LRU to keep track of when it should be exited.















        int lrui = mLruProcesses.indexOf(app);















        if (lrui >= 0) mLruProcesses.remove(lrui);










@@ -1853,7 +1853,7 @@ public final class ActivityManagerService extends ActivityManagerNative













                if (cr.binding != null && cr.binding.service != null















                        && cr.binding.service.app != null















                        && cr.binding.service.app.lruSeq != mLruSeq) {













                    updateLruProcessInternalLocked(cr.binding.service.app, false,













                    updateLruProcessInternalLocked(cr.binding.service.app,















                            updateActivityTime, i+1);















                }















            }









@@ -1861,21 +1861,21 @@ public final class ActivityManagerService extends ActivityManagerNative













        for (int j=app.conProviders.size()-1; j>=0; j--) {















            ContentProviderRecord cpr = app.conProviders.get(j).provider;















            if (cpr.proc != null && cpr.proc.lruSeq != mLruSeq) {













                updateLruProcessInternalLocked(cpr.proc, false,













                updateLruProcessInternalLocked(cpr.proc,















                        updateActivityTime, i+1);















            }















        }













        













        //Slog.i(TAG, "Putting proc to front: " + app.processName);













        if (oomAdj) {













            updateOomAdjLocked();













        }















    }





























    final void updateLruProcessLocked(ProcessRecord app,















            boolean oomAdj, boolean updateActivityTime) {















        mLruSeq++;













        updateLruProcessInternalLocked(app, oomAdj, updateActivityTime, 0);













        updateLruProcessInternalLocked(app, updateActivityTime, 0);

























        //Slog.i(TAG, "Putting proc to front: " + app.processName);













        if (oomAdj) {













            updateOomAdjLocked();













        }















    }





























    final ProcessRecord getProcessRecordLocked(










@@ -4458,6 +4458,12 @@ public final class ActivityManagerService extends ActivityManagerNative













        }















    }



























    public final void activityResumed(IBinder token) {













        final long origId = Binder.clearCallingIdentity();













        mMainStack.activityResumed(token);













        Binder.restoreCallingIdentity(origId);













    }



























    public final void activityPaused(IBinder token) {















        final long origId = Binder.clearCallingIdentity();















        mMainStack.activityPaused(token, false);

































services/java/com/android/server/am/ActivityStack.java



+24
−10




























Original line number
Diff line number
Diff line








@@ -53,7 +53,6 @@ import android.os.Looper;













import android.os.Message;















import android.os.ParcelFileDescriptor;















import android.os.PowerManager;













import android.os.Process;















import android.os.RemoteException;















import android.os.SystemClock;















import android.os.UserHandle;










@@ -763,8 +762,6 @@ final class ActivityStack {













            completeResumeLocked(r);















            checkReadyForSleepLocked();















            if (DEBUG_SAVED_STATE) Slog.i(TAG, "Launch completed; removing icicle of " + r.icicle);













            r.icicle = null;













            r.haveState = false;















        } else {















            // This activity is not starting in the resumed state... which















            // should look like we asked it to pause+stop (but remain visible),










@@ -1019,6 +1016,20 @@ final class ActivityStack {













        }















    }





























    final void activityResumed(IBinder token) {













        ActivityRecord r = null;



























        synchronized (mService) {













            int index = indexOfTokenLocked(token);













            if (index >= 0) {













                r = mHistory.get(index);













                if (DEBUG_SAVED_STATE) Slog.i(TAG, "Resumed activity; dropping state of: " + r);













                r.icicle = null;













                r.haveState = false;













            }













        }













    }





























    final void activityPaused(IBinder token, boolean timeout) {















        if (DEBUG_PAUSE) Slog.v(















            TAG, "Activity paused: token=" + token + ", timeout=" + timeout);










@@ -1496,6 +1507,15 @@ final class ActivityStack {













        // can be resumed...















        if (mResumedActivity != null) {















            if (DEBUG_SWITCH) Slog.v(TAG, "Skip resume: need to start pausing");













            // At this point we want to put the upcoming activity's process













            // at the top of the LRU list, since we know we will be needing it













            // very soon and it would be a waste to let it get killed if it













            // happens to be sitting towards the end.













            if (next.app != null && next.app.thread != null) {













                // No reason to do full oom adj update here; we'll let that













                // happen whenever it needs to later.













                mService.updateLruProcessLocked(next.app, false, true);













            }















            startPausingLocked(userLeaving, false);















            return true;















        }










@@ -1736,11 +1756,6 @@ final class ActivityStack {













                        "resume-exception", true);















                return true;















            }



























            // Didn't need to use the icicle, and it is now out of date.













            if (DEBUG_SAVED_STATE) Slog.i(TAG, "Resumed activity; didn't need icicle of: " + next);













            next.icicle = null;













            next.haveState = false;















            next.stopped = false;































        } else {










@@ -2586,7 +2601,6 @@ final class ActivityStack {













            mDismissKeyguardOnNextActivity = false;















            mService.mWindowManager.dismissKeyguard();















        }













        Slog.i(TAG, "DONE STARTING!");















        return err;















    }