diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-04-10 21:42:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-10 21:42:23 +0000 |
| commit | 386c4e9ea976377d87950427472a593c22b1b205 (patch) | |
| tree | 603d483f7cbe91a33a73ec680185045f5b5b313a /keystore/tests | |
| parent | 97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f (diff) | |
| parent | 6a5af8cf146aa1fd69449c1138c3e4008ac8b76b (diff) | |
| download | frameworks_base-386c4e9ea976377d87950427472a593c22b1b205.zip frameworks_base-386c4e9ea976377d87950427472a593c22b1b205.tar.gz frameworks_base-386c4e9ea976377d87950427472a593c22b1b205.tar.bz2 | |
Merge "Fix testSaw_ungrantedUid_Bluetooth"
Diffstat (limited to 'keystore/tests')
| -rw-r--r-- | keystore/tests/src/android/security/KeyStoreTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java index 6e3f8be..1a5552a 100644 --- a/keystore/tests/src/android/security/KeyStoreTest.java +++ b/keystore/tests/src/android/security/KeyStoreTest.java @@ -294,14 +294,14 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { public void testSaw_ungrantedUid_Bluetooth() throws Exception { String[] results1 = mKeyStore.saw(TEST_KEYNAME, Process.BLUETOOTH_UID); - assertNull(results1); + assertEquals(0, results1.length); mKeyStore.password(TEST_PASSWD); mKeyStore.put(TEST_KEYNAME1, TEST_KEYVALUE, KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED); mKeyStore.put(TEST_KEYNAME2, TEST_KEYVALUE, KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED); String[] results2 = mKeyStore.saw(TEST_KEYNAME, Process.BLUETOOTH_UID); - assertNull(results2); + assertEquals(0, results2.length); } public void testSaw_grantedUid_Wifi() throws Exception { |