drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
146,729 Commits 1 Branch 0 Tags
Commit Graph

146729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Shih
e681779cd1 am 91429ebc: am 39c21c83: Merge "MediaPlayer: support external timed text in java" into lmp-dev 
* commit '91429ebc9910cdeee47db5bec8c9233b0c9bedc5':
  MediaPlayer: support external timed text in java
 2014-07-29 21:16:24 +00:00
Christopher Tate
f2dfeef3aa am f23c98bb: am f7d8c491: Merge "Make archive metadata idempotent" into lmp-dev 
* commit 'f23c98bb2c7c7560a86789e35d46c38a11705e37':
  Make archive metadata idempotent
 2014-07-29 21:16:20 +00:00
Prerepa Viswanadham
1270430d63 am 57f30880: am d5359a8e: Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling 
* commit '57f308804fa56c0df4c5b0585af6f0a43b34172c':
  Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling
 2014-07-29 21:16:16 +00:00
Robert Shih
0d80c63982 am 39c21c83: Merge "MediaPlayer: support external timed text in java" into lmp-dev 
* commit '39c21c83089961aa603272decdf3b179a5cdd063':
  MediaPlayer: support external timed text in java
 2014-07-29 21:10:50 +00:00
Christopher Tate
7ec0b01267 am f7d8c491: Merge "Make archive metadata idempotent" into lmp-dev 
* commit 'f7d8c4917f5df8d583c988042c1c9770556ae757':
  Make archive metadata idempotent
 2014-07-29 21:10:45 +00:00
Prerepa Viswanadham
821fb9e8d4 am d5359a8e: Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling 
* commit 'd5359a8ec08646fb0c82a003550dda908efa2045':
  Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling
 2014-07-29 21:10:40 +00:00
Prerepa Viswanadham
f6b3d8ca36 Fix crash in Stopping/Starting BLE advertising after 
BluetoothAdapter cycling

Bug 16528460
Change-Id: Iad852bc93d307c5ca5f7e42f24248aa02c105e8a
 2014-07-29 21:06:29 +00:00
Jon Miranda
4d15ca0e5f am 56d9d1cf: am 1f4a4791: Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev 
* commit '56d9d1cfe44385291e127fb29149ac414a20d83e':
  Exposed getLocationOnScreen, added formatToHexString method.
 2014-07-29 21:00:27 +00:00
Michael Wright
60b504d48a am 0ff95fbb: am f277aa69: Add paragraph tags to MediaProjection docs 
* commit '0ff95fbbd831b91072ff6ff73a637ac617247ed8':
  Add paragraph tags to MediaProjection docs
 2014-07-29 20:56:16 +00:00
Jon Miranda
cbaad7d070 am 1f4a4791: Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev 
* commit '1f4a4791d07d231c16dfcfbbea56eaf6049c3818':
  Exposed getLocationOnScreen, added formatToHexString method.
 2014-07-29 20:55:26 +00:00
Sandeep Siddhartha
bcd3554354 am 518e963a: am cd18dde8: Merge "Use keyphrase id from the recognition event" into lmp-dev 
* commit '518e963a010b6977c8fe9615f5bdc1109663171e':
  Use keyphrase id from the recognition event
 2014-07-29 20:52:18 +00:00
Michael Wright
6f7f3a7c3c am f277aa69: Add paragraph tags to MediaProjection docs 
* commit 'f277aa69c395b6294a88ed60857508f6915aa718':
  Add paragraph tags to MediaProjection docs
 2014-07-29 20:51:26 +00:00
Sandeep Siddhartha
307e8ffac5 am cd18dde8: Merge "Use keyphrase id from the recognition event" into lmp-dev 
* commit 'cd18dde8ad1b15415909451da5d100cfe80500ea':
  Use keyphrase id from the recognition event
 2014-07-29 20:47:29 +00:00
Michael Wright
9469cdde2c Add paragraph tags to MediaProjection docs 
Change-Id: Ia881f9bcf3b93bd699f9ddf80d51ec7d0e74d2ed
 2014-07-29 20:46:40 +00:00
Andrew Lee
a16cced6e0 am 282a5533: am 7b20dedf: Merge "Convert VideoState into an inner class." into lmp-dev 
* commit '282a5533ea89320e7ec66a97d6be4945c564cf13':
  Convert VideoState into an inner class.
 2014-07-29 20:45:33 +00:00
Andrew Lee
c94c230d06 am 7b20dedf: Merge "Convert VideoState into an inner class." into lmp-dev 
* commit '7b20dedfc0e204cc7ba7efae0ccc45576a6231ba':
  Convert VideoState into an inner class.
 2014-07-29 20:41:44 +00:00
Adrian Roos
fef545e478 am ecd63d4e: am b64bbc56: Fix checkbuild 
* commit 'ecd63d4e9a4dfbbbf4ebe367ff0f4b67c897e959':
  Fix checkbuild
 2014-07-29 20:39:14 +00:00
Adrian Roos
036a5e4497 am b64bbc56: Fix checkbuild 
* commit 'b64bbc56e6222a9d8586947981e1243ab37732f2':
  Fix checkbuild
 2014-07-29 20:35:24 +00:00
Adrian Roos
489d2dfc29 Fix checkbuild 
Change-Id: I9c3de31af792863b93a29ef81b50e2149b0a2184
 2014-07-29 20:30:50 +00:00
Alan Viverette
966e844817 am b05e3134: am 9bbfa2a3: Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 
* commit 'b05e3134afe69cc3cefb9cce90cc07d6356aa7d8':
  Clean up TimePicker and DatePicker styling
 2014-07-29 20:19:56 +00:00
Alan Viverette
af0bb09864 am 9bbfa2a3: Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 
* commit '9bbfa2a39cc1df1ae17e0bc82921b5bcb0b0e688':
  Clean up TimePicker and DatePicker styling
 2014-07-29 20:16:09 +00:00
Dake Gu
9881141c6d am 2b6e7e1a: am ebf01ef4: Merge "Transition: Don\'t suppressLayout(false) for returning activity" into lmp-dev 
* commit '2b6e7e1ad27678ee0f25b9a21b8fab353b9ab180':
  Transition: Don't suppressLayout(false) for returning activity
 2014-07-29 19:58:20 +00:00
Dake Gu
cae55dd97f am ebf01ef4: Merge "Transition: Don\'t suppressLayout(false) for returning activity" into lmp-dev 
* commit 'ebf01ef4f9e6d838ef16909d5449fd381009a2a0':
  Transition: Don't suppressLayout(false) for returning activity
 2014-07-29 19:54:26 +00:00
vandwalle
42b2e518cf am dc93aa3e: am 6a161751: Merge "record join attempts" into lmp-dev 
* commit 'dc93aa3e770200668811bbd5994fd2cd58bd0c7b':
  record join attempts
 2014-07-29 19:50:46 +00:00
vandwalle
6f278839fd am 6a161751: Merge "record join attempts" into lmp-dev 
* commit '6a161751250caa5aae16124e2593e0a120dc2a36':
  record join attempts
 2014-07-29 19:46:02 +00:00
Jean-Michel Trivi
05367a4d1f am d752ffdc: am bd89caa8: Optional AudioService debug logs for setMode() 
* commit 'd752ffdcb570d43a6b04fc409ea8d102aea02137':
  Optional AudioService debug logs for setMode()
 2014-07-29 19:35:27 +00:00
Jean-Michel Trivi
1713a1180f am bd89caa8: Optional AudioService debug logs for setMode() 
* commit 'bd89caa83defb0593757792d9a1df80a15b6878c':
  Optional AudioService debug logs for setMode()
 2014-07-29 19:32:02 +00:00
Jean-Michel Trivi
339567d5c9 Optional AudioService debug logs for setMode() 
Add log option to help debug routing / volume issues due to
  improper use of audio mode.

Change-Id: I6c2dde61b6b42ea9b45825ba7e10a17a61991c98
 2014-07-29 19:25:58 +00:00
Behdad Esfahbod
b9d6a9d21f am 1d2bd068: am da5c8cd0: Merge "Use new minikin Layout::doLayout() that doesn\'t use a CSS string" into lmp-dev 
* commit '1d2bd0682e9e0a3782aa6fea785bd1c7b220dbea':
  Use new minikin Layout::doLayout() that doesn't use a CSS string
 2014-07-29 19:09:11 +00:00
Behdad Esfahbod
64f81f158f am da5c8cd0: Merge "Use new minikin Layout::doLayout() that doesn\'t use a CSS string" into lmp-dev 
* commit 'da5c8cd0c7b7a87775952293f430f81e6a28c488':
  Use new minikin Layout::doLayout() that doesn't use a CSS string
 2014-07-29 19:04:25 +00:00
Alan Viverette
6e0d3255f4 am 71d29ec9: am e89c4031: Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 
* commit '71d29ec9012f50a4f7ae68c0ac0dfc7a2335727f':
  Partial revert "Add better errors for unresolved attributes, remove unused code"
 2014-07-29 18:37:56 +00:00
Alan Viverette
3f3802c39c am e89c4031: Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 
* commit 'e89c403128b2cf9dc36eefdc47ada91780cdcb1c':
  Partial revert "Add better errors for unresolved attributes, remove unused code"
 2014-07-29 18:33:56 +00:00
Sandeep Siddhartha
c0b71fcbbe am f3a14c50: am d3fd7b40: Read the keyphrase ID from the recognition event 
* commit 'f3a14c505fbf29bf5657e38e951f815995c26206':
  Read the keyphrase ID from the recognition event
 2014-07-29 18:31:47 +00:00
Sandeep Siddhartha
e288321f9d am d3fd7b40: Read the keyphrase ID from the recognition event 
* commit 'd3fd7b4098c56f9cf52722e4a7c6817b2345b181':
  Read the keyphrase ID from the recognition event
 2014-07-29 18:27:48 +00:00
Matthew Williams
d9fe71ebd5 am 7a2d0ca3: am bd8038b8: Merge "remove possible JobScheduler race in cancel()" into lmp-dev 
* commit '7a2d0ca348e5ca66fba89790fac118149e9f9d7e':
  remove possible JobScheduler race in cancel()
 2014-07-29 18:26:03 +00:00
Jean-Michel Trivi
21ba8a5dce am 66f44ed2: am 6e7eb4d5: Restore missing usage assignment in AudioAttributes 
* commit '66f44ed2b258ff8a4d78164ed469d92de7b6e382':
  Restore missing usage assignment in AudioAttributes
 2014-07-29 18:25:57 +00:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event 
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
 2014-07-29 11:24:51 -07:00
Matthew Williams
aa2119aab8 am bd8038b8: Merge "remove possible JobScheduler race in cancel()" into lmp-dev 
* commit 'bd8038b854845121d52a991640c5f61ecc3690bc':
  remove possible JobScheduler race in cancel()
 2014-07-29 18:21:29 +00:00
Jean-Michel Trivi
0d69b13258 am 6e7eb4d5: Restore missing usage assignment in AudioAttributes 
* commit '6e7eb4d5e768b6f16a806755ba84e0995f70259b':
  Restore missing usage assignment in AudioAttributes
 2014-07-29 18:21:23 +00:00
Jorim Jaggi
5a94dd663e am 3b2ed450: am b73f79b4: Fix crash in ExpandHelper 
* commit '3b2ed4502e39a0d730fe50a5e8097234be65c8b8':
  Fix crash in ExpandHelper
 2014-07-29 18:17:29 +00:00
Jean-Michel Trivi
c1601f73b9 Restore missing usage assignment in AudioAttributes 
A bad merge caused the usage field assignment in
  setLegacyStreamType() to disappear. Restore it.

Change-Id: I2c72e09a2c4a394483b8a4521b72d5edcc346e23
 2014-07-29 18:14:21 +00:00
Jorim Jaggi
7e64e16afa am b73f79b4: Fix crash in ExpandHelper 
* commit 'b73f79b4517a77e550249b1da523fa1d7b9323fa':
  Fix crash in ExpandHelper
 2014-07-29 18:12:09 +00:00
Jason Monk
758e555acd am f3bc00a3: am 9e9b5c70: Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 
* commit 'f3bc00a35f7a9ac8b5cbe7d204b4ef88ff5e11ec':
  Fix incorrect Activity#startLockTask doc
 2014-07-29 18:08:13 +00:00
Jorim Jaggi
c503896a4d Fix crash in ExpandHelper 
Bug: 16645584
Change-Id: Ifbcd8c88cda0a390061c162aa43d8615d1311f19
 2014-07-29 18:06:55 +00:00
Jason Monk
c7910af727 am 9e9b5c70: Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 
* commit '9e9b5c70c94ed06e2d6195a3503632b312581c0e':
  Fix incorrect Activity#startLockTask doc
 2014-07-29 18:03:58 +00:00
Chris Craik
aebdd9d0f8 am 2ed17809: am 7c51cf6c: Merge "Fix behavior of stencil clipping within clearLayerRegions" into lmp-dev 
* commit '2ed178092c78c0d0bb707e5e562381f9d31051d4':
  Fix behavior of stencil clipping within clearLayerRegions
 2014-07-29 17:57:15 +00:00
Adam Lesinski
796d2944ac am ddc53009: am cea9bbd5: Ensure the ResTable data is at least the size of a ResTable_header 
* commit 'ddc530095a0de046802273f2f0a901635b3f2311':
  Ensure the ResTable data is at least the size of a ResTable_header
 2014-07-29 17:52:51 +00:00
Chris Craik
655168fe34 am 7c51cf6c: Merge "Fix behavior of stencil clipping within clearLayerRegions" into lmp-dev 
* commit '7c51cf6c819291d01c67137de8233692ce78e3e7':
  Fix behavior of stencil clipping within clearLayerRegions
 2014-07-29 17:52:27 +00:00
Alan Viverette
851e37aa45 am ed3ab956: am 491edeb4: Merge "Don\'t double-cancel the active ripple" into lmp-dev 
* commit 'ed3ab956f7be12bf8b14e2ea6642bc5bbc923f7c':
  Don't double-cancel the active ripple
 2014-07-29 17:48:27 +00:00
Alan Viverette
7f6aa55aca am 31560851: am 936ee391: Merge "Add better errors for unresolved attributes, remove unused code" into lmp-dev 
* commit '31560851016809d38cd20c19a6a20c87b0961d52':
  Add better errors for unresolved attributes, remove unused code
 2014-07-29 17:48:22 +00:00