diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-08-24 18:45:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-24 18:45:55 +0000 |
| commit | 37cf9907d201e39ecf8a8de934c44e3eaf04b6db (patch) | |
| tree | 2725375c21bcdb0d179d984d74ec3b28ca84e54d /core/tests | |
| parent | da604cc1ec13cd0c6faf982b6dc9b69163664725 (diff) | |
| parent | 941a8ba1a6043cf84a7bf622e44a0b4f7abd0178 (diff) | |
| download | frameworks_base-37cf9907d201e39ecf8a8de934c44e3eaf04b6db.zip frameworks_base-37cf9907d201e39ecf8a8de934c44e3eaf04b6db.tar.gz frameworks_base-37cf9907d201e39ecf8a8de934c44e3eaf04b6db.tar.bz2 | |
Merge "Installing splits into ASECs!" into lmp-dev
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/content/pm/PackageHelperTests.java | 8 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/os/storage/AsecTests.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/tests/coretests/src/android/content/pm/PackageHelperTests.java b/core/tests/coretests/src/android/content/pm/PackageHelperTests.java index 7ad35d0..06c495e 100644 --- a/core/tests/coretests/src/android/content/pm/PackageHelperTests.java +++ b/core/tests/coretests/src/android/content/pm/PackageHelperTests.java @@ -16,7 +16,7 @@ package android.content.pm; -import com.android.internal.content.PackageHelper; +import static android.net.TrafficStats.MB_IN_BYTES; import android.os.IBinder; import android.os.RemoteException; @@ -25,6 +25,8 @@ import android.os.storage.IMountService; import android.test.AndroidTestCase; import android.util.Log; +import com.android.internal.content.PackageHelper; + public class PackageHelperTests extends AndroidTestCase { private static final boolean localLOGV = true; public static final String TAG = "PackageHelperTests"; @@ -81,8 +83,8 @@ public class PackageHelperTests extends AndroidTestCase { public void testMountAndPullSdCard() { try { fullId = PREFIX; - fullId2 = PackageHelper.createSdDir(1024, fullId, "none", android.os.Process.myUid(), - true); + fullId2 = PackageHelper.createSdDir(1024 * MB_IN_BYTES, fullId, "none", + android.os.Process.myUid(), true); Log.d(TAG,PackageHelper.getSdDir(fullId)); PackageHelper.unMountSdDir(fullId); diff --git a/core/tests/coretests/src/android/os/storage/AsecTests.java b/core/tests/coretests/src/android/os/storage/AsecTests.java index abb8eae..4f724fe 100644 --- a/core/tests/coretests/src/android/os/storage/AsecTests.java +++ b/core/tests/coretests/src/android/os/storage/AsecTests.java @@ -90,7 +90,7 @@ public class AsecTests extends AndroidTestCase { String fullId = SECURE_CONTAINER_PREFIX + localId; IMountService ms = getMs(); - return ms.mountSecureContainer(fullId, key, android.os.Process.myUid()); + return ms.mountSecureContainer(fullId, key, android.os.Process.myUid(), true); } private int renameContainer(String localId1, String localId2) throws Exception { |