summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0Steve Kondik2016-03-1010-36/+10
|\ | | | | | | | | | | https://android.googlesource.com/platform/frameworks/webview into cm-13.0 Android 6.0.1 release 22
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-260-0/+0
| |\ | | | | | | | | | | | | | | | | | | am: 7102c3675f -s ours * commit '7102c3675f5058706dbf1cc62b23c014b167b75e': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-10-261-1/+1
| | | | | | | | | | | | | | | Change-Id: I321460befaa0bc076b4225814e6d68c900678a33 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEGeoff Mendal2015-10-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | am: bb3e2d9b51 -s ours * commit 'bb3e2d9b5128e9b21290a7b63df0c6c49291957f': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-10-219-10/+23
| | | | | | | | | | | | | | | Change-Id: I277ca2ed07fb5786a38156ef165b632698664127 Auto-generated-cl: translation import
| * | Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: ↵Qiwen Zhao2015-10-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a082f08797 am: f5deeec57f am: b8de50cfea * commit 'b8de50cfea6364a1cddac50b987c9cda40f53dbb': (120 commits) Revert "Implement stub functions" Implement stub functions Add version code support for mips64. Import translations. DO NOT MERGE Fix remaining references to hidden fields. Track move of android.net.http.ErrorStrings. Fix WebView targetSDK checks. Add support for SmartClip interface in the glue layer. [WebView] Start building against the System SDK. [WebView] Remove direct dependencies on hidden APIs. [WebView] Remove unused method in CookieManager Add support for SmartClip interface in the glue layer. [WebView] Remove dependencies on DebugFlags. [WebView] Remove dependency on Build.IS_DEBUGGABLE. Import translations. DO NOT MERGE Revert "Wrap one more Context" [WebView] Remove dependency on FileUtils. Always add the path to the WebView assets. Always add the path to the WebView assets. Remove DRP manager code ...
| | * Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08797Qiwen Zhao2015-10-200-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f5deeec57f * commit 'f5deeec57f4caaca1478dafa567c7d13df1cfa17': (120 commits) Revert "Implement stub functions" Implement stub functions Add version code support for mips64. Import translations. DO NOT MERGE Fix remaining references to hidden fields. Track move of android.net.http.ErrorStrings. Fix WebView targetSDK checks. Add support for SmartClip interface in the glue layer. [WebView] Start building against the System SDK. [WebView] Remove direct dependencies on hidden APIs. [WebView] Remove unused method in CookieManager Add support for SmartClip interface in the glue layer. [WebView] Remove dependencies on DebugFlags. [WebView] Remove dependency on Build.IS_DEBUGGABLE. Import translations. DO NOT MERGE Revert "Wrap one more Context" [WebView] Remove dependency on FileUtils. Always add the path to the WebView assets. Always add the path to the WebView assets. Remove DRP manager code ...
| | | * Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-devQiwen Zhao2015-10-200-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a082f08797 * commit 'a082f08797d44164d1c735b4f0a9d4f94b1d1410': (120 commits) Revert "Implement stub functions" Implement stub functions Add version code support for mips64. Import translations. DO NOT MERGE Fix remaining references to hidden fields. Track move of android.net.http.ErrorStrings. Fix WebView targetSDK checks. Add support for SmartClip interface in the glue layer. [WebView] Start building against the System SDK. [WebView] Remove direct dependencies on hidden APIs. [WebView] Remove unused method in CookieManager Add support for SmartClip interface in the glue layer. [WebView] Remove dependencies on DebugFlags. [WebView] Remove dependency on Build.IS_DEBUGGABLE. Import translations. DO NOT MERGE Revert "Wrap one more Context" [WebView] Remove dependency on FileUtils. Always add the path to the WebView assets. Always add the path to the WebView assets. Remove DRP manager code ...
| | | | * Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into mnc-devQiwen Zhao2015-10-190-0/+0
| | | | |\
| | | | | * am 12399ba4: Fix WebView targetSDK checks.Ben Murdoch2015-05-202-6/+15
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '12399ba4bb12154b7897cf88bee04aca0adeb770': Fix WebView targetSDK checks.
| | | | | | * Fix WebView targetSDK checks.Ben Murdoch2014-11-172-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 4.4W SDK bump between K and L means that apps running on L that are compiled with targetSDK 20 are picking up some features only intended to be enabled on L devices, due to erroneous target SDK checks that didn't take 4.4W into account. Bug: 18385629 Change-Id: Ia7996e948f9902c535e9f7fa7dea5b05db0a1aa0
| | | | | * | am 446ce2c2: (-s ours) Add support for SmartClip interface in the glue layer.Ben Murdoch2015-04-260-0/+0
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '446ce2c24d3a1670de478701ea970ceba323e543': Add support for SmartClip interface in the glue layer.
| | | | | | * | Add support for SmartClip interface in the glue layer.Ben Murdoch2014-11-042-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18222974 Change-Id: Ie39d49e9dfe90f20b6eb5d28009313781eac8e01
| | | | | * | | am ddbcc035: (-s ours) Always add the path to the WebView assets.Ben Murdoch2015-04-260-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddbcc0351201dc71b48252573b37da33deba1a83': Always add the path to the WebView assets.
| | | | | | * | Always add the path to the WebView assets.Ben Murdoch2014-10-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18133926 Change-Id: I33ae4101fd6865df057e365b6f33aef0ef9fd272
| | | | | * | | am 2b22e3a2: Merge "Add version code support for mips64."Richard Coles2015-03-121-0/+3
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b22e3a20269b871c3450bc578e423465ee5d044': Add version code support for mips64.
| | | | | | * \ \ Merge "Add version code support for mips64."Richard Coles2015-03-121-0/+3
| | | | | | |\ \ \
| | | | | | | * | | Add version code support for mips64.Douglas Leung2015-02-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b71bdd83c105f9b45456b449ac91e3af0c57378
| | | | | * | | | | am f2e74977: am 4a38c0de: Merge "Revert "Implement stub functions""Selim Gurun2015-03-031-12/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2e74977bdd1ff2ba1837282c3adfcf1cc62fe13': Revert "Implement stub functions"
| | | | | | * | | | am 4a38c0de: Merge "Revert "Implement stub functions""Selim Gurun2015-03-031-12/+0
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a38c0de3e68830dfe918c938c93f64bded0bfd2': Revert "Implement stub functions"
| | | | | | | * \ \ \ Merge "Revert "Implement stub functions""Selim Gurun2015-03-031-12/+0
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Revert "Implement stub functions"Selim Gurun2015-03-031-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 63deb681b045244bbaca5abaeff978d8092e7671. Change-Id: I3c5ec54531c7d9c60d9547f44995b18a80616e42
| | | | | * | | | | | | am 8898ecf7: am 7ed31a7d: Merge "Implement stub functions"Selim Gurun2015-03-021-0/+12
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8898ecf7d4a2da1468b9e566157bcd8e383a3fc9': Implement stub functions
| | | | | | * | | | | | am 7ed31a7d: Merge "Implement stub functions"Selim Gurun2015-03-021-0/+12
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ed31a7d6ff6434a7ac858087953a8d1786d18c0': Implement stub functions
| | | | | | | * | | | | Merge "Implement stub functions"Selim Gurun2015-03-021-0/+12
| | | | | | | |\| | | | | | | | | | | | |/ / / | | | | | | | |/| | |
| | | | | | | | * | | Implement stub functionsSelim Gurun2015-03-021-0/+12
| | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement stub functions to prevent build breakage related to changes in android.webkit classes. Bug: 10237116 Change-Id: I8723446925277eaaa8804f13636da1d93d552d78
| | | | | * | | | | am 20135337: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '20135337834a8c6bee94dd2ae45e16dc60832480': Import translations. DO NOT MERGE
| | | | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-261-2/+2
| | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9920d90c808e80227387d26899fd015eaab7c2fd Auto-generated-cl: translation import
| | | | | * | | | am a770a09c: Merge "Fix remaining references to hidden fields."Martin Kosiba2014-12-050-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a770a09ca3346d8ec7cb4cdff90aaf83c8d2c5ff': Fix remaining references to hidden fields.
| | | | | | * | | Merge "Fix remaining references to hidden fields."Martin Kosiba2014-12-052-3/+3
| | | | | | |\ \ \
| | | | | | | * | | Fix remaining references to hidden fields.Torne (Richard Coles)2014-12-052-3/+3
| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few hidden references were missed in previous commits. Change-Id: Ia4c8fdae59f1de98b88d0bc77d5b7b434cf3db9b
| | | | | * | | | resolved conflicts for merge of 83f6e3db to lmp-mr1-dev-plus-aospNarayan Kamath2014-11-271-3/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13caa0f4fd6141fd85355e6ab058e65e6a7cf5c8
| | | | | | * | | Merge "Track move of android.net.http.ErrorStrings."Narayan Kamath2014-11-271-8/+1
| | | | | | |\ \ \
| | | | | | | * | | Track move of android.net.http.ErrorStrings.Narayan Kamath2014-11-271-8/+1
| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's now android.webkit.ErrorStrings. Change-Id: I112ab739b0cb9bd47cee76481f5cf22d1e194b99
| | | | | * | | | resolved conflicts for merge of d83e7f76 to lmp-mr1-dev-plus-aospTorne (Richard Coles)2014-11-201-1/+2
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d2faecfc87c0be8379d2a6d403f67c6fa8d9cb3
| | | | | | * | | Merge internal glue layer to AOSP at c28cfda.Torne (Richard Coles)2014-11-209-131/+511
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update glue layer to remove dependencies on to-be-removed private framework APIs.
| | | | | * | | | | resolved conflicts for merge of 4e0495ed to lmp-mr1-dev-plus-aospTorne (Richard Coles)2014-11-1927-20/+255
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaa581f2923c50fbdc31736a892ddcbd8859c71bf
| | | | | | * | | | Merge glue layer up to 7f6067d into AOSP.Torne (Richard Coles)2014-11-1889-393/+1832
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring the AOSP version of the glue layer up to date with the current internal version. Change-Id: Ibb993d77c9bcd6d4f4d5b2929a76118a419e3826
| | | | | * | \ \ \ \ Merge correct version of glue layer.Torne (Richard Coles)2014-11-17147-574/+2122
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THis is the version of the glue layer that is compatible with AOSP master's version of chromium and the L MR1 version of the framework. Change-Id: Idc5aef9fbe649e378ede370555cbe3d0d3c24b93
| | | | | | * | | | | | Merge AOSP master into M39 glue layer code.Torne (Richard Coles)2014-11-172-19/+20
| | | | | | |\| | | | | | | | | | | | |_|_|_|/ | | | | | | |/| | | | | | | | | | | | | | | Change-Id: I58c8e5a6b58f87fb737c6def35175990673e1683
| | | | | | * | | | | Merge "Add support for SmartClip interface in the glue layer." into m39Ben Murdoch2014-11-132-1/+24
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Add support for SmartClip interface in the glue layer.Ben Murdoch2014-11-122-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18222974 Change-Id: Ie39d49e9dfe90f20b6eb5d28009313781eac8e01 Conflicts: chromium/java/com/android/webview/chromium/WebViewChromium.java
| | | | | | * | | | | | [WebView] Start building against the System SDK.Ignacio Solla2014-11-104-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG:18152150 Change-Id: I995dd1a5f72bc817bdd71507fa4eee790144846a
| | | | | | * | | | | | [WebView] Remove direct dependencies on hidden APIs.Ignacio Solla2014-11-106-83/+444
| | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG:18152150 Change-Id: If2b6c43f322b4223460b1be6c633858476244756
| | | | | | * | | | | [WebView] Remove unused method in CookieManagerIgnacio Solla2014-11-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d9d761d6d32eff392bfb568cef10657464ba117
| | | | | | * | | | | Merge "[WebView] Remove dependencies on DebugFlags." into m39Ignacio Solla2014-11-032-42/+42
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | [WebView] Remove dependencies on DebugFlags.Ignacio Solla2014-11-032-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG:18152150 Change-Id: Ifafa06a01db4a679b9777798f3bdeda0abc3021e
| | | | | | * | | | | | [WebView] Remove dependency on Build.IS_DEBUGGABLE.Ignacio Solla2014-10-311-1/+5
| | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG:18152150 Change-Id: If9c8e28f6dd737ae0f677afc89ef5136a8e2268b
| | | | | | * | | | | Merge "[WebView] Remove dependency on FileUtils." into m39Ignacio Solla2014-10-291-2/+15
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | [WebView] Remove dependency on FileUtils.Ignacio Solla2014-10-291-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We implement our own version of deleteContents to avoid depending on FileUtils, a hidden Android API. BUG:18152150 Change-Id: I8607e36827bacc38a80a35f65c13f39f561551a0
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-04 09:56:44 +0000