Commit Graph

9 Commits

Author SHA1 Message Date
Paul Duffin
061c702dae Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: f2d90cc8d8 am: b017d07b78
am: 18c0851a12

Change-Id: I2dead96af0552919fb06c5298a28034121afa2f0
2017-03-03 10:06:33 +00:00
Paul Duffin
3a87d4fea4 Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: I03f7836a1081acda5ed2c6e43cb24e9dc23b944c
2017-03-01 13:21:09 +00:00
Steve McKay
9650440ff2 Disambiguate call to queryChildDocuments.
Test: Build, but tests don't build due to an unrelated error.

Change-Id: I7e3c213c81b4b989cf664a21c87dffa490ebc215
2017-01-10 13:51:30 -08:00
Christopher Ferris
0e2da18081 Fix up the makefiles and some samples.
Add LOCAL_DEX_PREOPT := false to force the samples to build actual apks.

In addition, fix a couple of other small issues:

- TtsEngine didn't have the api level set properly.
- SimpleJNI used a non-ndk library and was using libc++.

Change-Id: I1fd7c187956eed4620049bb746f4d62babcd648a
2016-04-19 14:32:13 -07:00
Ying Wang
88a13aae2f Fix build.
Change-Id: I9a19516c637aff55a133d0a6a98f4ee140001ea1
2014-06-14 10:21:46 -07:00
Jeff Sharkey
7feee23faf Extend Vault with directory selection, renaming.
Bug: 12350110
Change-Id: I41747fdffa79688163c32392ffbeb78320717f92
2014-05-22 09:27:52 -07: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
c21b79e22d Fix build breakage.
Change-Id: I82216379660604eedcd22b22536b385b8aa18c48
2013-11-13 00:24:12 -08: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