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

Commit 98fefcdb authored Mar 04, 2015 by Matt Garnes

Merge CAF branch 'LA.BR.1.2.1_rb2.19' into caf/cm-12.0.

Change-Id: I2d0b90b6b1cbf83e0a681f931f2a0b68aa1b3beb

parents cf1f0210 375a886b

core/java/android/view/accessibility/AccessibilityManager.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -642,7 +642,11 @@ public final class AccessibilityManager {
		}
		final int listenerCount = mAccessibilityStateChangeListeners.size();
		for (int i = 0; i < listenerCount; i++) {
		try {
		mAccessibilityStateChangeListeners.get(i).onAccessibilityStateChanged(isEnabled);
		} catch (IndexOutOfBoundsException e) {
		Log.e(LOG_TAG, "Error while notifying Accessibility State Change : " + e);
		}
		}
		}

core/java/android/widget/Editor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -516,7 +516,7 @@ public class Editor {
		}

		private void hideCursorControllers() {
		if (mSuggestionsPopupWindow != null && !mSuggestionsPopupWindow.isShowingUp()) {
		if (mSuggestionsPopupWindow != null && mSuggestionsPopupWindow.isShowingUp()) {
		// Should be done before hide insertion point controller since it triggers a show of it
		mSuggestionsPopupWindow.hide();
		}

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

+1 −6

Original line number	Diff line number	Diff line
		@@ -1016,12 +1016,7 @@ final class ActivityStack {
		} else if (!hasVisibleBehindActivity()) {
		// If we were visible then resumeTopActivities will release resources before
		// stopping.
		ActivityRecord top = topRunningActivityLocked(null);
		if (top != null && top.equals(prev) && mService.isSleepingOrShuttingDown()){
		Slog.d(TAG, "Top activity keeps the pause sate. top : "+top);
		} else {
		mStackSupervisor.mStoppingActivities.add(prev);
		}
		if (mStackSupervisor.mStoppingActivities.size() > 3 \|\|
		prev.frontOfTask && mTaskHistory.size() <= 1) {
		// If we already have a few activities waiting to stop,

telephony/java/com/android/ims/ImsReasonInfo.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,9 @@ public class ImsReasonInfo implements Parcelable {
		// MT : No action from user after alerting the call
		public static final int CODE_TIMEOUT_NO_ANSWER_CALL_UPDATE = 203;

		//Call failures for FDN
		public static final int CODE_FDN_BLOCKED = 241;

		/**
		* STATUSCODE (SIP response code) (IMS -> Telephony)
		*/