summaryrefslogtreecommitdiffstats
path: root/keystore/tests
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2015-04-10 14:15:01 -0700
committerChad Brubaker <cbrubaker@google.com>2015-04-10 14:15:17 -0700
commit6a5af8cf146aa1fd69449c1138c3e4008ac8b76b (patch)
tree0c720b8a85482bb9f65e39afe6d812e1c072a8ca /keystore/tests
parent08d76a946b898af28f3c8125cdf4966195b718fb (diff)
downloadframeworks_base-6a5af8cf146aa1fd69449c1138c3e4008ac8b76b.zip
frameworks_base-6a5af8cf146aa1fd69449c1138c3e4008ac8b76b.tar.gz
frameworks_base-6a5af8cf146aa1fd69449c1138c3e4008ac8b76b.tar.bz2
Fix testSaw_ungrantedUid_Bluetooth
Keystore.saw returns [] on no result, not null, so the test was incorrectly failing. Change-Id: I22dcf85c5d6c5c0368848bc784c3215c092d9ea8
Diffstat (limited to 'keystore/tests')
-rw-r--r--keystore/tests/src/android/security/KeyStoreTest.java4
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 c9a140c..1487b39 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 {