Commit Graph

12881 Commits

Author SHA1 Message Date
Tor Norbye
d5f35e29eb am 02ab4c2b: am dff82828: Update api-versions.xml for latest API changes
* commit '02ab4c2bcb9810c760759ad2fa81284688e7c0d3':
  Update api-versions.xml for latest API changes
2013-11-20 14:50:30 -08:00
Tor Norbye
02ab4c2bcb am dff82828: Update api-versions.xml for latest API changes
* commit 'dff8282839de40f210d802556194665be79750d1':
  Update api-versions.xml for latest API changes
2013-11-20 14:46:01 -08:00
Tor Norbye
dff8282839 Update api-versions.xml for latest API changes
Change-Id: Id979db34a83da704df38c1250fb946baf928650b
2013-11-20 14:41:01 -08:00
Mindy Pereira
279ed15a7f am fd2db1be: Merge "Swiperefresh sample" into klp-ub-dev
* commit 'fd2db1bef161e8bc7eda014f3924009330a9ab44':
  Swiperefresh sample
2013-11-19 17:26:01 -08:00
Mindy Pereira
fd2db1bef1 Merge "Swiperefresh sample" into klp-ub-dev 2013-11-20 01:23:57 +00:00
Mindy Pereira
18152c7cea Swiperefresh sample
Change-Id: Ifc5736c91e61b592a010bd212752347e141849cc
2013-11-19 17:14:06 -08:00
Joe Fernandez
54ec4ff7df am becd685b: am 4233252a: Sample code for OpenGL Android training class
* commit 'becd685b66f349063f642e2292d21d22d0964ba1':
  Sample code for OpenGL Android training class
2013-11-15 11:59:36 -08:00
Joe Fernandez
becd685b66 am 4233252a: Sample code for OpenGL Android training class
* commit '4233252af95fe9f12c47fdde92ea4718b3334108':
  Sample code for OpenGL Android training class
2013-11-15 19:56:27 +00:00
Joe Fernandez
4233252af9 Sample code for OpenGL Android training class
( Original Id: Ib1650025a3c4b018c60d70ede3f25113660f68d8 )

Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241
(cherry picked from commit 66f6fe6633)
2013-11-15 19:15:57 +00:00
Andrew Hsieh
1785c98962 am 7956dc3c: am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
* commit '7956dc3c87503530696ddd42d3a0f71decb0bcf6':
  Update time.h for CLOCK_BOOTTIME, etc
2013-11-14 18:38:06 -08:00
Andrew Hsieh
1badc519ef am a60db2e7: am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
* commit 'a60db2e71416714964613c53e0b093bc77aa4442':
  Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2013-11-14 18:38:04 -08:00
Andrew Hsieh
7956dc3c87 am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
* commit 'faab12a0586cf4afef6fe2607bcba394c53b1d1d':
  Update time.h for CLOCK_BOOTTIME, etc
2013-11-14 18:33:59 -08:00
Andrew Hsieh
a60db2e714 am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
* commit '69139a5aa58c0b85fc0d0e9763baa3b52a327e29':
  Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2013-11-14 18:33:58 -08:00
Andrew Hsieh
faab12a058 Merge "Update time.h for CLOCK_BOOTTIME, etc" 2013-11-15 02:29:28 +00:00
Andrew Hsieh
69139a5aa5 Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8" 2013-11-15 02:29:14 +00:00
Andrew Hsieh
a2e8997b9f Update time.h for CLOCK_BOOTTIME, etc
Add CLOCK_MONOTONIC_RAW, CLOCK_REALTIME_COARSE, CLOCK_MONOTONIC_COARSE,
CLOCK_BOOTTIME, CLOCK_REALTIME_ALARM, and CLOCK_BOOTTIME_ALARM

Remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR

See:
0351955a686fe4e0bf9f30780f78ff0e2402a6b0
b928bda83d4413b703329f607e2706602f15293f
60e5144ca312b210b54ac8e6966108da0c97ff80

Change-Id: Ibc9e297ab71f3dc16eec0746f835f89e554fd68b
2013-11-14 12:14:12 +08:00
Andrew Hsieh
cd3fe9b4b2 Added missing clock_settime()/clock_nanosleep() in time.h API>=8
See patch for API < 8 at 7761beeb56.

Change-Id: I906172a34645e2659a5b9f8acb2652a4b4eb857d
2013-11-14 11:57:04 +08:00
Jeff Sharkey
f652b21784 am f7ca56e8: am b4b28f87: Only enable VaultProvider on KitKat devices.
* commit 'f7ca56e83df39502b603ecdaa4ca12fd0afef733':
  Only enable VaultProvider on KitKat devices.
2013-11-13 14:51:57 -08:00
Jeff Sharkey
f7ca56e83d am b4b28f87: Only enable VaultProvider on KitKat devices.
* commit 'b4b28f87362f2f910042fceb0ea274d4d98028b7':
  Only enable VaultProvider on KitKat devices.
2013-11-13 14:48:21 -08:00
Jeff Sharkey
b4b28f8736 Only enable VaultProvider on KitKat devices.
Otherwise the app would crash when starting on pre-KK devices missing
the parent class.

Bug: 11670294
Change-Id: I6fc843ba9d525265a4aaad6e8896a3e66d577d1f
2013-11-13 14:33:04 -08:00
Jeff Sharkey
f191627b9f am 39b80a76: am c21b79e2: Fix build breakage.
* commit '39b80a765cda05173bc04af8f3d9ebda6e8b98a0':
  Fix build breakage.
2013-11-13 00:32:55 -08:00
Jeff Sharkey
39b80a765c am c21b79e2: Fix build breakage.
* commit 'c21b79e22d1e9ad2384844fdaa4b0c2b5945e914':
  Fix build breakage.
2013-11-13 00:29:39 -08:00
Jeff Sharkey
c21b79e22d Fix build breakage.
Change-Id: I82216379660604eedcd22b22536b385b8aa18c48
2013-11-13 00:24:12 -08:00
Jeff Sharkey
fe06414ae7 am b09a66d2: am 93de4115: Vault example documents provider.
* commit 'b09a66d28e21fc019ea0a88fa57ce5f3c54e710a':
  Vault example documents provider.
2013-11-12 23:45:33 -08:00
Jeff Sharkey
b09a66d28e am 93de4115: Vault example documents provider.
* commit '93de41153819ff3e64f5e6cc8ec0fabd529503eb':
  Vault example documents provider.
2013-11-12 23:41:38 -08:00
Andrew Hsieh
2e5441016a am 41ae572f: am aaebba0e: Merge "Add utimensat and futimens to libc.so at API level 12 and 19, respectively"
* commit '41ae572f9d9e40aea58f90205e8d29894b3f0a97':
  Add utimensat and futimens to libc.so at API level 12 and 19, respectively
2013-11-12 16:52:53 -08:00
Andrew Hsieh
41ae572f9d am aaebba0e: Merge "Add utimensat and futimens to libc.so at API level 12 and 19, respectively"
* commit 'aaebba0e9e564c8b50286bfef6e2ee3e8f2535be':
  Add utimensat and futimens to libc.so at API level 12 and 19, respectively
2013-11-12 16:50:38 -08:00
Andrew Hsieh
aaebba0e9e Merge "Add utimensat and futimens to libc.so at API level 12 and 19, respectively" 2013-11-13 00:47:23 +00:00
Jeff Sharkey
93de411538 Vault example documents provider.
Example provider that encrypts both metadata and contents of
documents stored inside.  It shows advanced usage of new storage
access APIs and hardware-backed key chain.

Change-Id: I2cdf4e949be8471c3d8b4f45ec0681c9248ea09c
2013-11-12 16:00:23 -08:00
Adam Koch
a36818f44c am 0c9bfb30: am 8180be14: Bitmapfun Sample: Minor updates/fixes.
* commit '0c9bfb3099ec507505665130c17e277d6edfb6ef':
  Bitmapfun Sample: Minor updates/fixes.
2013-11-12 11:53:55 -08:00
Adam Koch
0c9bfb3099 am 8180be14: Bitmapfun Sample: Minor updates/fixes.
* commit '8180be1421028c4f4d4d837c4f9a59205701d1fe':
  Bitmapfun Sample: Minor updates/fixes.
2013-11-12 19:49:53 +00:00
Andrew Hsieh
7e967a1ca4 Add utimensat and futimens to libc.so at API level 12 and 19, respectively
See ae2d5ba31412c4f382ef405000baa866f35dd736 and
d0be7c8f9a06b3ca8ea7647ea35c8f9dc63f0fe1.

Internal BUG 11590144

Change-Id: I76119cd20fdb205728482e682fd1206d1305881d
2013-11-11 14:50:50 +08:00
Chong Zhang
832705838a am 469e5a18: am 4e5bae34: am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit '469e5a18f8bca5d883937356e0787c3485558335':
  Add sample code to customize the MediaRouteControllerDialog
2013-11-08 13:35:50 -08:00
Chong Zhang
469e5a18f8 am 4e5bae34: am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit '4e5bae34615f1d8ed933e060dd8f0349a3a209be':
  Add sample code to customize the MediaRouteControllerDialog
2013-11-08 13:05:45 -08:00
Chong Zhang
4e5bae3461 am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit '9678ee604ba5bfe1810b5773b1739af5919e7249':
  Add sample code to customize the MediaRouteControllerDialog
2013-11-08 13:02:18 -08:00
Chong Zhang
9678ee604b am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit 'c1eb23062b8ef62942666d00d6565cbf02f842f0':
  Add sample code to customize the MediaRouteControllerDialog
2013-11-08 12:59:41 -08:00
Adam Koch
8180be1421 Bitmapfun Sample: Minor updates/fixes.
Change-Id: I71dce2fdbe41ff67cc0aac9456d72d9aa7cb8318
2013-11-07 22:01:16 +00: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
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
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
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