Merge "Ultrasound: Fix touchable region for windows on off-screen display"
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index 7ce6072..3a208a1 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -517,6 +517,14 @@
: (first
? sFirstAwakePssTimes
: sSameAwakePssTimes);
+
+ // handle an invalid state scenario
+ if ((procState < 0) || (procState >= table.length)) {
+ Slog.w(ActivityManagerService.TAG,
+ "Invalid Process State within computeNextPssTime");
+ return now + PSS_MIN_TIME_FROM_STATE_CHANGE;
+ }
+
return now + table[procState];
}
diff --git a/telephony/java/com/android/ims/ImsReasonInfo.java b/telephony/java/com/android/ims/ImsReasonInfo.java
index 0b1246b..ccffc7a 100644
--- a/telephony/java/com/android/ims/ImsReasonInfo.java
+++ b/telephony/java/com/android/ims/ImsReasonInfo.java
@@ -229,6 +229,12 @@
public static final int CODE_ECBM_NOT_SUPPORTED = 901;
/**
+ * MT call has ended due to a release from the network
+ * because the call was answered elsewhere
+ */
+ public static final int CODE_ANSWERED_ELSEWHERE = 1014;
+
+ /**
* Network string error messages.
* mExtraMessage may have these values.
*/