Change-Id: I16d7c151b46c076bfdccb1ff0b2bcb0934eedf93

Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev

This reverts commit 5730c974.

This change also reverted commit 2c838fbd,
"MediaPlayer: add mPreparing to weed out unwanted prepared messages".

Bug: 21266735
Change-Id: I392342519420bee2fde1fe1915c51d24101ca27d

Now that AnimatedVectorDrawables can use themed animations, SysUI no longer
needs to track separate AVDs for the carrier network change icons.

Bug: 21118142
Change-Id: Ifb6d7b5e7e3de85c10bc13183b4142fd2e6714b6

Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev

This reverts commit cb5499c8.

Bug: 21549197

* commit '11d50c9c':
  Dismiss or cancel in SwipeDismissLayout on screen off.

Bug: 21559453
Change-Id: I1a0bcf7282ad1a651169dea7e8ac5bc618b580d1

* commit '06756f35':
  Dismiss or cancel in SwipeDismissLayout on screen off.

It is possible lockTaskMode was started by the system process
because android:lockTaskMode is set to a locking value in the
application's manifest instead of the app calling
startLockTaskMode. In this case TaskRecord.mLockTaskUid will
be 0, so we compare the callingUid to the
TaskRecord.effectiveUid instead so the app can exit lockTaskMode.

Bug: 21464182
Change-Id: Ibca6de8e4b17051d5fcbb05cde9c8aefed7216f2

Change-Id: I2c55db77ab6feef1b405858aac53fb0ed3370dc2

Bug: 17369696

bug:21560057

Change-Id: I3b44d04bd908d9549ef7ada5f48f5d94e239d186

This reverts commit 831e01a8.

Change-Id: I48bf74631b842178964d25906b2790f18632e32a

Bug: 21471789
Change-Id: Ieba6ab62b5e82eb716934a65efb6bfef2fc4e15a

Change-Id: I5ebe0074849228e5c7fd629df6d1055c867debc8

Add missing available characteristics keys.

Bug: 20883751
Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1

Also minor cleanup and adding annotations.

Bug: 21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15

Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a