diff options
| author | 2020-11-19 19:49:37 +0000 | |
|---|---|---|
| committer | 2020-11-19 19:49:37 +0000 | |
| commit | 4d24d8c8648213cae14d05518ce39eaa7f56c552 (patch) | |
| tree | eae409d3e0d3502021dfa034e72d5900a14b987d | |
| parent | d23fa9ad75ca169866da219410e585ee272bf507 (diff) | |
| parent | 27eb04a5a3bb6ef9783b17b2e62edeab9fb0a2b2 (diff) | |
Merge "API feedback."
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 821717a195a1..1a5e903fd907 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12333,7 +12333,7 @@ package android.content.pm { field public static final int SIGNATURE_SECOND_NOT_SIGNED = -2; // 0xfffffffe field public static final int SIGNATURE_UNKNOWN_PACKAGE = -4; // 0xfffffffc field public static final int SYNCHRONOUS = 2; // 0x2 - field @Nullable public static final java.util.List<java.security.cert.Certificate> TRUST_ALL; + field @NonNull public static final java.util.List<java.security.cert.Certificate> TRUST_ALL; field @NonNull public static final java.util.List<java.security.cert.Certificate> TRUST_NONE; field public static final int VERIFICATION_ALLOW = 1; // 0x1 field public static final int VERIFICATION_REJECT = -1; // 0xffffffff diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index cc484deeee49..21ee978f4733 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -8124,7 +8124,7 @@ public abstract class PackageManager { * Trust any Installer to provide checksums for the package. * @see #requestChecksums */ - public static final @Nullable List<Certificate> TRUST_ALL = Collections.singletonList(null); + public static final @NonNull List<Certificate> TRUST_ALL = Collections.singletonList(null); /** * Don't trust any Installer to provide checksums for the package. |