Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

[Android] Backport some upstream commits to fix our device tests. #233

Merged
merged 2 commits into from
Feb 16, 2015
Merged

[Android] Backport some upstream commits to fix our device tests. #233

merged 2 commits into from
Feb 16, 2015

Conversation

rakuco
Copy link

@rakuco rakuco commented Feb 14, 2015

There have been some changes in M41 that causes our device tests to fail on the ICS devices we have. This pull request backports some fixes I made upstream for them so that we get back to a usable state.

We still upload some binaries (like device_forwarder) to the device more often than we actually need (see this Chromium bug I reported for more information), but it is nothing too huge.

raphael.kubo.da.costa added 2 commits February 15, 2015 00:51
Some change starting in M41 has started causing an existing bug in
GetAndroidToolsStatusAndOutput() to fail in ICS devices. When the
run_pie wrapper needs to be used, the call to `adb push' ends up
overwriting the original command that was going to be run on the device,
and the instrumentation tests fail like this:

> LD_LIBRARY_PATH=/data/local/tmp/forwarder/ /data/local/tmp/run_pie push /path/in/host/out/Release/run_pie /data/local/tmp/run_pie; echo %$?
[...]
[PIE Loader] dlopen() failed: Cannot load library: load_library[1095]: Library 'push' not found.

Fix it by using a different variable name for the `adb push' command
that must be run on the host.

BUG=373219
[email protected], [email protected]

Review URL: https://codereview.chromium.org/926023002

Cr-Commit-Position: refs/heads/master@{#316233}
It is possible that another unzip is installed on a device and ends up
being found first in $PATH.

This can be problematic when binaries such as device_forwarder need to
be re-uploaded, as other unzip implementations tend to loop forever
asking whether the existing binary should be overwritten. Instead, put
the path to our unzip implementation first so it is always used.

BUG=428729, 433101

Review URL: https://codereview.chromium.org/926643003

Cr-Commit-Position: refs/heads/master@{#316402}
@crosswalk-trybot
Copy link

Testing patch series with rakuco/chromium-crosswalk@b681e58 as its head.

Bot Status
Content Shell Linux [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Content Shell Linux/builds/158)
Content Shell Android-x86 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Content Shell Android-x86/builds/159)

@rakuco
Copy link
Author

rakuco commented Feb 14, 2015

@darktears

@tmpsantos
Copy link

RSBM

rakuco pushed a commit that referenced this pull request Feb 16, 2015
[Android] Backport some upstream commits to fix our device tests.
@rakuco rakuco merged commit d391344 into crosswalk-project:master Feb 16, 2015
@rakuco rakuco deleted the backport-ics-fixes branch February 16, 2015 11:52
rakuco pushed a commit that referenced this pull request Feb 27, 2015
…egate.

This was broken by https://codereview.chromium.org/834673007. Constructing
a PairingRegistry with a null delegate causes pairing to be offered, but if
selected, the host process will crash.

BUG=455501
[email protected]

Review URL: https://codereview.chromium.org/903963002

Cr-Commit-Position: refs/heads/master@{#314969}
(cherry picked from commit dbec99e)

Review URL: https://codereview.chromium.org/889493004

Cr-Commit-Position: refs/branch-heads/2272@{#233}
Cr-Branched-From: 827a380-refs/heads/master@{#310958}
rakuco pushed a commit that referenced this pull request Apr 30, 2015
MimeHandlerView plugins are passed access to the URL data by intercepting
the stream (in buffered_resource_handler.cc). This means that all URL
requests for these plugins need to go via the browser, otherwise they
won't be correctly intercepted. WebURLRequests for data: URLs have a fast
path for being loaded in the renderer which cannot be taken in the case
of loading these URLs.

BUG=477866

Review URL: https://codereview.chromium.org/1091253004

Cr-Commit-Position: refs/heads/master@{#326421}
(cherry picked from commit 96cd586)

Review URL: https://codereview.chromium.org/1083673007

Cr-Commit-Position: refs/branch-heads/2357@{#233}
Cr-Branched-From: 59d4494-refs/heads/master@{#323860}
rakuco pushed a commit that referenced this pull request Aug 13, 2015
If a pdf is downloaded by android DownloadManager, it could be opened after download completes.
However, for downloads that are handled by chrome, we don't do that even if there are user gestures.
In this change:
1. For download handled by Chrome, Move the download completion handling out of DownloadNotifier.
  The DownloadNotifier should only talk to notification manager, and should not talk to DownloadManager.
2. For all downloads(chrome or DownloadManager), use the same logic to determine if they should be auto opened

BUG=478304
TBR=dtrainor, yfriedman

Review URL: https://codereview.chromium.org/1267593002

Cr-Commit-Position: refs/heads/master@{#341155}
(cherry picked from commit a2b28b8)

Review URL: https://codereview.chromium.org/1273853002 .

Cr-Commit-Position: refs/branch-heads/2454@{#233}
Cr-Branched-From: 12bfc33-refs/heads/master@{#338390}
mrunalk pushed a commit that referenced this pull request Sep 22, 2015
…ed renderer.

CustomTabToolbar doesn't show chrome urls in toolbar. This change
also adds about:blank to the list of urls that doesn't get shown.

BUG=525123

Review URL: https://codereview.chromium.org/1337983002 .

Cr-Commit-Position: refs/branch-heads/2490@{#233}
Cr-Branched-From: 7790a35-refs/heads/master@{#344925}
mrunalk pushed a commit that referenced this pull request Dec 18, 2015
Cr-Commit-Position: refs/branch-heads/2564@{#233}
Cr-Branched-From: 1283eca-refs/heads/master@{#359700}
rakuco pushed a commit that referenced this pull request Mar 3, 2016
…n to change the XKB layout.

BUG=170601

Review URL: https://codereview.chromium.org/1608163002

Cr-Commit-Position: refs/heads/master@{#370410}
(cherry picked from commit 78d3f5f)

Review URL: https://codereview.chromium.org/1656083003 .

Cr-Commit-Position: refs/branch-heads/2623@{#233}
Cr-Branched-From: 92d7753-refs/heads/master@{#369907}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request May 17, 2016
…el32

Checking VerQueryValue() of kernel32 reports the "real" OS, rather than
the potentially shimmed one that GetVersionEx() reports.

Normally it's better to use GetVersionEx() because that'll determine the
APIs that are available and how they behave. However, we'd like to know
if there are a substantial percentage of users in compatibility mode, as
there have been complaints of users seeing the "XP and Vista are no
longer supported" infobar on Windows 7.

[email protected], [email protected], [email protected], [email protected]
BUG=581499

Review URL: https://codereview.chromium.org/1784623003

Cr-Commit-Position: refs/heads/master@{#380793}
(cherry picked from commit d68b1e1)

Review URL: https://codereview.chromium.org/1797073003 .

Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#233}
Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request Oct 9, 2016
BUG=609416

Review-Url: https://codereview.chromium.org/1967343002
Cr-Commit-Position: refs/heads/master@{#396375}
(cherry picked from commit c0853f6)

Review URL: https://codereview.chromium.org/2039213002 .

Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#233}
Cr-Branched-From: 2b3ae3b-refs/heads/master@{#394939}
imreotto pushed a commit to tenta-browser/chromium-crosswalk that referenced this pull request Nov 2, 2017
…ompt is shown"

This reverts commit 665eeaa.

Reason for revert: Bad merge conflict resolution.

Original change's description:
> [Merge M62] Chrome Cleaner UI: record prompt shown only if prompt is shown
> 
> [email protected]
> 
> (cherry picked from commit aedad54)
> 
> Bug: 763943
> Change-Id: Ic16aa5ef180f8e8607e9f161f3f11a5e68ba0b63
> Reviewed-on: https://chromium-review.googlesource.com/660399
> Commit-Queue: Fabio Tirelo <[email protected]>
> Reviewed-by: Chris Sharp <[email protected]>
> Reviewed-by: Ali Tofigh <[email protected]>
> Cr-Original-Commit-Position: refs/heads/master@{#501024}
> Reviewed-on: https://chromium-review.googlesource.com/667797
> Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#227}
> Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}

[email protected],[email protected],[email protected]

Change-Id: Iad972eda628529bb6c431437f2d5be789e278624
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 763943
Reviewed-on: https://chromium-review.googlesource.com/667760
Reviewed-by: Ali Tofigh <[email protected]>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#233}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants