diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2015-04-29 02:25:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 02:25:43 +0000 |
| commit | ce9fccc7a67e494b1060e43007345e7091bc20e3 (patch) | |
| tree | 646771ee0e3442a8a3f05ef0ac22ff078487455e /api/current.txt | |
| parent | 4a0ea4233fb7b53c731b8edc850603aa510f4dcb (diff) | |
| parent | e5d4422be51a42c96636ada1807e2422fac6fbd1 (diff) | |
| download | frameworks_base-ce9fccc7a67e494b1060e43007345e7091bc20e3.zip frameworks_base-ce9fccc7a67e494b1060e43007345e7091bc20e3.tar.gz frameworks_base-ce9fccc7a67e494b1060e43007345e7091bc20e3.tar.bz2 | |
am e5d4422b: am c55ab042: am 46fc1101: Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev
* commit 'e5d4422be51a42c96636ada1807e2422fac6fbd1':
Use Default Browser App for IntentResolution when needed
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index abd3117..6bf2393 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9409,6 +9409,7 @@ package android.content.pm { field public static final int GET_SIGNATURES = 64; // 0x40 field public static final int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000 field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800 + field public static final int MATCH_ALL = 131072; // 0x20000 field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000 field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L field public static final int PERMISSION_DENIED = -1; // 0xffffffff |