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

113980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
ef5b1a05a0 am 36317eac: Merge "Stress test for AudioTrack shared memory bug" into klp-dev 
* commit '36317eac4b8d9d2b34b2fb71d81bf17cec1872ca':
  Stress test for AudioTrack shared memory bug
 2013-09-16 11:28:07 -07:00
Zhijun He
e468820757 am 78a1de65: Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev 
* commit '78a1de651968fc67f43fc881bc8ff5ac3ff380c9':
  Camera2: Add MAX_CAMERAS_IN_USE error case handling
 2013-09-16 11:24:30 -07:00
Glenn Kasten
6b2b845948 Merge "Miscellaneous fixes to SoundPool unit test" into klp-dev 2013-09-16 18:24:13 +00:00
Glenn Kasten
36317eac4b Merge "Stress test for AudioTrack shared memory bug" into klp-dev 2013-09-16 18:23:54 +00:00
Joe Fernandez
5e3b1b36c7 am 2e10f974: am e8311187: am da304484: am a1e59983: am 27ab2172: Merge "docs: SDK / ADT 22.2 Release Notes" into jb-mr2-docs 
* commit '2e10f974b93033c8e500ae36b74417a5ade39ac2':
  docs: SDK / ADT 22.2 Release Notes
 2013-09-16 11:23:38 -07:00
Joe Fernandez
7988feb09c am 5f9ff73f: am f47b13d4: am 7bacc72c: am 90bb0cf7: am 385179b2: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-docs 
* commit '5f9ff73fc842e6f8429f4f89a79bc95a98373a74':
  Update RenderScript docs to include Support Library APIs
 2013-09-16 11:23:35 -07:00
Zhijun He
78a1de6519 Merge "Camera2: Add MAX_CAMERAS_IN_USE error case handling" into klp-dev 2013-09-16 18:21:17 +00:00
Joe Fernandez
2e10f974b9 am e8311187: am da304484: am a1e59983: am 27ab2172: Merge "docs: SDK / ADT 22.2 Release Notes" into jb-mr2-docs 
* commit 'e8311187c343e2c546e9284f576d9d66d3780270':
  docs: SDK / ADT 22.2 Release Notes
 2013-09-16 11:21:02 -07:00
Joe Fernandez
5f9ff73fc8 am f47b13d4: am 7bacc72c: am 90bb0cf7: am 385179b2: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-docs 
* commit 'f47b13d4bedf46db1e96ef8540ce121b930d0de7':
  Update RenderScript docs to include Support Library APIs
 2013-09-16 11:20:59 -07:00
Joe Fernandez
e8311187c3 am da304484: am a1e59983: am 27ab2172: Merge "docs: SDK / ADT 22.2 Release Notes" into jb-mr2-docs 
* commit 'da304484a14062703284596d50f33df28fe66cc4':
  docs: SDK / ADT 22.2 Release Notes
 2013-09-16 11:18:51 -07:00
Joe Fernandez
9bd08fa6d3 am af7dda33: am d3e7723a: am 2793a3b3: am d82b567c: am 881a4b82: Support Library 18.1 Release Notes 
* commit 'af7dda3376fa1dd402e16df00cb2afea1ed6c9db':
  Support Library 18.1 Release Notes
 2013-09-16 11:16:32 -07:00
Joe Fernandez
da304484a1 am a1e59983: am 27ab2172: Merge "docs: SDK / ADT 22.2 Release Notes" into jb-mr2-docs 
* commit 'a1e59983ef6e1f6b0a1c8e65b439e80846f8b662':
  docs: SDK / ADT 22.2 Release Notes
 2013-09-16 11:15:37 -07:00
Joe Fernandez
f47b13d4be am 7bacc72c: am 90bb0cf7: am 385179b2: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-docs 
* commit '7bacc72c748249926ee0d4733d194ff712aacddb':
  Update RenderScript docs to include Support Library APIs
 2013-09-16 11:15:22 -07:00
Joe Fernandez
af7dda3376 am d3e7723a: am 2793a3b3: am d82b567c: am 881a4b82: Support Library 18.1 Release Notes 
* commit 'd3e7723a1ed95601f6c4f6f964d62b8c5d9d0fec':
  Support Library 18.1 Release Notes
 2013-09-16 11:14:04 -07:00
Joe Fernandez
a1e59983ef am 27ab2172: Merge "docs: SDK / ADT 22.2 Release Notes" into jb-mr2-docs 
* commit '27ab217212a663e22133cdd2a72ef27bdf5f778c':
  docs: SDK / ADT 22.2 Release Notes
 2013-09-16 11:13:08 -07:00
Chet Haase
f6e1e8e037 am fe11c5d8: am 978a455d: Merge "Plug leaks in transitions" into klp-dev 
* commit 'fe11c5d8cd02897b5156460c9a7ae6578cad1fc6':
  Plug leaks in transitions
 2013-09-16 11:13:01 -07:00
Joe Fernandez
7bacc72c74 am 90bb0cf7: am 385179b2: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-docs 
* commit '90bb0cf7680874a5332fd5f063b54e7f65ef2cea':
  Update RenderScript docs to include Support Library APIs
 2013-09-16 11:12:05 -07:00
Joe Fernandez
27ab217212 Merge "docs: SDK / ADT 22.2 Release Notes" into jb-mr2-docs 2013-09-16 18:10:55 +00:00
Chet Haase
fe11c5d8cd am 978a455d: Merge "Plug leaks in transitions" into klp-dev 
* commit '978a455d665c6bccdc900eeadc72bb652a2ea294':
  Plug leaks in transitions
 2013-09-16 11:10:34 -07:00
Joe Fernandez
90bb0cf768 am 385179b2: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-docs 
* commit '385179b2811e95833066dfdb801e963e43229b97':
  Update RenderScript docs to include Support Library APIs
 2013-09-16 11:09:40 -07:00
Joe Fernandez
d3e7723a1e am 2793a3b3: am d82b567c: am 881a4b82: Support Library 18.1 Release Notes 
* commit '2793a3b3fdb24a1fe5f28076a6f8a5f17bc3b0c3':
  Support Library 18.1 Release Notes
 2013-09-16 11:08:47 -07:00
Joe Fernandez
385179b281 Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-docs 2013-09-16 18:07:19 +00:00
Joe Fernandez
2793a3b3fd am d82b567c: am 881a4b82: Support Library 18.1 Release Notes 
* commit 'd82b567c718dafdcd3477cb3da8f729bd64859cc':
  Support Library 18.1 Release Notes
 2013-09-16 11:06:33 -07:00
Chet Haase
978a455d66 Merge "Plug leaks in transitions" into klp-dev 2013-09-16 18:05:43 +00:00
Joe Fernandez
d82b567c71 am 881a4b82: Support Library 18.1 Release Notes 
* commit '881a4b8235160884b9fc7aa9a6c6b13be5567aa4':
  Support Library 18.1 Release Notes
 2013-09-16 11:05:12 -07:00
Michael Jurka
8da63ce295 am 303392de: am 1199a37a: Merge "Catch ActivityNotFoundException in Recents" into klp-dev 
* commit '303392de0ed32e6387c9796c04a4c6bb77f00935':
  Catch ActivityNotFoundException in Recents
 2013-09-16 11:00:51 -07:00
Michael Jurka
303392de0e am 1199a37a: Merge "Catch ActivityNotFoundException in Recents" into klp-dev 
* commit '1199a37a038d28753396a08ff60de2491bb6a20d':
  Catch ActivityNotFoundException in Recents
 2013-09-16 10:58:35 -07:00
John Spurlock
41c1e359c6 Fix recent SystemUI dump crash. 
If only string format specification errors were compilation errors...

Bug:10781286
Change-Id: I2843a805f6bba35f9cddcbfe7e551d3f0248e789
 2013-09-16 13:57:13 -04:00
Michael Jurka
1199a37a03 Merge "Catch ActivityNotFoundException in Recents" into klp-dev 2013-09-16 17:56:28 +00:00
Michael Jurka
4e85f46c1c Catch ActivityNotFoundException in Recents 
Bug: 8633151
 2013-09-16 19:52:21 +02:00
Leon Scroggins III
5387aa5029 am 3b8a7a04: am b693ef60: Merge "Do not allocate so much memory on the stack." into klp-dev 
* commit '3b8a7a0402fbc2cb34e59a5757b8134c8bdadedc':
  Do not allocate so much memory on the stack.
 2013-09-16 10:45:01 -07:00
Leon Scroggins III
3b8a7a0402 am b693ef60: Merge "Do not allocate so much memory on the stack." into klp-dev 
* commit 'b693ef60ef27538402d941702ab652a57f585158':
  Do not allocate so much memory on the stack.
 2013-09-16 10:41:40 -07:00
Zhijun He
6f4fcfe4f5 am 1a6e17e8: am 869f44cc: Merge "ImageReader: get correct crop size" into klp-dev 
* commit '1a6e17e80ae4e27b2135259aeca29e889f12872d':
  ImageReader: get correct crop size
 2013-09-16 10:41:30 -07:00
Zhijun He
1a6e17e80a am 869f44cc: Merge "ImageReader: get correct crop size" into klp-dev 
* commit '869f44cc320ecd3301c032dcdc21f243f7c3e8ec':
  ImageReader: get correct crop size
 2013-09-16 10:38:13 -07:00
Martijn Coenen
0754cb7586 am 1f8d7f61: am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev 
* commit '1f8d7f61c07faa7ad566fe2329dcf7923f6221d0':
  Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
 2013-09-16 10:37:45 -07:00
Joe Fernandez
04367272b5 am 3d6bc7b0: am fef978f3: am 9919088b: am c2260830: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-ub-dev 
* commit '3d6bc7b083f83f928ec8469b9c8869b6d189c504':
  Update RenderScript docs to include Support Library APIs
 2013-09-16 10:37:41 -07:00
Leon Scroggins III
b693ef60ef Merge "Do not allocate so much memory on the stack." into klp-dev 2013-09-16 17:36:58 +00:00
Martijn Coenen
1f8d7f61c0 am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev 
* commit '370b593c37569ddad8286a47e3772bfe3cdb9c9b':
  Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
 2013-09-16 10:34:35 -07:00
Joe Fernandez
3d6bc7b083 am fef978f3: am 9919088b: am c2260830: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-ub-dev 
* commit 'fef978f389e36becb32f7d9a0dc1ce546b50d845':
  Update RenderScript docs to include Support Library APIs
 2013-09-16 10:34:32 -07:00
Zhijun He
869f44cc32 Merge "ImageReader: get correct crop size" into klp-dev 2013-09-16 17:33:36 +00:00
Martijn Coenen
370b593c37 Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev 2013-09-16 17:31:40 +00:00
Joe Fernandez
fef978f389 am 9919088b: am c2260830: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-ub-dev 
* commit '9919088b943f4fc7800d2c0307182f905bb248e4':
  Update RenderScript docs to include Support Library APIs
 2013-09-16 10:31:06 -07:00
Joe Fernandez
8259e500c1 am 426f6759: am 095d2c61: am 4a8ade3b: am 1f7cee21: Merge "Support Library 18.1 Release Notes" into jb-mr2-ub-dev 
* commit '426f67594d76bc16af2c358eed4edd468646eca7':
  Support Library 18.1 Release Notes
 2013-09-16 10:29:52 -07:00
Joe Fernandez
9919088b94 am c2260830: Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-ub-dev 
* commit 'c2260830f092152067eac18634b5f4001bf13298':
  Update RenderScript docs to include Support Library APIs
 2013-09-16 10:29:06 -07:00
Joe Fernandez
881a4b8235 Support Library 18.1 Release Notes 
adding release notes for v8 support library containing RenderScript

Change-Id: I12d48c26e6b99cacfb8f36750c3f1ce80da5ef23
(cherry picked from commit 75026c547fd00600572c9c4b471ecc9512ab1b17)
 2013-09-16 17:28:26 +00:00
Joe Fernandez
0edad69ab4 Update RenderScript docs to include Support Library APIs 
Added new section to explain how to access the Support Library
RenderScript APIs in Eclipse.

Change-Id: Ife6e25bcc7b91c39bb399d1ace624e106a3f38bc
(cherry picked from commit f82b04d4ecb9450afc8a3679e7178bfa4ca782b8)
 2013-09-16 17:27:08 +00:00
Joe Fernandez
c2260830f0 Merge "Update RenderScript docs to include Support Library APIs" into jb-mr2-ub-dev 2013-09-16 17:26:31 +00:00
Joe Fernandez
426f67594d am 095d2c61: am 4a8ade3b: am 1f7cee21: Merge "Support Library 18.1 Release Notes" into jb-mr2-ub-dev 
* commit '095d2c61ed5ea5226709b32729fb8c76036b91af':
  Support Library 18.1 Release Notes
 2013-09-16 10:24:30 -07:00
Joe Fernandez
095d2c61ed am 4a8ade3b: am 1f7cee21: Merge "Support Library 18.1 Release Notes" into jb-mr2-ub-dev 
* commit '4a8ade3b85b606c5d3c582bdc4eb06051bce7283':
  Support Library 18.1 Release Notes
 2013-09-16 10:21:14 -07:00
Kenny Root
dbbe56c1b3 Merge "Add comment header for API 20 in public.xml" 2013-09-16 17:19:28 +00:00