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.

3 files changed, 7 insertions, 4 deletions

diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp
index a04c585..c66e7a1 100644
--- a/services/input/InputReader.cpp
+++ b/services/input/InputReader.cpp
@@ -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;
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 351dbb8..86d3a1a 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -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();
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 8719e8e..978eb69 100644
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -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;
                 }
             }