summaryrefslogtreecommitdiffstats
path: root/services/tests/servicestests
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-09-09 01:42:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-09 01:42:56 +0000
commitf57d98564b26953b722ab0e14222f50e6515f36d (patch)
tree3ef53527b8cb253f0d617088cb1a804c5a54b4de /services/tests/servicestests
parent5536d4477572e437c95111630d5c2723350d99a5 (diff)
parent4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d (diff)
downloadframeworks_base-f57d98564b26953b722ab0e14222f50e6515f36d.zip
frameworks_base-f57d98564b26953b722ab0e14222f50e6515f36d.tar.gz
frameworks_base-f57d98564b26953b722ab0e14222f50e6515f36d.tar.bz2
am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d': Add get_accounts app op
Diffstat (limited to 'services/tests/servicestests')
-rw-r--r--services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java
index 0f20dde..f9aa124 100644
--- a/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java
@@ -82,7 +82,7 @@ public class AccountManagerServiceTest extends AndroidTestCase {
mAms.addAccountExplicitly(a31, "p31", null);
mAms.addAccountExplicitly(a32, "p32", null);
- Account[] accounts = mAms.getAccounts(null);
+ Account[] accounts = mAms.getAccounts(null, mContext.getOpPackageName());
Arrays.sort(accounts, new AccountSorter());
assertEquals(6, accounts.length);
assertEquals(a11, accounts[0]);
@@ -92,7 +92,7 @@ public class AccountManagerServiceTest extends AndroidTestCase {
assertEquals(a22, accounts[4]);
assertEquals(a32, accounts[5]);
- accounts = mAms.getAccounts("type1" );
+ accounts = mAms.getAccounts("type1", mContext.getOpPackageName());
Arrays.sort(accounts, new AccountSorter());
assertEquals(3, accounts.length);
assertEquals(a11, accounts[0]);
@@ -101,7 +101,7 @@ public class AccountManagerServiceTest extends AndroidTestCase {
mAms.removeAccountInternal(a21);
- accounts = mAms.getAccounts("type1" );
+ accounts = mAms.getAccounts("type1", mContext.getOpPackageName());
Arrays.sort(accounts, new AccountSorter());
assertEquals(2, accounts.length);
assertEquals(a11, accounts[0]);