Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth"

Browse Source 
* commit '386c4e9ea976377d87950427472a593c22b1b205':
  Fix testSaw_ungrantedUid_Bluetooth
This commit is contained in:
Chad Brubaker
2015-04-10 22:09:18 +00:00
committed by Android Git Automerger
parent 99f4ac1445 386c4e9ea9
commit 3a9779b6ed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/tests/src/android/security/KeyStoreTest.java
View File

@@ -294,14 +294,14 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> {
public void testSaw_ungrantedUid_Bluetooth() throws Exception { public void testSaw_ungrantedUid_Bluetooth() throws Exception {
String[] results1 = mKeyStore.saw(TEST_KEYNAME, Process.BLUETOOTH_UID); String[] results1 = mKeyStore.saw(TEST_KEYNAME, Process.BLUETOOTH_UID);
assertNull(results1); assertEquals(0, results1.length);
mKeyStore.password(TEST_PASSWD); mKeyStore.password(TEST_PASSWD);
mKeyStore.put(TEST_KEYNAME1, TEST_KEYVALUE, KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED); mKeyStore.put(TEST_KEYNAME1, TEST_KEYVALUE, KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
mKeyStore.put(TEST_KEYNAME2, 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); String[] results2 = mKeyStore.saw(TEST_KEYNAME, Process.BLUETOOTH_UID);
assertNull(results2); assertEquals(0, results2.length);
} }
public void testSaw_grantedUid_Wifi() throws Exception { public void testSaw_grantedUid_Wifi() throws Exception {