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

Commit e8598947 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge changes I1bc6f74e,Iabd5ac29,I2b6daab0,I8db46d38,Icca3366a,I9191e4b2 into ics 

* changes:
  Do not dispatch context selection events to non-visible fragments.
  Fix potential NPE when saving fragment state.
  Distance max set incorrectly
  Fix for too many binder calls in packagemanager
  Issue: Foreground activity performs [Resume] and [Pause] when any process died in sleep mode.
  Prevent empty overflow popup when there are no overflow items.
parents 8e4091b2 1dd85052

core/java/android/app/FragmentManager.java

+4 −1
Original line number Diff line number Diff line
@@ -1538,6 +1538,9 @@ final class FragmentManagerImpl extends FragmentManager { 
                    FragmentManagerImpl.VIEW_STATE_TAG, f.mSavedViewState);

        }

        if (!f.mUserVisibleHint) {

            if (result == null) {

                result = new Bundle();

            }

            // Only add this if it's not the default value

            result.putBoolean(FragmentManagerImpl.USER_VISIBLE_HINT_TAG, f.mUserVisibleHint);

        }
@@ -1887,7 +1890,7 @@ final class FragmentManagerImpl extends FragmentManager { 
        if (mActive != null) {

            for (int i=0; i<mAdded.size(); i++) {

                Fragment f = mAdded.get(i);

                if (f != null && !f.mHidden) {

                if (f != null && !f.mHidden && f.mUserVisibleHint) {

                    if (f.onContextItemSelected(item)) {

                        return true;

                    }

core/java/com/android/internal/view/menu/ActionMenuPresenter.java

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter 
     */

    public boolean showOverflowMenu() {

        if (mReserveOverflow && !isOverflowMenuShowing() && mMenu != null && mMenuView != null &&

                mPostedOpenRunnable == null) {

                mPostedOpenRunnable == null && !mMenu.getNonActionItems().isEmpty()) {

            OverflowPopup popup = new OverflowPopup(mContext, mMenu, mOverflowButton, true);

            mPostedOpenRunnable = new OpenOverflowRunnable(popup);

            // Post this for later; we might still need a layout for the anchor to be right.

services/input/InputReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2909,7 +2909,7 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { 
            mOrientedRanges.distance.min =

                    mRawPointerAxes.distance.minValue * mDistanceScale;

            mOrientedRanges.distance.max =

                    mRawPointerAxes.distance.minValue * mDistanceScale;

                    mRawPointerAxes.distance.maxValue * mDistanceScale;

            mOrientedRanges.distance.flat = 0;

            mOrientedRanges.distance.fuzz =

                    mRawPointerAxes.distance.fuzz * mDistanceScale;

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

+4 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,10 @@ final class ActivityStack { 
        // If we are sleeping, and there is no resumed activity, and the top

        // activity is paused, well that is the state we want.

        if ((mService.mSleeping || mService.mShuttingDown)

                && mLastPausedActivity == next && next.state == ActivityState.PAUSED) {

                && mLastPausedActivity == next

                && (next.state == ActivityState.PAUSED

                    || next.state == ActivityState.STOPPED

                    || next.state == ActivityState.STOPPING)) {

            // Make sure we have executed any pending transitions, since there

            // should be nothing left to do at this point.

            mService.mWindowManager.executeAppTransition();

services/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -2586,7 +2586,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    }

                }



                if (pi != null && !list.append(pi)) {

                if (pi != null && list.append(pi)) {

                    break;

                }

            }
@@ -2647,7 +2647,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    }

                }



                if (ai != null && !list.append(ai)) {

                if (ai != null && list.append(ai)) {

                    break;

                }

            }