Commit Graph

13607 Commits

Author SHA1 Message Date
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
Andrew Hsieh
4abacac32d Merge "Fix prototype of poll" 2013-11-04 00:30:46 +00:00
quddusc
2d7d363fa1 Merge commit '177a5df9' into manualmerge2
Conflicts:
	samples/browseable/ActivityInstrumentation/_index.jd

Change-Id: I7fd9bf69af0bc1450462952f2e250d1776a0b8db
2013-11-02 13:42:43 -07:00
Dirk Dougherty
5969d205e6 am 5e90c148: Merge commit \'2397b75d\' into manualmerge
* commit '5e90c1485a5efe55502884a9f63994914ac19fac':
  Fix broken javadoc reference.
2013-11-01 19:44:48 -07:00
Dirk Dougherty
5e90c1485a Merge commit '2397b75d' into manualmerge
Conflicts:
	samples/browseable/TextLinkify/_index.jd

Change-Id: I2b64b72766d8543e238461f74c7bd4a1959a9e37
2013-11-01 19:38:11 -07:00
Dirk Dougherty
35da2acf9c am 9b903167: am 3ef2b0f3: Add StorageProvider sample code to browseables.
* commit '9b903167a08ae700247e69f4c0701082d1150291':
  Add StorageProvider sample code to browseables.
2013-11-01 19:22:25 -07:00
quddusc
0f2ebe84da am 60737e95: Merge commit \'3943cdc9\' into manualmerge2
* commit '60737e950718d02f206a9da5928299e28df4e382':
  Updated browsable sample descriptions.
2013-11-01 19:22:24 -07:00
Dirk Dougherty
9b903167a0 am 3ef2b0f3: Add StorageProvider sample code to browseables.
* commit '3ef2b0f3711df9249ea48ac9cd4b08e663d45f18':
  Add StorageProvider sample code to browseables.
2013-11-01 19:20:18 -07:00
quddusc
60737e9507 Merge commit '3943cdc9' into manualmerge2
Conflicts:
	samples/browseable/ActivityInstrumentation/_index.jd
	samples/browseable/TextLinkify/_index.jd

Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12
2013-11-01 19:17:20 -07:00
Dirk Dougherty
a0b7965b3a Add updated StorageProvider sample, merge _index with existing file.
Change-Id: I63d691929d2b30cedaafa5ede900670c59d4f83d
(cherry picked from commit 99acac3adb)
2013-11-01 23:53:24 +00:00
Dirk Dougherty
99acac3adb Add updated StorageProvider sample, merge _index with existing file.
Change-Id: I63d691929d2b30cedaafa5ede900670c59d4f83d
2013-11-01 15:10:11 -07:00
Scott Main
cbf0e9141b Merge "redirect web overview page to index.html" into klp-docs 2013-11-01 21:49:12 +00:00
Scott Main
f84f063448 redirect web overview page to index.html
Change-Id: I2ea6709ab8754ff055c16a1c93314350343bc441
2013-11-01 11:35:13 -07:00
Elliott Hughes
356cdcbd27 am f99585bd: am ff11bce0: am 07bdc2b8: Merge "Fix build."
* commit 'f99585bddd07da98a018e70e29bad55e2204e6ea':
  Fix build.
2013-10-31 22:32:46 -07:00
Elliott Hughes
f99585bddd am ff11bce0: am 07bdc2b8: Merge "Fix build."
* commit 'ff11bce0978d56ce571454d16084028df4106e13':
  Fix build.
2013-10-31 21:29:06 -07:00
Elliott Hughes
ff11bce097 am 07bdc2b8: Merge "Fix build."
* commit '07bdc2b8e6980173ca9e8070803dcaad042e52c2':
  Fix build.
2013-10-31 21:26:13 -07:00
Elliott Hughes
07bdc2b8e6 Merge "Fix build." 2013-11-01 04:24:08 +00:00