diff options
| author | Richard Coles <torne@google.com> | 2015-07-07 10:15:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 10:15:17 +0000 |
| commit | fad2e49c425e2cae88c297cb6cf2ac42e5f6fdd8 (patch) | |
| tree | 8dc217a6d9699a587a379d6494946e3bdad8f3be /api | |
| parent | 5a81b61e879d7f6031c28d0d89d4b785654d2a00 (diff) | |
| parent | 8965377b699cebf37f150b8c97e1f594eadf4895 (diff) | |
| download | frameworks_base-fad2e49c425e2cae88c297cb6cf2ac42e5f6fdd8.zip frameworks_base-fad2e49c425e2cae88c297cb6cf2ac42e5f6fdd8.tar.gz frameworks_base-fad2e49c425e2cae88c297cb6cf2ac42e5f6fdd8.tar.bz2 | |
Merge "Add WebView permission MIDI sysex" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index b52675a..27e6ad1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -38705,6 +38705,7 @@ package android.webkit { method public abstract java.lang.String[] getResources(); method public abstract void grant(java.lang.String[]); field public static final java.lang.String RESOURCE_AUDIO_CAPTURE = "android.webkit.resource.AUDIO_CAPTURE"; + field public static final java.lang.String RESOURCE_MIDI_SYSEX = "android.webkit.resource.MIDI_SYSEX"; field public static final java.lang.String RESOURCE_PROTECTED_MEDIA_ID = "android.webkit.resource.PROTECTED_MEDIA_ID"; field public static final java.lang.String RESOURCE_VIDEO_CAPTURE = "android.webkit.resource.VIDEO_CAPTURE"; } diff --git a/api/system-current.txt b/api/system-current.txt index 85b05c2..c1b6205 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -41052,6 +41052,7 @@ package android.webkit { method public abstract java.lang.String[] getResources(); method public abstract void grant(java.lang.String[]); field public static final java.lang.String RESOURCE_AUDIO_CAPTURE = "android.webkit.resource.AUDIO_CAPTURE"; + field public static final java.lang.String RESOURCE_MIDI_SYSEX = "android.webkit.resource.MIDI_SYSEX"; field public static final java.lang.String RESOURCE_PROTECTED_MEDIA_ID = "android.webkit.resource.PROTECTED_MEDIA_ID"; field public static final java.lang.String RESOURCE_VIDEO_CAPTURE = "android.webkit.resource.VIDEO_CAPTURE"; } |