Andy Hung
17b6a3137e
Handle IOException from MediaCodec factory methods
...
Bug: 1136427
Change-Id: I411a341b551454ee3bd1215e3c6f5572d1555675
Signed-off-by: Andy Hung <hunga@google.com >
2014-01-16 14:02:05 -08:00
Yuhao Zheng
12f62196c5
Add opt/net/wifi/service to eclipse .classpath
...
bug: 12175455
Change-Id: I49df46a1b87822d6cae87b5ed716040e3b6803b7
2014-01-16 10:27:25 -08:00
Andrew Hsieh
a131dee497
am 0f69afed: am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit '0f69afedc212d49a4141a953302f1a165c1316c8':
Fix headers to be inclued alone
2014-01-16 17:17:30 +00:00
Andrew Hsieh
be13dbd7b8
am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit 'de53375f23faa38684ca6045067a2e797760f655':
Fix typo in comments in looper.h
2014-01-16 17:17:29 +00:00
Andrew Hsieh
470ec2be44
am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '0423f030642f78d0e107b3c43b75b0ff11fc2e3e':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:17:28 +00:00
Andrew Hsieh
0f69afedc2
am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit 'b14ac43dbd37c9519b339a99468b1d4a38ec2ce4':
Fix headers to be inclued alone
2014-01-16 17:14:39 +00:00
Andrew Hsieh
de53375f23
am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit 'f991c5478e8d82e1aa76c1c0a5f813cd5716e171':
Fix typo in comments in looper.h
2014-01-16 17:14:38 +00:00
Andrew Hsieh
0423f03064
am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '28c9c34d8670266add371e9f0f33e4da52a024f4':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:14:37 +00:00
Andrew Hsieh
b14ac43dbd
am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit 'ca34e29d94056bfc20b6b9ea8b36b41763acfe61':
Fix headers to be inclued alone
2014-01-16 09:09:58 -08:00
Andrew Hsieh
f991c5478e
am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit '42bb3bcadc1611efa2632e83eb5d094f60b82263':
Fix typo in comments in looper.h
2014-01-16 09:09:57 -08:00
Andrew Hsieh
28c9c34d86
am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '6d2d58de54169cd2cae9dbf3f69bd52af87daae5':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 09:09:56 -08:00
Andrew Hsieh
ca34e29d94
Merge "Fix headers to be inclued alone"
2014-01-16 17:03:03 +00:00
Andrew Hsieh
42bb3bcadc
Merge "Fix typo in comments in looper.h"
2014-01-16 17:02:47 +00:00
Andrew Hsieh
6d2d58de54
Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
2014-01-16 17:02:36 +00:00
Amith Yamasani
a7244cfc93
am 52cf96e9: Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
...
* commit '52cf96e9aa650ff50a0a25924e81bec35be56c4f':
Update eclipse classpath due to change in directory structure
2014-01-15 22:08:57 +00:00
Amith Yamasani
52cf96e9aa
Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
2014-01-15 22:06:55 +00:00
Andrew Hsieh
2c8776805a
Fix headers to be inclued alone
...
See b.android.com/64679 for one of header sys/prctl.h
Change-Id: Ie415ebe2086d2f0190d84fba0c57cc7e1e5822ae
2014-01-13 12:58:46 +08:00
Andrew Hsieh
bee62e6e92
am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '926d852a5b838f0faa632839c31c4274e93cf200':
Implement wait4 already exist in header
2014-01-10 01:54:30 +00:00
Andrew Hsieh
926d852a5b
am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '1c9e736166ee6d00962360d1a41a840862346562':
Implement wait4 already exist in header
2014-01-10 00:41:31 +00:00
Andrew Hsieh
1c9e736166
am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '3517e742e3df5a61e622204dbb8d4110b5bad3ac':
Implement wait4 already exist in header
2014-01-09 16:36:48 -08:00
Andrew Hsieh
3517e742e3
Merge "Implement wait4 already exist in header"
2014-01-10 00:31:50 +00:00
Kenny Root
9af437320b
am 5cd6376a: am a163fa90: am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation support"
...
* commit '5cd6376aed4d2bb3e2cf86126dee4778b136d7f8':
make_key: add EC key generation support
2014-01-09 21:36:32 +00:00
Alexander Lucas
0c1c0fbb53
am 5a0ab971: am b40c1571: am 3a85c6d5: am 98a13468: Updating samples browser to include ActionBarCompat samples
...
* commit '5a0ab97113b36574fe2492121029db53c8cde9eb':
Updating samples browser to include ActionBarCompat samples
2014-01-09 21:36:31 +00:00
Ben Cheng
8fbafca9f1
am ad593476: am 23604216: am 45d19989: am 4b60b014: Merge "Switch to use elfutils 0.153"
...
* commit 'ad593476a8674ff86d85512eab1c98828be2313b':
Switch to use elfutils 0.153
2014-01-09 21:36:30 +00:00
Andrew Hsieh
26d323195b
am 79b01661: am 6763bf82: am 3053834f: am c044b5e3: Merge "- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6"
...
* commit '79b016614d60fb39023a8fb1467b64d78935a272':
- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
2014-01-09 21:36:29 +00:00
Elliott Hughes
ba5eec0601
am 5bb6cf6e: am 03e0781e: am f067a933: am 1f1e7379: Merge "MIPS hasn\'t supported SA_RESTORER since 2.5 kernels."
...
* commit '5bb6cf6e07bd4d806bcdf073ccad73d87d7e7f00':
MIPS hasn't supported SA_RESTORER since 2.5 kernels.
2014-01-09 21:36:28 +00:00
Alexander Lucas
77da8dbc93
am a4571dc3: am 607b0da6: am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
...
* commit 'a4571dc35148b03ec65e2d5f1e49ee0bece85898':
Updating sdk.atree to reflect new set of samples
2014-01-09 21:36:27 +00:00
Tor Norbye
1c99b5a3f4
am 9eb0faea: am d5f35e29: am 02ab4c2b: am dff82828: Update api-versions.xml for latest API changes
...
* commit '9eb0faeae843290b1c0df39ee8e7a8e6b1be3b9f':
Update api-versions.xml for latest API changes
2014-01-09 21:36:25 +00:00
Mindy Pereira
0c0fe6f7c3
am 8ca83ba6: am 279ed15a: am fd2db1be: Merge "Swiperefresh sample" into klp-ub-dev
...
* commit '8ca83ba6d383f4d7fcd3c3c5a06d87ef4f16252d':
Swiperefresh sample
2014-01-09 21:36:24 +00:00
Joe Fernandez
22dfabd6ae
am a7e2ef83: am 54ec4ff7: am becd685b: am 4233252a: Sample code for OpenGL Android training class
...
* commit 'a7e2ef83dad1db44dd029cf57e16161e4e5d83ce':
Sample code for OpenGL Android training class
2014-01-09 21:36:23 +00:00
Andrew Hsieh
0ddf7b0c50
am e505d798: am 1785c989: am 7956dc3c: am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
...
* commit 'e505d7989a5d903fac1be7be4dc6aa044f097e47':
Update time.h for CLOCK_BOOTTIME, etc
2014-01-09 21:36:22 +00:00
Andrew Hsieh
f4fae60750
am 1b5df5cb: am 1badc519: am a60db2e7: am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
...
* commit '1b5df5cb9476c6e9797f759619d9839640507793':
Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2014-01-09 21:36:20 +00:00
Jeff Sharkey
5dcb36d430
am eabf753f: am f652b217: am f7ca56e8: am b4b28f87: Only enable VaultProvider on KitKat devices.
...
* commit 'eabf753ff63fa1098a0fb354c0acf800b980cfbc':
Only enable VaultProvider on KitKat devices.
2014-01-09 21:36:19 +00:00
Yohann Roussel
f91d20cb3f
am a7e22f47: Merge "Move multidex support library"
...
* commit 'a7e22f47af38aa4096381c4f4043d8124e2ac205':
Move multidex support library
2014-01-09 21:36:18 +00:00
Jeff Sharkey
587373601a
am 3cb41832: am f191627b: am 39b80a76: am c21b79e2: Fix build breakage.
...
* commit '3cb41832c384f00c1efbc4943e0479d5921a0d68':
Fix build breakage.
2014-01-09 21:36:17 +00:00
Jeff Sharkey
29c3b907a9
am dc952dcb: am fe06414a: am b09a66d2: am 93de4115: Vault example documents provider.
...
* commit 'dc952dcb4d0e1ca878caa3954393aa4fa6084159':
Vault example documents provider.
2014-01-09 21:36:16 +00:00
Andrew Hsieh
0d803d2547
am 34844588: am 2e544101: am 41ae572f: am aaebba0e: Merge "Add utimensat and futimens to libc.so at API level 12 and 19, respectively"
...
* commit '348445884a90afdb0779c7d91f36b463dfbcc0c6':
Add utimensat and futimens to libc.so at API level 12 and 19, respectively
2014-01-09 21:36:15 +00:00
Adam Koch
0b54845a00
am 07191356: am a36818f4: am 0c9bfb30: am 8180be14: Bitmapfun Sample: Minor updates/fixes.
...
* commit '071913567ccbce44565c8cf65c3b18276a2757c7':
Bitmapfun Sample: Minor updates/fixes.
2014-01-09 21:36:14 +00:00
Yuhao Zheng
29f88c6f4c
am 55d16466: Merge "Fix UI of testing TDLS in Dev Tools app"
...
* commit '55d16466f60bcb7aac3cd345f54f6c8ff33ecadd':
Fix UI of testing TDLS in Dev Tools app
2014-01-09 21:36:12 +00:00
Chong Zhang
58ee3fedbb
am 69805de2: am 83270583: am 469e5a18: am 4e5bae34: am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
...
* commit '69805de2c4fa4a2a6615225c938132ce8bb89810':
Add sample code to customize the MediaRouteControllerDialog
2014-01-09 21:36:11 +00:00
Dirk Dougherty
89517bdc40
am a90de8d3: am b13d5c19: am 886fe002: am a0b7965b: Add updated StorageProvider sample, merge _index with existing file.
...
* commit 'a90de8d3c9171cf0b2339b556610aa3b37ccdaf7':
Add updated StorageProvider sample, merge _index with existing file.
redirect web overview page to index.html
2014-01-09 21:36:10 +00:00
Scott Main
f6e5dd3eee
am b6a83cef: am 16560f1e: resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp
...
* commit 'b6a83cef3dde89c0617d9395368dce48e582497e':
2014-01-09 21:36:09 +00:00
Dirk Dougherty
aec7112c40
am a870f691: am b4a60146: resolved conflicts for merge of d7f2d1ca to klp-dev-plus-aosp
...
* commit 'a870f691abc3cd6348cec08b457448f2c38391f2':
2014-01-09 21:36:08 +00:00
Dirk Dougherty
5511f63317
am eb0d7851: am 18dbb0a5: am a2a5de35: resolved conflicts for merge of 3ef2b0f3 to klp-ub-dev
...
* commit 'eb0d7851a7ac6d4346d621e61208393bdc11e100':
2014-01-09 21:36:07 +00:00
quddusc
16d9571455
am 6838eb1a: am 7e3fa615: am 4e4303c9: (-s ours) resolved conflicts for merge of 3943cdc9 to klp-ub-dev
...
* commit '6838eb1a7714d266b60d4779229882a42853705b':
2014-01-09 21:36:05 +00:00
Andrew Hsieh
2d4790beee
am 952d826d: am ff6257f1: am 09b09c99: am d0b6889f: Merge "<pthread.h>: Mark pthread_exit() as __noreturn"
...
* commit '952d826ddd8731e8be71d37663d013c4166e4467':
<pthread.h>: Mark pthread_exit() as __noreturn
2014-01-09 21:36:04 +00:00
Andrew Hsieh
42c43b9b0d
am 483cc1ec: am fba56b8d: am 3cdd51bb: am db524879: Merge "Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S"
...
* commit '483cc1ec0f6123a4ad0e869ff464d8779c6faa1c':
Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S
2014-01-09 21:36:03 +00:00
Andrew Hsieh
2e97275699
am c1f650fd: am 5c729736: am 361cba62: am ba780a0e: Merge "Refresh API19 include/android/* to android-4.4_r1"
...
* commit 'c1f650fd87bb351a2e6365594a02cdad7023e16e':
Refresh API19 include/android/* to android-4.4_r1
2014-01-09 21:36:02 +00:00
Andrew Hsieh
d74da72607
am c62d8616: am 848d28be: am c4ca079b: am c58abb6a: Merge "Rename modules NativeActivity"
...
* commit 'c62d8616449afe8d4e1a38b1df8de8b0ff2ab9d5':
Rename modules NativeActivity
2014-01-09 21:36:01 +00:00
Andrew Hsieh
6337adee0e
am 7937a30d: am 80f34090: am 6379074e: am 0aff4314: Merge "Addressed feedbacks - Now they are in ndkHelper:: name space - Changed module name to ndk_helper - Changed some static members to class var or stand alone function - Added syncronization for JNIHelper.cpp - Fo
...
* commit '7937a30d38388ab74b9cc37214641980993cfbf0':
Addressed feedbacks - Now they are in ndkHelper:: name space - Changed module name to ndk_helper - Changed some static members to class var or stand alone function - Added syncronization for JNIHelper.cpp - For a documentation, I will work with doc writer for future improvement
2014-01-09 21:36:00 +00:00