135856 Commits

Author SHA1 Message Date
Amith Yamasani
3fa61b671e Merge "Allow adding a user while still removing other users" 2014-05-20 01:02:59 +00:00
Amith Yamasani
f584f014db Allow adding a user while still removing other users
When at the user limit, removing and adding a user causes a race
condition where the deleted user is still being removed and adding
another one fails.

This change excludes deleted users from the counting to compare
against the limit.

Also fix an ArrayIndexOutOfBounds recently introduced in AppOpsService.

Bug: 13282768
Change-Id: Ib79659e7604396583a280dbbc560b288a6d9051c
2014-05-19 17:57:25 -07:00
Jim Miller
fe4e1b655f Merge "Fix infinite loop in TrustManagerService exception handler." 2014-05-20 00:50:05 +00:00
John Spurlock
ce271360da Merge "Dump the countdown condition, if active." 2014-05-20 00:46:09 +00:00
John Spurlock
fb8eb00bcd Dump the countdown condition, if active.
Change-Id: I3fa1d239379565bae74094dc2bc2da76326f41dd
2014-05-19 20:43:48 -04:00
Jinsuk Kim
96658f7167 New keycode definitions for HDMI-CEC
Following keys are added to be mapped to HDMI-CEC standard keys:

KEYCODE_MEDIA_TOP_MENU
KEYCODE_11
KEYCODE_12
KEYCODE_LAST_CHANNEL
KEYCODE_TV_DATA_SERVICE

Also updated the information on the key code update by removing
some files not present any more.

Change-Id: I305d9b578c1824f34c457144a68132717dc9a97f
2014-05-20 00:43:38 +00:00
Jim Miller
577b6f6ae4 Fix infinite loop in TrustManagerService exception handler.
Fixes bug 15092272

Change-Id: I972a9134aed18fc160c919eac93e9d488b5691f1
2014-05-19 17:38:13 -07:00
Alan Viverette
d6a91b0bb6 Merge "Fix password obscuring in TextView accessibility node" 2014-05-19 23:56:06 +00:00
John Spurlock
c135fffe99 Merge "Rehide status bar signal problem colors on user builds." 2014-05-19 23:55:18 +00:00
John Spurlock
8a6810e8ea Rehide status bar signal problem colors on user builds.
Bug:15089446
Change-Id: I322156a49e3117c38de2d2c5ba3223cea03abfff
2014-05-19 19:52:07 -04:00
Alan Viverette
0d18871688 Merge "TouchFeedbackDrawable is now RippleDrawable" 2014-05-19 23:51:31 +00:00
Alan Viverette
c80ad99a33 TouchFeedbackDrawable is now RippleDrawable
Change-Id: I59f5f04b73089215c6320560556ac21beb03db06
2014-05-19 16:27:31 -07:00
Victoria Lease
eabcc91252 Merge "fix argument order in call to SkBlurDrawLooper constructor" 2014-05-19 23:16:49 +00:00
Victoria Lease
49f0db3481 fix argument order in call to SkBlurDrawLooper constructor
This fixes all sorts of badness.

Bug: 15074512
Change-Id: I5e96983c58d19e0dc2d8fa61d1efa9dcff076ca1
2014-05-19 16:12:22 -07:00
Alan Viverette
3a499e013c Fix password obscuring in TextView accessibility node
BUG: 14998638
Change-Id: I215ea7b11bef5242e6adb1e595df36555548c165
2014-05-19 16:04:40 -07:00
Rachad
c9550f2ce8 Merge "Add HEVC decoder support ot MediaCodec bug: 14571712" 2014-05-19 23:00:29 +00:00
George Mount
42516d19db API Review: split out BidirectionalTypeConverter.
Bug 14997858

Change-Id: I1f2ccf7c4e60320c8df759702a8f2fa24fd3acd2
2014-05-19 15:57:14 -07:00
ztenghui
6e9b18a604 Merge "Removing versionCode" 2014-05-19 22:43:32 +00:00
Vinit Deshpande
c101b1c90b Implement onPeriodChanged and multiple scans of same channels
This change fixes multiple scans of same channels; and it generates
onPeriodChanged event.

cherry-picked from partner:klp-wireless-dev
SHA1 950564a305865cc0ae2bc528479ea6922efbb898

Bug: 15000051
Change-Id: I06a4ecc9d45eda4984de50b97b39f623dd0b26d1
2014-05-19 15:29:43 -07:00
ztenghui
6d6ebaf4ca Removing versionCode
Change-Id: I4b768d591208d10a5ae9b23a845102398eac20b6
2014-05-19 15:29:07 -07:00
John Reck
918988c1ce Baby steps
Run ViewPropertyAnimators with no listeners on the RenderThread

Change-Id: I7ff5300db96c7f4b59b09e3fff8a0df173f132dd
2014-05-19 15:28:05 -07:00
ztenghui
77bc0a17e8 Merge "Remove the versionCode" 2014-05-19 22:13:36 +00:00
Chris Craik
6f775255c8 Merge "Cleaned up CanvasCompare tests." 2014-05-19 21:54:17 +00:00
Chris Craik
f2985ba3f4 Merge "Correct viewport initialization, bounds comparison" 2014-05-19 21:54:03 +00:00
Winson Chung
a4fcdad1b8 Merge "Using new APIs for handling system bar insets." 2014-05-19 21:53:36 +00:00
Winson Chung
653f70c223 Using new APIs for handling system bar insets. 2014-05-19 14:49:42 -07:00
Jorim Jaggi
e595504f09 Merge "Move background from notification into a view." 2014-05-19 21:13:36 +00:00
Winson Chung
4661a2574a Merge "Fixing regression in dismissing Recents." 2014-05-19 21:13:13 +00:00
Jorim Jaggi
a8b48e166c Move background from notification into a view.
This allows to run a circular clip animation for the double-tap
interaction on the lockscreen.

Change-Id: I1c36f4d250c0255fc1fd89f97f078b3f5914ee47
2014-05-19 23:10:32 +02:00
quddusc
510eb068b4 am 9d1c3814: am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
* commit '9d1c38144683f61a01c445ba4e8ce921a82f697f':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
2014-05-19 21:06:53 +00:00
Quddus Chong
9deac8df37 am 11f06976: am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '11f069764bff452e2fac51765560e12d1017d516':
  docs: Updated Javadoc for GMS Kenafa release.
2014-05-19 21:06:48 +00:00
Winson Chung
6cb485fd2e Fixing regression in dismissing Recents.
- Restoring app info functionality when developer options are enabled and you long-press on the app icon.

Change-Id: I8a20ff5f595eefa20db5528c0d5b1a1f0b110834
2014-05-19 14:06:13 -07:00
quddusc
9d1c381446 am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
* commit '9e58b46b566e2b1963ea1e42a9696a32784859f4':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
2014-05-19 21:03:02 +00:00
Quddus Chong
11f069764b am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '4b2b91d47c1430f3c69893466cf2b8b025876888':
  docs: Updated Javadoc for GMS Kenafa release.
2014-05-19 21:02:57 +00:00
quddusc
9e58b46b56 am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
* commit 'f269e732bf76d7dc4b37f2ce023684b4fe691c60':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
2014-05-19 20:58:49 +00:00
Quddus Chong
4b2b91d47c am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '4706479326789b4b20cc370cdb28c7a0b4f09646':
  docs: Updated Javadoc for GMS Kenafa release.
2014-05-19 20:58:41 +00:00
quddusc
f269e732bf am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
* commit '728dbf8cc8d6c8a84bf67b8b34295eab4503d230':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
2014-05-19 20:55:35 +00:00
Quddus Chong
4706479326 am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit 'f4b6449515f212642e90e435b2a3a55766a41f9e':
  docs: Updated Javadoc for GMS Kenafa release.
2014-05-19 20:55:31 +00:00
quddusc
728dbf8cc8 Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs 2014-05-19 20:52:05 +00:00
Quddus Chong
f4b6449515 Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs 2014-05-19 20:51:39 +00:00
Mark Renouf
16e782374b am 5a932046: am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev
* commit '5a93204678f5032e3464cc36e38a805aabdeec95':
  Override windowContentOverlay and windowBackground for Theme.Micro.*
2014-05-19 20:44:31 +00:00
Mark Renouf
5a93204678 am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev
* commit '6a7843c972122bd90819fe991cb463088f19be0a':
  Override windowContentOverlay and windowBackground for Theme.Micro.*
2014-05-19 20:40:51 +00:00
Mark Renouf
6a7843c972 Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev 2014-05-19 20:36:40 +00:00
ztenghui
e3c45e7a6b Remove the versionCode
Change-Id: I2a77fefd7b14fd3bef0b0c7a142fe88e69883c75
2014-05-19 13:22:10 -07:00
John Reck
8461b70b6c Merge "Workaround double-translate bug" 2014-05-19 20:21:00 +00:00
John Reck
86faf9ec3e Workaround double-translate bug
Bug: 15065005

Change-Id: Ie0f77c6ea13eebf3508df7513b79efaa65d31de0
2014-05-19 13:19:07 -07:00
Selim Cinek
aa22315879 Merge "Fixed overScroll bugs in new notification shade." 2014-05-19 19:57:09 +00:00
Selim Cinek
4195dd0ec6 Fixed overScroll bugs in new notification shade.
In certain situations the overscroll did not work, this is now fixed.
Also sometimes the overscroll could jump when flinging and we are
already overscrolled.

Change-Id: I20741f5c88028bf7b63c3db86266f8a68341fa62
2014-05-19 21:56:19 +02:00
Chris Craik
50b843883d am 3c769ec0: am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit '3c769ec02b8b82bec4dec2169bf76af58be94a9a':
  Use alpha channel instead of red in drawCachedGlyphBitmap
2014-05-19 19:35:59 +00:00
Chris Craik
3c769ec02b am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit '00fabcbeb035fb513293ea01d245002f40b3234f':
  Use alpha channel instead of red in drawCachedGlyphBitmap
2014-05-19 19:32:38 +00:00