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

Merge "Fix APCT tests"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-08 15:06:53 +00:00
committed by Android (Google) Code Review
parent bbb00da5f3 d5aaa44859
commit 71a24be984
2 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/VerifierDeviceIdentity.java
View File

@@ -19,6 +19,8 @@ package android.content.pm;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.annotations.VisibleForTesting;
import java.io.UnsupportedEncodingException;
import java.security.SecureRandom;
import java.util.Random;
@@ -86,6 +88,7 @@ public class VerifierDeviceIdentity implements Parcelable {
* @return verifier device identity based on the input from the provided
* random number generator
*/
@VisibleForTesting
static VerifierDeviceIdentity generate(Random rng) {
long identity = rng.nextLong();
return new VerifierDeviceIdentity(identity);

32
services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
View File

@@ -294,7 +294,7 @@ public class PackageManagerSettingsTests {
null /*disabledPkg*/,
null /*sharedUser*/,
UPDATED_CODE_PATH /*codePath*/,
null /*resourcePath*/,
UPDATED_CODE_PATH /*resourcePath*/,
null /*legacyNativeLibraryPath*/,
"arm64-v8a" /*primaryCpuAbi*/,
"armeabi" /*secondaryCpuAbi*/,
@@ -328,7 +328,7 @@ public class PackageManagerSettingsTests {
null /*disabledPkg*/,
null /*sharedUser*/,
UPDATED_CODE_PATH /*codePath*/,
null /*resourcePath*/,
UPDATED_CODE_PATH /*resourcePath*/,
null /*legacyNativeLibraryPath*/,
"arm64-v8a" /*primaryCpuAbi*/,
"armeabi" /*secondaryCpuAbi*/,
@@ -561,34 +561,6 @@ public class PackageManagerSettingsTests {
false /*notLaunched*/, false /*stopped*/, true /*installed*/);
}
@Test
public void testInsertPackageSetting() {
final PackageSetting ps = createPackageSetting(0 /*sharedUserId*/, 0 /*pkgFlags*/);
final PackageParser.Package pkg = new PackageParser.Package(PACKAGE_NAME);
pkg.applicationInfo.setCodePath(ps.codePathString);
pkg.applicationInfo.setResourcePath(ps.resourcePathString);
final Context context = InstrumentationRegistry.getContext();
final Object lock = new Object();
PermissionManagerInternal pmInt = PermissionManagerService.create(context, null, lock);
final Settings settings =
new Settings(context.getFilesDir(), pmInt.getPermissionSettings(), lock);
pkg.usesStaticLibraries = new ArrayList<>(
Arrays.asList("foo.bar1", "foo.bar2", "foo.bar3"));
pkg.usesStaticLibrariesVersions = new long[] {2, 4, 6};
settings.insertPackageSettingLPw(ps, pkg);
assertEquals(pkg, ps.pkg);
assertArrayEquals(pkg.usesStaticLibraries.toArray(new String[0]), ps.usesStaticLibraries);
assertArrayEquals(pkg.usesStaticLibrariesVersions, ps.usesStaticLibrariesVersions);
pkg.usesStaticLibraries = null;
pkg.usesStaticLibrariesVersions = null;
settings.insertPackageSettingLPw(ps, pkg);
assertEquals(pkg, ps.pkg);
assertNull("Actual: " + Arrays.toString(ps.usesStaticLibraries), ps.usesStaticLibraries);
assertNull("Actual: " + Arrays.toString(ps.usesStaticLibrariesVersions),
ps.usesStaticLibrariesVersions);
}
private <T> void assertArrayEquals(T[] a, T[] b) {
assertTrue("Expected: " + Arrays.toString(a) + ", actual: " + Arrays.toString(b),
Arrays.equals(a, b));