LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,172 Commits 2 Branches 0 Tags
a95b29a1b468c1412e2627f66ed70c274ee4346c
Commit Graph

13172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
a90de8d3c9 am b13d5c19: am 886fe002: am a0b7965b: Add updated StorageProvider sample, merge _index with existing file. 
* commit 'b13d5c19778f8371c2d4a5ed96deb462fd04984c':
  Add updated StorageProvider sample, merge _index with existing file.
  redirect web overview page to index.html
 2013-11-05 15:53:21 -08:00
Dirk Dougherty
b13d5c1977 am 886fe002: am a0b7965b: Add updated StorageProvider sample, merge _index with existing file. 
* commit '886fe002c08607eb30fcc4089d8ff3b3a5b5b7b2':
  Add updated StorageProvider sample, merge _index with existing file.
  redirect web overview page to index.html
 2013-11-05 15:49:09 -08:00
Scott Main
b6a83cef3d am 16560f1e: resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp 
* commit '16560f1e146c854bb006e22601dbcf6eac798167':
 2013-11-05 15:35:13 -08:00
Scott Main
16560f1e14 resolved conflicts for merge of fae59e8a to klp-dev-plus-aosp 
Change-Id: Iaf15aa6c9087eb0e72661b40acbf74830df0b00c
 2013-11-05 15:28:56 -08:00
Dirk Dougherty
a870f691ab am b4a60146: resolved conflicts for merge of d7f2d1ca to klp-dev-plus-aosp 
* commit 'b4a601467cf0aecbcb25ed166d9a432783252216':
 2013-11-05 14:23:27 -08:00
Dirk Dougherty
eb0d7851a7 am 18dbb0a5: am a2a5de35: resolved conflicts for merge of 3ef2b0f3 to klp-ub-dev 
* commit '18dbb0a52a3f48536b9444228e8b45763ec66632':
 2013-11-05 14:22:27 -08:00
quddusc
6838eb1a77 am 7e3fa615: am 4e4303c9: (-s ours) resolved conflicts for merge of 3943cdc9 to klp-ub-dev 
* commit '7e3fa615c56d017936f105c3dabe997bded76066':
 2013-11-05 14:22:26 -08:00
Dirk Dougherty
b4a601467c resolved conflicts for merge of d7f2d1ca to klp-dev-plus-aosp 
Change-Id: I390a8a3fefa182cc5bed8f356a8a3d1bec50278d
 2013-11-05 13:37:22 -08:00
Dirk Dougherty
886fe002c0 am a0b7965b: Add updated StorageProvider sample, merge _index with existing file. 
* commit 'a0b7965b3a613c9ed47a5ce9d63a92c312840245':
  Add updated StorageProvider sample, merge _index with existing file.
  redirect web overview page to index.html
 2013-11-05 21:30:00 +00:00
Dirk Dougherty
18dbb0a52a am a2a5de35: resolved conflicts for merge of 3ef2b0f3 to klp-ub-dev 
* commit 'a2a5de35c38613e60d0df784c9dcd7f08e6e463e':
 2013-11-05 13:26:33 -08:00
quddusc
7e3fa615c5 am 4e4303c9: (-s ours) resolved conflicts for merge of 3943cdc9 to klp-ub-dev 
* commit '4e4303c993ef50d45e5d6b783d9c127b4d3857b1':
 2013-11-05 13:26:32 -08:00
Scott Main
fae59e8ae1 resolved conflicts for merge of 1d38e9a1 to klp-ub-dev 
Change-Id: I4f74db2ae175c2405aacece146244928f436551c
 2013-11-05 13:15:10 -08:00
Andrew Hsieh
952d826ddd am ff6257f1: am 09b09c99: am d0b6889f: Merge "<pthread.h>: Mark pthread_exit() as __noreturn" 
* commit 'ff6257f11017c4dc185fc0b285f554bc0b7f4e8c':
  <pthread.h>: Mark pthread_exit() as __noreturn
 2013-11-05 13:00:52 -08:00
Andrew Hsieh
483cc1ec0f am fba56b8d: am 3cdd51bb: am db524879: Merge "Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S" 
* commit 'fba56b8d51259835a98bd81259d0115a65cdd530':
  Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S
 2013-11-05 13:00:51 -08:00
Andrew Hsieh
c1f650fd87 am 5c729736: am 361cba62: am ba780a0e: Merge "Refresh API19 include/android/* to android-4.4_r1" 
* commit '5c729736515d01745f24180630262180b42a8d78':
  Refresh API19 include/android/* to android-4.4_r1
 2013-11-05 13:00:50 -08:00
Andrew Hsieh
c62d861644 am 848d28be: am c4ca079b: am c58abb6a: Merge "Rename modules NativeActivity" 
* commit '848d28be9be24c44b8731a1a484d907323b31ce5':
  Rename modules NativeActivity
 2013-11-05 13:00:49 -08:00
Andrew Hsieh
7937a30d38 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 - For a documenta 
* commit '80f34090917ec041c7fbb8b40c735d235b69e681':
  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
 2013-11-05 13:00:48 -08:00
Andrew Hsieh
ff6257f110 am 09b09c99: am d0b6889f: Merge "<pthread.h>: Mark pthread_exit() as __noreturn" 
* commit '09b09c9982c309acbd98504f77c7ad437eb60add':
  <pthread.h>: Mark pthread_exit() as __noreturn
 2013-11-05 10:31:50 -08:00
Andrew Hsieh
fba56b8d51 am 3cdd51bb: am db524879: Merge "Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S" 
* commit '3cdd51bba85c7d48e58b38a901fdf495f308a724':
  Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S
 2013-11-05 10:31:50 -08:00
Andrew Hsieh
5c72973651 am 361cba62: am ba780a0e: Merge "Refresh API19 include/android/* to android-4.4_r1" 
* commit '361cba6265b1a711949f60e72b4e64948d2e8158':
  Refresh API19 include/android/* to android-4.4_r1
 2013-11-05 10:31:49 -08:00
Andrew Hsieh
848d28be9b am c4ca079b: am c58abb6a: Merge "Rename modules NativeActivity" 
* commit 'c4ca079b038cf9f107eef0feadb944844cec9402':
  Rename modules NativeActivity
 2013-11-05 10:31:48 -08:00
Andrew Hsieh
80f3409091 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 - For a documentation, I will 
* commit '6379074e2c30eb586cdf69097ab1400ef55f4660':
  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
 2013-11-05 10:31:46 -08:00
Andrew Hsieh
09b09c9982 am d0b6889f: Merge "<pthread.h>: Mark pthread_exit() as __noreturn" 
* commit 'd0b6889fd111bc8de0c5822f2466a360d9cd8586':
  <pthread.h>: Mark pthread_exit() as __noreturn
 2013-11-05 10:29:54 -08:00
Andrew Hsieh
3cdd51bba8 am db524879: Merge "Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S" 
* commit 'db52487969985a9ade4363375b5741ca38779a00':
  Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S
 2013-11-05 10:29:53 -08:00
Andrew Hsieh
361cba6265 am ba780a0e: Merge "Refresh API19 include/android/* to android-4.4_r1" 
* commit 'ba780a0e47236dd9af4f0ee10a767e3fd325c358':
  Refresh API19 include/android/* to android-4.4_r1
 2013-11-05 10:29:52 -08:00
Andrew Hsieh
c4ca079b03 am c58abb6a: Merge "Rename modules NativeActivity" 
* commit 'c58abb6aa3dfcb526215f307b29688f5e17753b2':
  Rename modules NativeActivity
 2013-11-05 10:29:51 -08:00
Andrew Hsieh
6379074e2c 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 - For a documentation, I will work with doc 
* commit '0aff431479152f690145d8002077ff05a3906ac9':
  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
 2013-11-05 10:29:48 -08:00
Chong Zhang
c1eb23062b Add sample code to customize the MediaRouteControllerDialog 
Bug: 11320487
Change-Id: I365c93173a74e99c63d919d2852690eed174d3b3
 2013-11-05 09:53:24 -08:00
Dirk Dougherty
d7f2d1ca07 resolved conflicts for merge of 2397b75d to klp-ub-dev 
Change-Id: I1807a041af543acb7eb93105712d7f4af4d67521
 2013-11-05 09:21:20 -08:00
Dirk Dougherty
d142dc87c1 am 43ce6bb3: am 99acac3a: Add updated StorageProvider sample, merge _index with existing file. 
* commit '43ce6bb39c4df5dffc7cc6459bf3cc27273f7af0':
  Add updated StorageProvider sample, merge _index with existing file.
 2013-11-04 21:59:12 -08:00
Dirk Dougherty
43ce6bb39c am 99acac3a: Add updated StorageProvider sample, merge _index with existing file. 
* commit '99acac3adb85aecf7dc42ae9242adfa8c8c6dfc0':
  Add updated StorageProvider sample, merge _index with existing file.
 2013-11-04 21:53:22 -08:00
Dirk Dougherty
a2a5de35c3 resolved conflicts for merge of 3ef2b0f3 to klp-ub-dev 
Change-Id: I12241f15975deb12f0183e4fcda1541bc40f66da
 2013-11-04 19:15:29 -08:00
quddusc
4e4303c993 resolved conflicts for merge of 3943cdc9 to klp-ub-dev 2013-11-04 18:47:17 -08:00
Andrew Hsieh
d0b6889fd1 Merge "<pthread.h>: Mark pthread_exit() as __noreturn" 2013-11-05 00:40:09 +00:00
Andrew Hsieh
db52487969 Merge "Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S" 2013-11-05 00:39:50 +00:00
Andrew Hsieh
ba780a0e47 Merge "Refresh API19 include/android/* to android-4.4_r1" 2013-11-05 00:39:37 +00:00
Andrew Hsieh
c58abb6aa3 Merge "Rename modules NativeActivity" 2013-11-05 00:15:51 +00:00
Andrew Hsieh
c0567b54c5 Rename modules NativeActivity 
To TeapotNativeActivity and MoreTeapotsNativeActivity, respectively

Change-Id: Iddbb326ef246232e64a9c30138edb55efe86230d
 2013-11-05 08:12:46 +08:00
Andrew Hsieh
0aff431479 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 - For a documentation, I will work with doc writer for future improvement" 2013-11-05 00:10:30 +00:00
Hak Matsuda
13754d53c3 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

Change-Id: I0055061a4f53b1904cde2e0339550ee277b35fc5

Addressed most of feedbacks,
- Switched coding standard to Chrome style
- Update JNI helper, and documented
- Fixed other issues that is pointed out

Change-Id: Icc729a55ed8dd613759f34a3fc35cb4949d2d205
 2013-11-05 08:09:19 +08:00
Scott Main
6a737d7a32 am cde244d0: am 1d38e9a1: Merge "Updated description for the StorageProvider browseable sample." into klp-docs 
* commit 'cde244d0a61180fa1eab7ac4477a6fe6560e0aad':
  Updated description for the StorageProvider browseable sample.
 2013-11-04 14:13:59 -08:00
Scott Main
cde244d0a6 am 1d38e9a1: Merge "Updated description for the StorageProvider browseable sample." into klp-docs 
* commit '1d38e9a13e5e90e6ec5fe6c3582a9b0472f39867':
  Updated description for the StorageProvider browseable sample.
 2013-11-04 13:54:00 -08:00
quddusc
7ed813af22 am fa2f9d89: Merge "Merge commit \'177a5df9\' into manualmerge2" into klp-dev-plus-aosp 
* commit 'fa2f9d89c60ef41d5728fb73a0466e0d682e014f':
  Fixed broken link in ActivityInstrumentation sample description.
 2013-11-04 09:40:28 -08:00
quddusc
fa2f9d89c6 Merge "Merge commit '177a5df9' into manualmerge2" into klp-dev-plus-aosp 2013-11-04 17:38:36 +00:00
Andrew Hsieh
86c3b43906 Refresh API19 include/android/* to android-4.4_r1 
Change-Id: I9cef03099c68cc0bfeaeedbf8b7d3f1dccc09a50
 2013-11-04 11:13:53 +08:00
Andrew Hsieh
a915811733 Remove obsolete ndk/platforms/android-9/arch-x86/src/__dso_handle*.S 
Superceded by __dso_handle.h

Change-Id: Ic224b8a1ed74a9535ae9f8814f3450cb4f92efb6
 2013-11-04 10:42:21 +08:00
Andrew Hsieh
effaa95815 <pthread.h>: Mark pthread_exit() as __noreturn 
Same fix as https://android-review.googlesource.com/#/c/67540/
Fix for: https://code.google.com/p/android/issues/detail?id=60686

Change-Id: I27b8f1ed71dbb44f3598f7f4551bd881754ef945
 2013-11-04 10:37:50 +08:00
Andrew Hsieh
23b163fdd8 am e3a07da0: am 9dabc24f: am 4abacac3: Merge "Fix prototype of poll" 
* commit 'e3a07da04db34befb689ee78a37d91703597679d':
  Fix prototype of poll
 2013-11-03 17:29:36 -08:00
Andrew Hsieh
e3a07da04d am 9dabc24f: am 4abacac3: Merge "Fix prototype of poll" 
* commit '9dabc24f4117c6e57888b1202845fed8e03c8edb':
  Fix prototype of poll
 2013-11-03 16:58:19 -08:00
Andrew Hsieh
9dabc24f41 am 4abacac3: Merge "Fix prototype of poll" 
* commit '4abacac32dcdc433b83b819ab6e03b958bbfb31c':
  Fix prototype of poll
 2013-11-03 16:53:20 -08:00