summaryrefslogtreecommitdiffstats
path: root/android
Commit message (Collapse)AuthorAgeFilesLines
* Properly clean an exception to prevent a crashSelim Gurun2012-04-271-0/+5
| | | | | Bug: 6404408 Change-Id: Id9a6e1ff303076da24f0221d3bc905ba0710f07e
* Part of fix for bug 5455901 Export symbols in android/Kristian Monsen2011-10-213-3/+6
| | | | | | | | Exporting needed symbols from Android specific code. Used NET_EXPORT for net code and BASE_API for other code. Change-Id: Ief7426180eec993bbe894e7231b224dcac657c7b
* Fix for bug 5105584Kristian Monsen2011-08-032-5/+8
| | | | | | Check for JavaVM pointer being null before using it Change-Id: I8fe404eaf716893dc88375c69383033a25277569
* Part of fix for 5065047: build libchromium as a shared libKristian Monsen2011-07-288-47/+97
| | | | | | | | | Linking chromium_net as a static lib. Needed to update the jni to be handled internally instead of using the one from webkit it got linked with. Change-Id: Ia717a29afa879be39835d22faacb6c4810728b53
* Preparation for fixing bug 5065047: build libchromium as a shared libKristian Monsen2011-07-281-1/+0
| | | | | | Use FormField from chromium instead of Android. Change-Id: I63565da382ea5dd10e7aed57a5a0f47293d160a0
* Query the platform for the Autofill server URL.Ben Murdoch2011-07-212-0/+44
| | | | | | | | | | The URL to use to make autofill requests is now configured by the platform. Add a JNI call to retrieve it. See also frameworks/base change I0aa85c5bef834b1120baaabdc2dd2e4e607a63b6 Bug: 4515820 Change-Id: I3a22ae42402f52207eee2d0d9df64700cb7c9f45
* Implement AutofillCountry::ApplicationLocale() on Android.Ben Murdoch2011-07-132-0/+17
| | | | | | | Call JNI to determine the current locale for the system. Bug: 4959752 Change-Id: I6429239356842175599f1f458c77226b933a8c26
* Update Autofill L10N string IDs.Ben Murdoch2011-07-121-17/+13
| | | | | | | | | The DIALOG_* IDs now have entries java side, and CREDIT_CARD_PREVIEW_FORMAT is not actually used on Android. See also change I829b5d24e6f9a04211ee91c3f670c8659c004cd9 Change-Id: Ib861245e26197938bb2c5cf0f99c1d797ab0fbf2
* Merge Chromium at r12.0.742.93: All autofill fixesKristian Monsen2011-07-082-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URLRequestContextGetter moved to net and the net namespace, http://codereview.chromium.org/6778025: profile_android.cc profile_android.h autofill_download.cc Files moved from base/ to base/memory, http://codereview.chromium.org/6714032: profile_android.h New functions in profile.h: http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/profiles/profile.h?view=diff&pathrev=88489&r1=78300&r2=78301 http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/profiles/profile.h?view=diff&pathrev=88489&r1=81769&r2=81770 profile_android.h autofill_country.cc: Removed code where we had local changes: http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_country.cc?r1=77402&r2=77780&pathrev=88489 AutoFill -> Autofill renaming: autofill_download.cc autofill_manager.cc autofill_manager.h personal_data_manager.cc credit_card.cc Method with local change removed upstream, part of the removed code added to an existing method. http://codereview.chromium.org/6690038 autofill_manager.cc Using TabContentsWrapper: http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_manager.cc?view=diff&pathrev=88489&r1=79171&r2=79172 OnShowAutofillDialog is ifdef out by Android, so taking upstream. IsAutofillEnabled, Android has just ifdef return true, so taking upstream. Change-Id: I87bfd814592aaed074d00716df355fba7be3984d
* Merge Chromium at r12.0.742.93: Compile fix in url_constants.ccKristian Monsen2011-07-082-0/+83
| | | | | | | | | | | Part of file was moved to content, added it to the Android/content directory. I guess we have to think about syncing content if we do more merges. Upstream CL: http://codereview.chromium.org/6874038 Change-Id: I4ac909bbfcf67c4d5db7eac236d6c9027bd3691d
* Merge Chromium at r12.0.742.93: New autofill stringsKristian Monsen2011-07-081-13/+14
| | | | | | https://android-git.corp.google.com/g/#change,119876 Change-Id: I9738fe2c78da45492eeb74fb813d6e887363e591
* Merge Chromium at r12.0.742.93: Compile fixes from moving ↵Kristian Monsen2011-07-083-4/+4
| | | | | | | url_request_context_getter Change-Id: I9daca7590633f466d3066e359a3bb8c6d29d6d19 http://codereview.chromium.org/6778025
* Merge Chromium at r11.0.696.0: New autofill stringsKristian Monsen2011-06-301-1/+20
| | | | | | | | | | | Added upstream in CLs: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_resources.grd?r1=71089&r2=75368&pathrev=77261 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_resources.grd?r1=75368&r2=77166&pathrev=77261 Related frameworks/base change: https://android-git.corp.google.com/g/#change,118057 Change-Id: I49cbc1fb3ee9279ce8f23cba01dc51e5cf41c738
* Merge Chromium at r11.0.696.0: Adding Android tab_contents.h and ↵Kristian Monsen2011-06-302-0/+74
| | | | | | | | | | | | tab_contents_observer.h These were completly forked anyway. These files were moved to a new top level chromium directory, content. We are only using these two files from that directory. Putting these two in android/content and not importing all other files from content. Change-Id: I38a10232100a9ea14911c2818794291040301da7
* Merge Chromium at r11.0.696.0: Compile fix in profile_android.hKristian Monsen2011-06-301-1/+11
| | | | | | | | | | | | | | | | | | | | | | New functions added to profile.h GetExtensionSpecialStoragePolicy(): http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=76125&r2=76126 GetProtocolHandlerRegistry(): InitRegisteredProtocolHandlers(): http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=75680&r2=75681 GetPolicyConnector(): http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=75731&r2=75732 InitPromoResources(): http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=75402&r2=75403 prerendermanager: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=74936&r2=74937 Change-Id: I2956ac8ea00ab9b1b3572bb11ae0ffdb1eeae642
* Merge "Remove code to detect if we have the private autofill header"Ben Murdoch2011-06-152-83/+0
|\
| * Remove code to detect if we have the private autofill headerBen Murdoch2011-06-162-83/+0
| | | | | | | | | | | | | | This is no longer required after the merge to 11.0.672.0 as the URL to make autofill requests to is now open source. Change-Id: Id5d7b4d7d3b7371846d6896c26a76d61ca059a16
* | Removing all prefs usage for Android in autofillKristian Monsen2011-06-151-4/+1
|/ | | | | | | | | | We do not use any of the functionality that is removed with #ifdef's. Will remove local changes in the prefs files in a later CL. Change-Id: I242f785ecf7618206d9f890aa4e78d4d09482a24
* Merge Chromium at r11.0.672.0: Compile fix in profile_android.hKristian Monsen2011-06-141-1/+8
| | | | | | | | | | | | | | | | Changed return type, so new forward declaration needed: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?r1=74432&r2=74786&pathrev=74924 New function GetExtensionIOEventRouter: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=74924&r1=73343&r2=73344 New function GetOffTheRecordPrefs: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=74924&r1=73804&r2=73805 New function GetChromeURLDataManager: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=74924&r1=74431&r2=74432 Change-Id: I684259037b36fcd07cf2635ecc123e21bf1321c7
* Merge Chromium at r11.0.672.0: Compile fix in ↵Kristian Monsen2011-06-142-4/+4
| | | | | | | | | android_url_request_context_getter.* Typedef removed in this CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924 Change-Id: I3ed7374ea725269edd68eae7094e74df37ce7be3
* Merge Chromium at r11.0.672.0: Compile fix in url_fetcher_proxy.hKristian Monsen2011-06-141-2/+2
| | | | | | | Typedef removed in: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_status.h?r1=70592&r2=71285&pathrev=74924 Change-Id: I2819b8a476bec59dc8c99d75efa81eb4351bf9b2
* Merge Chromium at r11.0.672.0: Files moved upstreamKristian Monsen2011-06-142-1/+1
| | | | | | | Files moved upstream, didn't find a good codereview, but this will do: http://src.chromium.org/viewvc/chrome/trunk/src/ui/base/l10n/l10n_util.h?view=log&pathrev=74924#rev72227 Change-Id: I0267206e0fcfc5bb05235c2a4e64c8fc00d2f9a3
* Merge bd61185cb9da2edfd394e469f2db9291cbfaf238Jean-Baptiste Queru2011-05-311-1/+3
|\ | | | | | | Change-Id: Iba8f33b2c2dc3c77a2872c9eb2297757167c8cb7
| * Fix build. Switch to a new way of spoofing prctl.Jean-Baptiste Queru2011-05-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code so far relied on using a different definition from the bionic one, so there was no conflict. However bionic changed to move to the same definition, which caused a conflict at the C++ level. This uses the preprocessor to eliminate the conflict, by first including the headers that would be afected by the preprocessor trick and then redefining the function in question with the preprocessor. None of the call sites rely on side effects of evaluating parameters to prctl, so it's OK to have the preprocessor swallow them. Change-Id: Id33ec44d4faf0e50f4dcea4b3c073f6318e3bba5
* | Merge Chromium at 10.0.634.0: Fix link errorsKristian Monsen2011-05-252-3/+20
| | | | | | | | | | | | | | | | Several files are now including execinfo.h, just declaring the functions in the header and implementing them in execinfo.cc. Change-Id: Id566e12b8068ea2dfacdb9fbf4eff6d2efd617b7
* | Merge Chromium at 10.0.634.0: Fix conflict and compile from thread.h moveKristian Monsen2011-05-252-2/+2
| | | | | | | | | | | | | | thread.h was moved in this CL: http://codereview.chromium.org/6028009 Change-Id: I19110c2c356d07b3e3bd5256161bec45c21c057f
* | Merge Chromium at 10.0.634.0: Fix conflicts in autofillKristian Monsen2011-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | Catching up with our autofill cherry-picks: http://codereview.chromium.org/6026010 A new constant IDS_AUTOFILL_FAX_RE was introduced: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/fax_field.cc?view=diff&pathrev=70875&r1=70709&r2=70710 Change-Id: I5db292e315044aa9a72de5caf39350e654aa1626
* | Merge Chromium at 10.0.621.0: Fix linker errorKristian Monsen2011-05-201-0/+10
| | | | | | | | | | | | | | Add the profile constructor here so we don't have to compile the whole file. Change-Id: If8df058eba89c3d1fdb3815ca3a141f8c5fa2c4e
* | Merge Chromium at 10.0.621.0: profile.h moved upstreamKristian Monsen2011-05-201-1/+1
| | | | | | | | | | | | | | profile.h has moved upstream http://codereview.chromium.org/5606002 Change-Id: Ib1652546f185ff862a39ebb3e77c9678c78dbaac
* | Merge Chromium at 10.0.621.0: Compile fix for profile_android.hKristian Monsen2011-05-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | New method in profile.h, GetPrerenderManager: http://codereview.chromium.org/6503008 New method in profile.h, GetExtensionService: http://codereview.chromium.org/5730004 New return type for GetFileSystemContext: http://codereview.chromium.org/6471018 Change-Id: I45be184acc46ccb120c47084907d080f7b8879ba
* | Merge Chromium at 10.0.621.0: Compile fix, CreateUserPrefService removed ↵Kristian Monsen2011-05-201-1/+1
|/ | | | | | | | | upstream. Function removed in CL: http://codereview.chromium.org/5646003 Change-Id: I0debd2e098e06282543e11ca2d6f9f79e287472a
* Remove native localised strings cache.Ben Murdoch2011-02-281-6/+0
| | | | | | | | | We now cache these strings java side using WeakReferences. See frameworks/base change: Ibedcaab5ee781699b41b5c03aae866d1d82bb570 Change-Id: Icff9e31e70ac93ef1519c4ecf1258b5addb3f625
* Localise autofill regular expressionsBen Murdoch2011-02-281-1/+37
| | | | | | | | | | | | | | Improve the AutoFill experience on non-English pages by reading localised regular expressions from Java instead of using hard-coded English ones. This is essentially a cherry pick of Chromium CL: http://codereview.chromium.org/6026010/ Requires a change in frameworks/base, see: I9c0544e67bf0333abcb9ea607855ff92f69bff8e Change-Id: Ie927514cae7b7390c5a291dfae4dcfe3782bb5b7
* Do not cache the JNIEnv pointer.Ben Murdoch2011-02-281-19/+20
| | | | | | | JNIEnv pointers are per thread and now that we want to read localised strings from Java, we may call this code from different threads. Change-Id: Ifc3596487334a3c8c52687dd1929f3a0300fbccd
* Fix for bug 3360824, warning when opening tabKristian Monsen2011-01-251-2/+3
| | | | | | Not creating a new android network library if another already exists Change-Id: I91547cca84b91b1cbdd14b701c468fcb5bcd852f
* Merge "Use current thread's JNIEnv." into honeycombShimeng (Simon) Wang2011-01-141-2/+7
|\
| * Use current thread's JNIEnv.Shimeng (Simon) Wang2011-01-131-2/+7
| | | | | | | | | | | | | | | | Use current thread's JNIEnv instead of stale one during c++ destruction phase. issue: 3351191 Change-Id: Iffde3de965974ecdfe6e0284ca2ab5af6f89c8aa
* | Renamed JavaInputStreamWrapper to JavaISWrapperKristian Monsen2011-01-142-6/+6
|/ | | | | | | | The linker confused this class with another class in WebKit with the same name. This caused a crash in the CTS tests. Change-Id: I6fbdd105d24d27496ae8c26a7028c0f9e19bb485
* Uploads for content uri'sKristian Monsen2011-01-132-0/+91
| | | | | | | | | | Looking for content:// uri when doing file uploads. If it is a content file, use the android jni methods instead of file operations. Fix for bug 2862096 Change-Id: Ice5047e85878aadc17c0994186dc7aa74ca63322
* Merge Chromium at 9.0.597.55: Add missing Profile stubs.Ben Murdoch2011-01-111-0/+8
| | | | | | | See http://src.chromium.org/viewvc/chrome?view=rev&revision=66948 and http://src.chromium.org/viewvc/chrome?view=rev&revision=67261 Change-Id: I6f9cdd1c4ee084fd3675fca612bba7007c1d076c
* Fix crash in AutoFillBen Murdoch2010-12-205-32/+18
| | | | | | | | | | | | | | | | We recently changed WebKit to use one URLRequestContext per WebView. However AutoFill did not get migrated to the new system and so we have observed crashes due to a dangling pointer. We have one AutoFill object per WebView and hence one Profile object per webview. we access the URLRequestContext through the Profile so inject the correct context in when the AutoFill object is created. Needs a change in external/webkit, see Iace23ae8c0240f0134894c12d2f7281161aa6150 Bug: 3291654 Change-Id: I004ab7ac9c6a72be1b62aa8e44322b97a371c136
* Update Chromium to use timegm()Steve Block2010-12-071-12/+0
| | | | | | | | | | | This is now available in bionic. See https://android-git.corp.google.com/g/83410 This change is largely a revert of https://android-git.corp.google.com/g/77645 Bug: 3156155 Change-Id: I8c2bd6967c8660bca1bdd6c46965f5334bb07058
* Merge Chromium at r66597: Stub new Profile methods on AndroidBen Murdoch2010-12-031-2/+4
| | | | | | | | http://src.chromium.org/viewvc/chrome?view=rev&revision=65506 http://src.chromium.org/viewvc/chrome?view=rev&revision=65690 http://src.chromium.org/viewvc/chrome?view=rev&revision=66187 Change-Id: I8e1ed0a22166fa99f6b66a897c44ecce9d6a00e5
* Provide a URLRequestContext directly to AutoFill, rather than a factory functionSteve Block2010-11-302-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | In b/3044989, AutoFill was modified to take a factory function for the URLRequestContext (which was then created when needed), rather than taking the context directly. This was to avoid a race condition where the context is created before the required storage paths have been synced to the WebCore thread through the BrowserFrame. Since https://android-git.corp.google.com/g/76579 and https://android-git.corp.google.com/g/80056, we read the required paths directly from JniUtils, so the race condition no longer exists. We can therefore provide the context directly to AutoFill. Note that while the context may be created before the Settings have been synced to the WebCore thread, the necessary properties will be updated as part of this sync before the context is used. This change will also simplify things when we use one context per WebView. Also requires a change in external/webkit ... https://android-git.corp.google.com/g/82145 Bug: 3044989 Change-Id: Ie5bf6722783f80e8204f7bedf2cd3334ebb6109f
* Fix bug in URLFetcherProxyBen Murdoch2010-11-221-2/+3
| | | | | | | | | | The url() function only returns a valid URL once a response has been received as it represents the final URL that was connected to after any redirects. It's therefore not correct to use it in the DoStart method of URLFetcherProxy. Instead, cache the url that gets passed into the URLFetcherProxy and use that. Change-Id: I509f5bc490362b45c5814fc7b1bc57168903b17b
* Merge Chromium at r65505: OpenSSL supportBen Murdoch2010-11-194-0/+201
| | | | | | | | Import OpenSSL support and tweak for our Chromium port (JNI functions). See https://chromereview.prom.corp.google.com/2010002/ Change-Id: Ia081dd3b1eae5ec05ebb96b66b682f039bfa1b81
* Merge Chromium at r65505: Add new Profile functions to ProfileAndroidBen Murdoch2010-11-191-4/+10
| | | | | | | | | | | | | Add a bunch of new functions with empty implementations to our Profile implementation. Also update the use of Extension type to incorporate const. http://src.chromium.org/viewvc/chrome?view=rev&revision=64988 http://src.chromium.org/viewvc/chrome?view=rev&revision=64517 http://src.chromium.org/viewvc/chrome?view=rev&revision=64072 http://src.chromium.org/viewvc/chrome?view=rev&revision=63717 Change-Id: I959c361575686ccee2f311360289a0d824412ef7
* Merge Chromium at r65505: GetIOMessageLoopProxy now constBen Murdoch2010-11-192-3/+3
| | | | | | http://src.chromium.org/viewvc/chrome?view=rev&revision=63574 Change-Id: I7e81d58e8d3476c135d45610de6a615bf1eee667
* Fix crash in AutoFillBen Murdoch2010-11-182-1/+39
| | | | | | | | | | | It is possible that the AutoFillManager has been deleted before the URLFetcherProxy::DoComplete callback runs. In this case, we will crash. Store the pending callback in a map and remove it if the URLFetcherProxy gets deleted. Bug: 3197857 Change-Id: I63821a06ff91953426a84a00f80d0ad4c553be3d
* Revert "Merge Chromium at r63472 : Workaround for compiler bug."Iain Merrick2010-11-091-147/+0
| | | | | | | | This reverts commit 2d2498eb555b4096a63a64dc6afcf2c95ec19f4d. No longer needed because a compiler fix has been pushed. Bug: 3164732
generated by cgit v1.1 at 2024-12-22 09:37:45 +0000