Commit Graph

19455 Commits

Author SHA1 Message Date
Fabrice Di Meglio
112fc493a8 am 610c2d25: Merge "Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
* commit '610c2d25edb2aa87623e969cbc24efeaf8555469':
  Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
2011-10-05 17:14:17 -07:00
Fabrice Di Meglio
610c2d25ed Merge "Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 2011-10-05 17:12:17 -07:00
Fabrice Di Meglio
764041d213 Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
- make VERY_WIDE bigger ... 64 times actually

Change-Id: I1a177ef5821d9341abb77ea69a50e05a5bfc97b5
2011-10-05 16:28:18 -07:00
George Mount
90d13a3d4b am 67f9d32e: Merge "Fix monkey NullPointerException"
* commit '67f9d32e5ed55b15b84be4d0bdff828d48abe2eb':
  Fix monkey NullPointerException
2011-10-05 15:35:37 -07:00
George Mount
67f9d32e5e Merge "Fix monkey NullPointerException" 2011-10-05 15:33:46 -07:00
Steve Block
489ff9a482 am cfb753a6: Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision"
* commit 'cfb753a641781425b6ef04a503271108fbce8bd0':
  Fix SslCertLookupTable to correctly determine whether we have a valid cached decision
2011-10-05 14:58:54 -07:00
Steve Block
cfb753a641 Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision" 2011-10-05 14:56:21 -07:00
Nicolas Roard
e5e9798484 am f270a152: Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work."
* commit 'f270a1521c39bb6f47ebd29c1a14d9a33f14d87f':
  Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work.
2011-10-05 11:38:01 -07:00
Nicolas Roard
f270a1521c Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work." 2011-10-05 11:35:29 -07:00
Dianne Hackborn
e68ead5e3b am 30c845f9: Turn off logging.
* commit '30c845f9ca9e504d4d76099a8be111c99ac669f4':
  Turn off logging.
2011-10-05 11:34:09 -07:00
Dianne Hackborn
30c845f9ca Turn off logging.
Change-Id: I5b050e33fe918c08b24091c6ccb9c5fe2b01d496
2011-10-05 11:30:55 -07:00
Dianne Hackborn
ee806f9fc7 am 01017cdf: Merge "Some new ICS target SDK changes."
* commit '01017cdf7452baa13908cba6aa26632114544b33':
  Some new ICS target SDK changes.
2011-10-05 11:26:48 -07:00
Dianne Hackborn
01017cdf74 Merge "Some new ICS target SDK changes." 2011-10-05 11:25:02 -07:00
Dianne Hackborn
4775c0c95c am 668f7c3e: Merge "Fix issue #5348948: Third Party app "Byki Turkish" shows..."
* commit '668f7c3ec91d16c61f684b23cb55aa2530684b5f':
  Fix issue #5348948: Third Party app "Byki Turkish" shows...
2011-10-05 11:18:21 -07:00
Dianne Hackborn
668f7c3ec9 Merge "Fix issue #5348948: Third Party app "Byki Turkish" shows..." 2011-10-05 11:15:13 -07:00
Steve Block
a93d89d1df am 4198627a: Merge changes I447cd196,I0c6cdae4
* commit '4198627a284a9dbdd7a16f98c4fbcf5032c6020f':
  SSL-related cleanup in BrowserFrame and SslCertLookupTable
  Clean up SslErrorHandlerImpl
2011-10-05 10:02:22 -07:00
Steve Block
f219f23aec Fix SslCertLookupTable to correctly determine whether we have a valid cached decision
We should only re-use a cached 'allow' decision if the decision ...
- is for the same host
- is for an error which is at least as severe as the current error

Bug: 5409251
Change-Id: Id8516f58c8d23de44e80539ffeaf945be3d2914a
2011-10-05 18:01:54 +01:00
Steve Block
4198627a28 Merge changes I447cd196,I0c6cdae4
* changes:
  SSL-related cleanup in BrowserFrame and SslCertLookupTable
  Clean up SslErrorHandlerImpl
2011-10-05 10:00:59 -07:00
Steve Block
34473bca2c am 7897fdd6: Merge "Fix BrowserFrame to construct SslError using the full URL, rather than the host"
* commit '7897fdd6a65499d76ac8573e5b428d07675b98f4':
  Fix BrowserFrame to construct SslError using the full URL, rather than the host
2011-10-05 09:47:49 -07:00
Steve Block
7897fdd6a6 Merge "Fix BrowserFrame to construct SslError using the full URL, rather than the host" 2011-10-05 09:46:27 -07:00
Joe Fernandez
fb6b4d96da am 1d4a2555: Merge "docs: Camera class JavaDoc FixIts for ICS"
* commit '1d4a25556a9fca40f08b908c2d146664eab5aac2':
  docs: Camera class JavaDoc FixIts for ICS
2011-10-05 09:24:42 -07:00
Joe Fernandez
1d4a25556a Merge "docs: Camera class JavaDoc FixIts for ICS" 2011-10-05 09:23:03 -07:00
Narayan Kamath
f78cff74d4 am b4e7d4ca: Merge "Allow listeners to be set before the service connects."
* commit 'b4e7d4ca7502bb8ff599229ec90c1bf5b481f2f7':
  Allow listeners to be set before the service connects.
2011-10-05 06:54:18 -07:00
Narayan Kamath
b4e7d4ca75 Merge "Allow listeners to be set before the service connects." 2011-10-05 06:52:24 -07:00
Steve Block
918d361ece am ea54b170: Merge "Clean up SslError"
* commit 'ea54b17038a6631f9e911a084c6138a57647915c':
  Clean up SslError
2011-10-05 06:37:35 -07:00
Fabrice Di Meglio
645b7fa5b6 am e921572b: Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)""
* commit 'e921572bda621b75a217bce115c2b605caf9b26a':
  Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
2011-10-05 06:36:45 -07:00
Svetoslav Ganov
97e1af548e am 63f5e09c: Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose."
* commit '63f5e09c8cce112b0945190da7d4a108b92a6c52':
  Make prompt for headset while typing a password if accessibilbity is on less verbose.
2011-10-05 06:36:43 -07:00
Steve Block
bf52c0ea10 SSL-related cleanup in BrowserFrame and SslCertLookupTable
- Fix a comment in BrowserFrame.certificate()
- Simplify SslCertLookupTable by not storing 'deny' decisions.
  We only need to store 'allow' decisions, as we don't re-use 'deny' decisions.

No change in behaviour.

Bug: 5409251
Change-Id: I447cd1966fbb6c2dea8088b2e4c4e2de22405cb9
2011-10-05 13:32:32 +01:00
Steve Block
270a3c8062 Clean up SslErrorHandlerImpl
- Use assert rather than junit.framework.Assert
- Add some comments
- There's no need for checkSslPrefTable() to call handleSslErrorResponse() as
  we'll never update the table. Instead call
  LoadListener.handleSslErrorResponse() directly.

No functional change.

Bug: 5409251
Change-Id: I0c6cdae43fa966f86f4a6c43b74c2f2a01f60319
2011-10-05 13:28:28 +01:00
Steve Block
fa03f9a346 Fix BrowserFrame to construct SslError using the full URL, rather than the host
https://android-git.corp.google.com/g/#/c/133348 changed BrowserFrame to
construct the SslError using only the host. This was done so that we match on
just the host component of the URL when re-using previous decisions in case of
an SSL error. It also means that the browser displays only the host when it
shows the SSL error dialog.

This change fixes BrowserFrame to pass the full URL to SslError. We modify
SslCertLookupTable to keep the existing behaviour regarding matching on only the
host component. There's no need to change Browser to continue displaying only
the host as I think this change was an unintentional side-effect.

Also remove dead code-path in BrowserFrame.reportSslCertError(). This
method is used only with the Chromium HTTP stack. This code was added
in https://android-git.corp.google.com/g/#/c/121023.

No functional change.

Bug: 5410252
Change-Id: Ief2dbf4558095fb6fa7ab0caac7d37fa4f640b66
2011-10-05 13:16:17 +01:00
Steve Block
ea54b17038 Merge "Clean up SslError" 2011-10-05 02:28:15 -07:00
Dianne Hackborn
836e262aa8 Fix issue #5348948: Third Party app "Byki Turkish" shows...
...a tiny dialog (works fine in GB and HC)

I found two problems:

- When first binding an application, we were not correctly computing
the compat configuration.
- When retrieving the display metrics to hand to Resources, we were
using the one with compat applied.  This is not right, because
Resources will apply the compat itself, so in some cases the compat
scaling was applied twice.

Change-Id: I22c9cfed9e271290c1a7544fa3ffa54a2e65daf9
2011-10-04 19:17:49 -07:00
Nicolas Roard
dc221e01ff Streamline the layers update codepath.
Directly update the layers transform and position.
This makes updates faster and less dependent on other webkit work.

bug:5218173
Change-Id: I5f784ef64eda1be3cee406aa23702e5378c8de9e
2011-10-04 17:57:59 -07:00
Fabrice Di Meglio
e921572bda Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"" 2011-10-04 17:24:37 -07:00
Fabrice Di Meglio
ad0b051b13 Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
This reverts commit a130e5f59d
2011-10-04 17:21:26 -07:00
Svetoslav Ganov
63f5e09c8c Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose." 2011-10-04 17:14:57 -07:00
Svetoslav Ganov
bd39ca7014 Make prompt for headset while typing a password if accessibilbity is on less verbose.
If accessibility is enabled and there is no headset we do not speak the pressed keys.
In such a case we provide a prompt to the blind user to use a headset. This was announced
on every keypress which is quite annoying. Now this is announced only once.

bug:5342234

Change-Id: Ibe55ad991ad2153d09cde57b030544948fa0d73b
2011-10-04 17:05:55 -07:00
Joe Fernandez
464cb21e2a docs: Camera class JavaDoc FixIts for ICS
Change-Id: I03d96247d149baf82c53b33aa7737fca11906ce6
2011-10-04 16:56:47 -07:00
Christopher Tate
e706cef1c5 am b5de5985: Merge "Add -nosystem flag to adb backup"
* commit 'b5de598554a97c557a3e0c20c28bbe5454164a6d':
  Add -nosystem flag to adb backup
2011-10-04 16:18:24 -07:00
Christopher Tate
b5de598554 Merge "Add -nosystem flag to adb backup" 2011-10-04 16:16:11 -07:00
Dave Santoro
ef728978b3 am 2aeecb7a: Merge "Add new permissions for read/write social stream."
* commit '2aeecb7aa57242aae29dddff2b9ebd5d21aa3824':
  Add new permissions for read/write social stream.
2011-10-04 15:47:39 -07:00
Dave Santoro
2aeecb7aa5 Merge "Add new permissions for read/write social stream." 2011-10-04 15:46:10 -07:00
Dave Santoro
0b61f59d77 Add new permissions for read/write social stream.
This is a manual merge of a change going in to ICS-FactoryROM.

These permissions are needed to separate the (potentially invasive)
access to the user's social stream from the existing read/write
contacts permission.

Per discussion with Android release team, we are also hiding the
stream item API until we figure out a better way to guard the data.

Bug 5406886

Change-Id: I8339d743c3ebe8923c7ee47f2900444efcf82a52
2011-10-04 15:35:48 -07:00
Christopher Tate
240c7d2d1f Add -nosystem flag to adb backup
This makes it easy to back up everything that belongs to 3rd party apps, but
nothing that comes with the system per se.  If any system packages are
explicitly named on the command line they will be included in the backup
even if -nosystem was passed.  So, for example, this will back up all 3rd
party apps as well as system settings, but nothing else belonging to
system-deployed apps:

   adb backup -all -nosystem com.android.provider.settings

Bug 5361503

Change-Id: Iebe04b7d7027ca58b9f55e8eb7f219d6cca69269
2011-10-04 15:35:00 -07:00
Joe Fernandez
90b66cb321 am cac15eb2: Merge "docs: add developer guide cross-references, Project ACRE"
* commit 'cac15eb21cab68e5b76fe06f9aff273978c92054':
  docs: add developer guide cross-references, Project ACRE
2011-10-04 14:04:53 -07:00
Joe Fernandez
cac15eb21c Merge "docs: add developer guide cross-references, Project ACRE" 2011-10-04 14:03:12 -07:00
Joe Fernandez
b54e7a3d9f docs: add developer guide cross-references, Project ACRE
Change-Id: I5df1c4e13af67ff4c4a5b22f3cb1247bf0103b09
2011-10-04 13:57:00 -07:00
Jeff Sharkey
ba36487a48 am c58111b3: Merge "Track xtables summary, move tether stats, time."
* commit 'c58111b307018da66bc227ed5ca019f7d8143b9a':
  Track xtables summary, move tether stats, time.
2011-10-04 13:13:55 -07:00
Jeff Sharkey
c58111b307 Merge "Track xtables summary, move tether stats, time." 2011-10-04 13:12:06 -07:00
Irfan Sheriff
c08ea6af1e am 2e93402d: Merge "Reduce/Fix system logging"
* commit '2e93402d0e90b484df8ee2ca0319e49ae20614ca':
  Reduce/Fix system logging
2011-10-04 12:16:25 -07:00