Commit Graph

13129 Commits

Author SHA1 Message Date
Chet Haase
37c4ea4637 am a1a8337f: am f02d4487: am 9262e703: Merge "Fix ApiDemo for transitions" into klp-dev
* commit 'a1a8337f3a6cdffc73739137c27dc995a8fc15c7':
  Fix ApiDemo for transitions
2014-01-09 21:35:07 +00:00
Adam Koch
94ebdc8faf am b184cdd9: am fb159c79: am 7165109e: Bitmapfun Sample: Cleanup gradle files to import into Studio properly.
* commit 'b184cdd9397bee4ebe9d85825ea09c4766d05aac':
  Bitmapfun Sample: Cleanup gradle files to import into Studio properly.
2014-01-09 21:35:01 +00:00
Chong Zhang
03beab7e95 am 9d0982d5: am 2e2085f4: am 2ec448a2: am 58ef2c38: am fd6d06a1: mrp sample: refactor and use helper class
* commit '9d0982d5aa965d063906f5701e84568b69c857dc':
  mrp sample: refactor and use helper class
2014-01-09 21:34:59 +00:00
Jeff Brown
b133e0e632 am 65f5b5bb: am c683fb4c: am bb1f4a73: am 10f22587: am 6a81c4be: Fix NPE in sample code.
* commit '65f5b5bbda00dfb44b34f4caf6109e37d75ef70c':
  Fix NPE in sample code.
2014-01-09 21:34:53 +00:00
Adam Koch
0ec39f3d80 am c352e57b: am 0d873095: am 933dd8a3: Merge "Bitmapfun Sample: Update for KitKat and clean up some minor bugs." into klp-dev
* commit 'c352e57b56321de7b565981235e7e57b506b48d4':
  Bitmapfun Sample: Update for KitKat and clean up some minor bugs.
2014-01-09 21:34:52 +00:00
Adam Koch
f224cd4cc7 am ad76f956: am 107a3b94: am c246e4a8: Merge "Bitmapfun Sample: Migrate to Android Studio/gradle project." into klp-dev
* commit 'ad76f95624eadca35a19610a572dd20847532326':
  Bitmapfun Sample: Migrate to Android Studio/gradle project.
2014-01-09 21:34:51 +00:00
Ben Cheng
b1d6d2e480 am f85cfcfe: am c888278c: am d4b49c6c: am 8edf8ef6: Merge "Refresh sysroot headers for aarch64."
* commit 'f85cfcfe559777264ab89016a3b7bb0c24acf65d':
  Refresh sysroot headers for aarch64.
2014-01-09 21:34:50 +00:00
Tor Norbye
1163d57b5d am 68370aef: am 03a66dd8: am 30278c6f: Merge "Update the api-version.xml file to reflect KitKat recent changes" into klp-dev
* commit '68370aefea5a0fccfdca6decfb3eb797244cc552':
  Update the api-version.xml file to reflect KitKat recent changes
2014-01-09 21:34:50 +00:00
Santos Cordon
a706c74450 Adding telecomm to classpath and removing old Phone directory
references.

Change-Id: I55a309ae8912cf8cb9e27c9a5ed79cd34353a0a4
2014-01-06 15:00:07 -08:00
Mindy Pereira
8ca83ba6d3 am 279ed15a: am fd2db1be: Merge "Swiperefresh sample" into klp-ub-dev
* commit '279ed15a7f654e358ff572538c160fe7f896be42':
  Swiperefresh sample
2013-11-19 17:28:24 -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
a7e2ef83da am 54ec4ff7: am becd685b: am 4233252a: Sample code for OpenGL Android training class
* commit '54ec4ff7dfa9e8028f9da1986a73bddb1c00be93':
  Sample code for OpenGL Android training class
2013-11-15 12:03:40 -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
e505d7989a am 1785c989: am 7956dc3c: am faab12a0: Merge "Update time.h for CLOCK_BOOTTIME, etc"
* commit '1785c9896296f0e966afe0adf4da21233e636247':
  Update time.h for CLOCK_BOOTTIME, etc
2013-11-14 18:41:57 -08:00
Andrew Hsieh
1b5df5cb94 am 1badc519: am a60db2e7: am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"
* commit '1badc519efb9402583ef18540b21a019cffe2596':
  Added missing clock_settime()/clock_nanosleep() in time.h API>=8
2013-11-14 18:41:56 -08: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
eabf753ff6 am f652b217: am f7ca56e8: am b4b28f87: Only enable VaultProvider on KitKat devices.
* commit 'f652b2178458faaea431bceded58a0656084292c':
  Only enable VaultProvider on KitKat devices.
2013-11-13 18:44:09 -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
Yohann Roussel
a7e22f47af Merge "Move multidex support library" 2013-11-13 15:22:25 +00:00
Jeff Sharkey
3cb41832c3 am f191627b: am 39b80a76: am c21b79e2: Fix build breakage.
* commit 'f191627b9f1b0e5fde1811e86afb9f5616802d75':
  Fix build breakage.
2013-11-13 00:35:01 -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
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