summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and ↵Wei Wang2014-05-2016-3200/+2
| | | | | | | | multiple advertising." This reverts commit 2c4e68a86b7a9b9f760a8907b93ff40ccad56c80. Change-Id: I98c91343d886ebe22d0bf75a710fa0b0abf738b6
* APIs for BLE scan, scan filter, batch scan, onFound/onLost and multipleWei Wang2014-05-1916-2/+3200
| | | | | | advertising. Change-Id: I1655eb9cffa890b6fe38108bf51078662e90bc03
* Add a method to check whether a UUID is 32bit.Wei Wang2014-05-192-1/+35
| | | | Change-Id: I92e8bab560b2083e9f4855d28b3f54f2120ef628
* Merge "Fixed a big with the vetobutton, circumventing double tapping."Selim Cinek2014-05-203-2/+12
|\
| * Fixed a big with the vetobutton, circumventing double tapping.Selim Cinek2014-05-203-2/+12
| | | | | | | | Change-Id: Ie31d06fe4e2454cf6a3223bef75eca2c76f47b59
* | Merge "Fixed several bugs introduced by the new background views."Selim Cinek2014-05-205-14/+45
|\ \ | |/
| * Fixed several bugs introduced by the new background views.Selim Cinek2014-05-205-14/+45
| | | | | | | | | | | | | | Also notifications are now limited to 4U again. Bug: 14880580 Change-Id: I05d19981ad1bb06687bf6c994608e21ac925a759
* | Merge "QuickSettings: cap touch feedback to panel."John Spurlock2014-05-201-0/+1
|\ \
| * | QuickSettings: cap touch feedback to panel.John Spurlock2014-05-191-0/+1
| | | | | | | | | | | | | | | Bug:15089348 Change-Id: I0d9cc21d9888e1cc67f61c61dfae5e6c519ace1b
* | | Merge "Move the non-market install setting from Global to per-user Secure"Christopher Tate2014-05-203-19/+66
|\ \ \
| * | | Move the non-market install setting from Global to per-user SecureChristopher Tate2014-05-193-19/+66
| | |/ | |/| | | | | | | | | | | | | Bug 13760585 Change-Id: I45b0fa87e72dc5c18d687261fb95cbea5d06163a
* | | Merge "Allow adding a user while still removing other users"Amith Yamasani2014-05-202-3/+14
|\ \ \
| * | | Allow adding a user while still removing other usersAmith Yamasani2014-05-192-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Fix infinite loop in TrustManagerService exception handler."Jim Miller2014-05-201-2/+0
|\ \ \ \
| * | | | Fix infinite loop in TrustManagerService exception handler.Jim Miller2014-05-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 15092272 Change-Id: I972a9134aed18fc160c919eac93e9d488b5691f1
* | | | | Merge "Dump the countdown condition, if active."John Spurlock2014-05-201-0/+12
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Dump the countdown condition, if active.John Spurlock2014-05-191-0/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I3fa1d239379565bae74094dc2bc2da76326f41dd
* | | | | New keycode definitions for HDMI-CECJinsuk Kim2014-05-204-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Fix password obscuring in TextView accessibility node"Alan Viverette2014-05-191-1/+1
|\ \ \ \ \
| * | | | | Fix password obscuring in TextView accessibility nodeAlan Viverette2014-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 14998638 Change-Id: I215ea7b11bef5242e6adb1e595df36555548c165
* | | | | | Merge "Rehide status bar signal problem colors on user builds."John Spurlock2014-05-191-1/+2
|\ \ \ \ \ \
| * | | | | | Rehide status bar signal problem colors on user builds.John Spurlock2014-05-191-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Bug:15089446 Change-Id: I322156a49e3117c38de2d2c5ba3223cea03abfff
* | | | | | Merge "TouchFeedbackDrawable is now RippleDrawable"Alan Viverette2014-05-1921-583/+124
|\ \ \ \ \ \
| * | | | | | TouchFeedbackDrawable is now RippleDrawableAlan Viverette2014-05-1921-583/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I59f5f04b73089215c6320560556ac21beb03db06
* | | | | | | Merge "fix argument order in call to SkBlurDrawLooper constructor"Victoria Lease2014-05-191-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix argument order in call to SkBlurDrawLooper constructorVictoria Lease2014-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes all sorts of badness. Bug: 15074512 Change-Id: I5e96983c58d19e0dc2d8fa61d1efa9dcff076ca1
* | | | | | | Merge "Add HEVC decoder support ot MediaCodec bug: 14571712"Rachad2014-05-193-0/+60
|\ \ \ \ \ \ \
| * | | | | | | Add HEVC decoder support ot MediaCodecRachad2014-05-143-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 14571712 Change-Id: Ic65e1ffd7583f7286728332686dbb92090b5a413
* | | | | | | | Merge "Removing versionCode"ztenghui2014-05-192-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Removing versionCodeztenghui2014-05-192-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b768d591208d10a5ae9b23a845102398eac20b6
* | | | | | | | | Implement onPeriodChanged and multiple scans of same channelsVinit Deshpande2014-05-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "Remove the versionCode"ztenghui2014-05-192-21/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Remove the versionCodeztenghui2014-05-192-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a77fefd7b14fd3bef0b0c7a142fe88e69883c75
* | | | | | | | | Merge "Cleaned up CanvasCompare tests."Chris Craik2014-05-192-19/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleaned up CanvasCompare tests.Antonio Calabrese2014-05-192-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93b2f73283e3ab2b8679bf36f29c7bd6cb74c6bf
* | | | | | | | | | Merge "Correct viewport initialization, bounds comparison"Chris Craik2014-05-192-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correct viewport initialization, bounds comparisonChris Craik2014-05-152-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd751856e3712991e149800ed179464397dad7c3
* | | | | | | | | | | Merge "Using new APIs for handling system bar insets."Winson Chung2014-05-192-3/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Using new APIs for handling system bar insets.Winson Chung2014-05-192-3/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge "Move background from notification into a view."Jorim Jaggi2014-05-194-117/+230
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move background from notification into a view.Jorim Jaggi2014-05-194-117/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to run a circular clip animation for the double-tap interaction on the lockscreen. Change-Id: I1c36f4d250c0255fc1fd89f97f078b3f5914ee47
* | | | | | | | | | | | Merge "Fixing regression in dismissing Recents."Winson Chung2014-05-1913-29/+67
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fixing regression in dismissing Recents.Winson Chung2014-05-1913-29/+67
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Restoring app info functionality when developer options are enabled and you long-press on the app icon. Change-Id: I8a20ff5f595eefa20db5528c0d5b1a1f0b110834
* | | | | | | | | | | am 9d1c3814: am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated ↵quddusc2014-05-193-15/+89
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * \ \ \ \ \ \ \ \ \ \ am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play ↵quddusc2014-05-193-15/+89
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | * \ \ \ \ \ \ \ \ \ \ am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services ↵quddusc2014-05-193-15/+89
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | | * \ \ \ \ \ \ \ \ \ \ am 728dbf8c: Merge "docs: Updated Google Play Services highlights and ↵quddusc2014-05-193-15/+89
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | | | * \ \ \ \ \ \ \ \ \ \ Merge "docs: Updated Google Play Services highlights and landing pages for ↵quddusc2014-05-193-15/+89
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kenafa (Google Play Services v4.4)." into klp-docs
| | | | | * | | | | | | | | | | docs: Updated Google Play Services highlights and landing pages for Kenafa ↵quddusc2014-05-093-15/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Google Play Services v4.4). Change-Id: Ibc5000dfa5509cb1448fa867eb87d4e19c31ff1f
* | | | | | | | | | | | | | | | am 11f06976: am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated ↵Quddus Chong2014-05-19483-68229/+177637
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Javadoc for GMS Kenafa release." into klp-docs * commit '11f069764bff452e2fac51765560e12d1017d516': docs: Updated Javadoc for GMS Kenafa release.