diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-11-13 14:30:15 -0800 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2013-11-13 14:33:04 -0800 |
| commit | b4b28f87362f2f910042fceb0ea274d4d98028b7 (patch) | |
| tree | dc864fd7bf1d4f75b82642741c298708bbeddfe7 | |
| parent | c21b79e22d1e9ad2384844fdaa4b0c2b5945e914 (diff) | |
| download | development-b4b28f87362f2f910042fceb0ea274d4d98028b7.tar.gz | |
Only enable VaultProvider on KitKat devices.android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-mr1.1-releasekitkat-mr1-release
Otherwise the app would crash when starting on pre-KK devices missing
the parent class.
Bug: 11670294
Change-Id: I6fc843ba9d525265a4aaad6e8896a3e66d577d1f
| -rw-r--r-- | samples/Vault/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | samples/Vault/res/values-v19/bool.xml | 4 | ||||
| -rw-r--r-- | samples/Vault/res/values/bool.xml | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/samples/Vault/AndroidManifest.xml b/samples/Vault/AndroidManifest.xml index 8f3617231..ded051548 100644 --- a/samples/Vault/AndroidManifest.xml +++ b/samples/Vault/AndroidManifest.xml @@ -10,7 +10,8 @@ android:authorities="com.example.android.vault.provider" android:exported="true" android:grantUriPermissions="true" - android:permission="android.permission.MANAGE_DOCUMENTS"> + android:permission="android.permission.MANAGE_DOCUMENTS" + android:enabled="@bool/isAtLeastKitKat"> <intent-filter> <action android:name="android.content.action.DOCUMENTS_PROVIDER" /> </intent-filter> diff --git a/samples/Vault/res/values-v19/bool.xml b/samples/Vault/res/values-v19/bool.xml new file mode 100644 index 000000000..dfa24e9af --- /dev/null +++ b/samples/Vault/res/values-v19/bool.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <bool name="isAtLeastKitKat">true</bool> +</resources> diff --git a/samples/Vault/res/values/bool.xml b/samples/Vault/res/values/bool.xml new file mode 100644 index 000000000..ed391d9fd --- /dev/null +++ b/samples/Vault/res/values/bool.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <bool name="isAtLeastKitKat">false</bool> +</resources> |