diff options
| author | Jason Chen <jasonchen@google.com> | 2010-09-01 19:16:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 19:16:41 -0700 |
| commit | 9fadca71e455a6c849311083677351d4dc64b792 (patch) | |
| tree | 6451d5bbb7bf41e67aeb2e6efa1fba1d96567caa /core/java | |
| parent | 3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1 (diff) | |
| parent | b766ab830a714c0b79f64265e681f454865ffe65 (diff) | |
| download | frameworks_base-9fadca71e455a6c849311083677351d4dc64b792.zip frameworks_base-9fadca71e455a6c849311083677351d4dc64b792.tar.gz frameworks_base-9fadca71e455a6c849311083677351d4dc64b792.tar.bz2 | |
am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp
* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 4e57a8a..da0c61b 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -1054,6 +1054,7 @@ public class WebSettings { * @deprecated This method is no longer used as plugins are loaded from * their own APK via the system's package manager. */ + @Deprecated public synchronized void setPluginsPath(String pluginsPath) { } @@ -1229,6 +1230,7 @@ public class WebSettings { * @deprecated This method is no longer used as plugins are loaded from * their own APK via the system's package manager. */ + @Deprecated public synchronized String getPluginsPath() { return ""; } |