Commit Graph

13145 Commits

Author SHA1 Message Date
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
dc952dcb4d am fe06414a: am b09a66d2: am 93de4115: Vault example documents provider.
* commit 'fe06414ae7d574653cca17e8a7453696042ba3bb':
  Vault example documents provider.
2013-11-12 23:49:44 -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
348445884a am 2e544101: am 41ae572f: am aaebba0e: Merge "Add utimensat and futimens to libc.so at API level 12 and 19, respectively"
* commit '2e5441016abd8fd795ad10c529b137df147cb792':
  Add utimensat and futimens to libc.so at API level 12 and 19, respectively
2013-11-12 19:28:55 -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
071913567c am a36818f4: am 0c9bfb30: am 8180be14: Bitmapfun Sample: Minor updates/fixes.
* commit 'a36818f44cee8f06c990429cafad260f5df796ae':
  Bitmapfun Sample: Minor updates/fixes.
2013-11-12 11:57:43 -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
Maurice Chu
7b433ee4e4 Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: Iff895425d4d7b2278641cbe147bd35d0788cadee
2013-11-12 09:37:43 +00:00
Yuhao Zheng
55d16466f6 Merge "Fix UI of testing TDLS in Dev Tools app" 2013-11-11 18:41:58 +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
69805de2c4 am 83270583: am 469e5a18: am 4e5bae34: am 9678ee60: am c1eb2306: Add sample code to customize the MediaRouteControllerDialog
* commit '832705838ae60e1bde93f3309b24c6db18cc9750':
  Add sample code to customize the MediaRouteControllerDialog
2013-11-08 13:38:47 -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
Yuhao Zheng
52245fbc49 Fix UI of testing TDLS in Dev Tools app
The "Stop TDLS" button won't show up on smaller screens such as N4/N5. Fixed
by changing the layout.

Change-Id: I708376468eea5b053a7ed15ec5cebb18393ba235
2013-11-06 16:00:06 -08:00
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