Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,588 Commits 3 Branches 0 Tags
555ea653bae019379eb8d1aa70dfcb86789c19d3
Commit Graph

3232 Commits

Author SHA1 Message Date
Ben Murdoch
6a3e70159c am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit 'd4bc95770ddfcb8be63fa768ac9eaf27512f8107':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 16:01:27 +00:00
Ben Murdoch
574fa34dd5 Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation. 
Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
 2015-01-07 15:13:48 +00:00
Narayan Kamath
f145960439 am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache." 
* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
  Stop using ErrorStrings for apache.
 2014-11-27 18:03:15 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache. 
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
 2014-11-27 17:23:41 +00:00
Ignacio Solla
ea1d90f5da [WebView] Allow the WebView to be compiled against the system SDK. 
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
 2014-11-25 17:03:49 +00:00
John Reck
18e3727f68 am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev 
automerge: 9b5d427

* commit '9b5d427fe0e557d572657252e7b5a3fd99a74550':
  Rename callDrawGLFunction
 2014-11-21 02:55:00 +00:00
John Reck
680df8d60e Rename callDrawGLFunction 
Bug: 18471503
Change-Id: I00cb356ff2338da7fd07b9ba30b5b3dcbdffdb2e
 2014-11-20 14:40:52 -08:00
Ignacio Solla
e7cf27b664 [WebView] Interface to access hidden APIs. (DO NOT MERGE) 
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
(cherry picked from commits 94ef789f0c
 and 53f2569487)
 2014-11-19 21:47:13 +00:00
Jeff Sharkey
b536c7a693 am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 
automerge: 47d2c97

* commit '47d2c97e7084a676fe2b4d96683912279046b28c':
  Block loading WebView in privileged processes.
 2014-11-14 21:47:17 +00:00
Jeff Sharkey
27936ad3a6 Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 2014-11-14 19:24:53 +00:00
Jeff Sharkey
85844916b8 Block loading WebView in privileged processes. 
WebView is very powerful, but it also has a large attack area.  To
improve security, refuse to load WebView components when running as
the root or system UIDs.

Bug: 18376908
Change-Id: I515b819033586076b1a9668023bb43ee0295d003
 2014-11-14 11:02:27 -08:00
Ignacio Solla
b993a4c70b am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 
* commit 'f3bd15cf80ecc748fbd232fec31fdf18d06e48a1':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-13 15:20:29 +00:00
Ignacio Solla
4fc66e582a am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev 
* commit 'ba1d4cd4fe65e60ba3eaef9cfbe93cb99424ef47':
  Fix docs build breakage
 2014-11-12 23:49:31 +00:00
Ignacio Solla
fd003c707e am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 
* commit 'dfb25b3dec64fb9537d5f34771b7f4a1812925b9':
  [WebView] Interface to access hidden APIs.
 2014-11-12 23:49:13 +00:00
Ignacio Solla
451e338c51 [WebView] Allow the WebView to be compiled against the system SDK. 
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
 2014-11-12 22:49:56 +00:00
Ignacio Solla
53f2569487 Fix docs build breakage 
Change-Id: Id20a54d8da2b80f277e31c342fffbb3b7d0dc854
 2014-11-12 21:55:47 +00:00
Ignacio Solla
94ef789f0c [WebView] Interface to access hidden APIs. 
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
 2014-11-10 10:31:12 +00:00
Marcin Kosiba
103817ed36 am 4c8dd87a: am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '4c8dd87a9e952a3ca157411b1a374c83064c9b2f':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:55:22 +00:00
Marcin Kosiba
1de5704943 am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '437517573b53b17765eba9b0b98055915bf3a4a1':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:44:58 +00:00
Marcin Kosiba
fd1ac83f63 Remove the default WebView text encoding resource entirely. 
Having the default text encoding in config.xml makes it seem like
it's something that could be changed, but upon further inspection
we can't see any good reason for anyone to ever want to change it
from UTF-8.

BUG: 17634120
Change-Id: I10a09ab1d65590c29efb10222abfa08ca52b5c84
 2014-10-10 17:20:58 +01:00
Dianne Hackborn
75a6e82bcc am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
  Put in real "code" (aka marketing) name.
 2014-10-10 04:26:40 +00:00
Dianne Hackborn
529b78941c am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-08 22:48:44 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Hui Shu
0fdb165193 am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '724fe35eac0afd885f3a20ebf846f0429303c157':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-02 12:40:59 +00:00
Hui Shu
30c284fc46 am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '03e73745c69637efb806e174109410b0192536e7':
  Remove WebView DRP Setting from Developer Settings
 2014-10-02 12:38:15 +00:00
Hui Shu
00207f564d am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:39:00 +00:00
Hui Shu
4979a6ade1 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:37:23 +00:00
Hui Shu
2267177279 Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit eb487c6301.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
 2014-10-01 21:41:07 +00:00
Hui Shu
eb487c6301 Remove WebView DRP Setting from Developer Settings 
BUG: 17730990
Change-Id: Ic4fde9affb2f887329d6b3d2dbe8945959c016d8
 2014-09-30 16:52:41 -07:00
Marcin Kosiba
26dd49f4c1 am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '6e6ae86a8659a02e30bdf1a9ec4ca910c4a78215':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-12 19:19:04 +00:00
Marcin Kosiba
288e7de22e Remove an @removed member of andorid.webkit.WebResourceResponse. 
BUG: 17253647
Change-Id: I02f4f0600a09ceb3b68ba2698b80e413e7511663
 2014-09-12 18:24:49 +01:00
Tao Bai
96bca16a43 am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev 
* commit 'cdad4651a1e93b0cfe2b199e39e5583ce9a19454':
  Revise createIntent and parseResult API.
 2014-09-10 21:55:15 +00:00
Tao Bai
e8df27aec8 Revise createIntent and parseResult API. 
- Both are move to FileChooserParams, remove UploadHelper class.
- createIntent only handls non-capture intents
- parseResult is the static member of FileChooseParams and should
  be used with createIntent.

BUG:17253647,16624450

Change-Id: I81cac7c1b739880db4e4c1f2b4612ed2ee87cb1b
 2014-09-09 11:21:22 -07:00
Elliott Hughes
4656e69bf3 resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp 
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
 2014-09-08 13:08:43 -07:00
Elliott Hughes
ab94a1676e Merge "Small documentation fixes across many files." 2014-09-08 18:44:14 +00:00
Mark Doliner
d0646dca40 Small documentation fixes across many files. 
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
 2014-09-05 13:57:51 -07:00
Marcin Kosiba
8d4e83aca0 Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 2014-09-05 15:13:40 +00:00
Marcin Kosiba
100c20c900 Rename WebResourceRequest.hasUserGestureInsecure to hasGesture. 
This is in response to API council feedback.

BUG: 17253647
Change-Id: I6da2aa2510a73276fcdbad9219adfeaaed41d3ba
 2014-09-05 14:22:32 +00:00
Martin Kosiba
3a82acdbf6 Change WebView.zoomBy return type to void. 
It turns out that the semantics of the return value are confusing
and so we decided to not return a result from this method at all.
The developer can call canZoomIn/canZoomOut to determine whether
the WebView is at the zoom limit, so there is no loss of
functionality.

BUG: 17374808
Change-Id: I4dfde71d5ac4a3f91c8755b257411aad06a1b1f6
 2014-09-05 13:41:48 +00:00
Selim Gurun
c7a8d06731 Remove unpublished optOutDataReductionProxyApi 
Bug: 17253647

Per Api council's request, remove this API.

Change-Id: I8e706cc7173b88f3f13b2ac0697f54b25f163798
 2014-09-03 14:34:24 -07:00
Selim Gurun
d576bf310b Merge "Address API Feedback" into lmp-dev 2014-08-28 01:47:31 +00:00
Selim Gurun
17d1adb183 Address API Feedback 
Bug: 17253647

This is Part I of API feedback. It does not address portions
of the feedback that is still pending a response from API council.

Change-Id: I6ae250c6455a5545912623aeb34332d564fffde7
 2014-08-27 17:56:08 -07:00
Hector Dearman
42a9ee5036 Remove synchronized from acceptThirdPartyCookies() 
As per API council feedback.

Bug: 17253647
Change-Id: Ide3d4b216f01a96e54111f885813ca8a7c3865ba
 2014-08-26 10:56:09 +01:00
Torne (Richard Coles)
84392d74fe Store the WebView's package info. 
When loading the WebView, save the PackageInfo for the package so that
it can be retrieved later to access the package name, version data, etc.
This will be used to detect WebView downgrades that may affect an app's
saved WebView-related data.

Bug: 16724751
Change-Id: I05ce469308cc87f79c73206327f43b76b1bab222
 2014-08-14 16:43:18 +01:00
Torne (Richard Coles)
4f82d40e9f Merge "Add trace events to WebView startup." into lmp-dev 2014-08-12 23:14:49 +00:00
Robert Ly
b369ff7b38 am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '84f00277b11a0324f0dd08054b119f2a61f1e646':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:17:49 +00:00
Robert Ly
84f00277b1 am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '9ada140fc1a8cb6dabc0b0951249cb7a46578c37':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:12:37 +00:00
Torne (Richard Coles)
3822882b32 Add trace events to WebView startup. 
Add system trace events for several interesting points during the
loading of the WebView APK so we can measure how much each part
contributes to startup time.

Bug: 16870075
Change-Id: Iadfd1881faea0377fa01313dddabb1d030962c5f
 2014-08-13 17:11:45 +01:00
Scott Rowe
607c17f99c cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5 
Change-Id: I9838519ad3e0c2fb3957829fc448b1ae6bd1d62b
 2014-08-07 15:54:42 -07:00
Torne (Richard Coles)
27cb0d22a8 Make WebViewFactory more robust. 
Catch and discard any exception thrown in getWebViewNativeLibraryPaths
to avoid the system server crashing if there is something wrong with the
update APK. prepareWebViewInSystemServer(nativePaths) is safe to call
even if nativePaths is null or invalid, and must be called to ensure
that any process waiting for relro processing is unblocked.

Bug: 16894062
Change-Id: I76c759bebcb7c4643fb50979376afea764c859c4
 2014-08-08 18:40:51 +01:00