Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
fe3175d4
Commit
fe3175d4
authored
Nov 12, 2015
by
Adam Barth
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #320 from jimbeveridge/shell
Fixes assert connecting to Activity service under Linux
parents
19b6cf6c
04501af9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
shell.dart
packages/flutter/lib/src/services/shell.dart
+5
-5
No files found.
packages/flutter/lib/src/services/shell.dart
View file @
fe3175d4
...
...
@@ -29,10 +29,10 @@ ShellProxy _initShellProxy() {
ApplicationConnection
_initEmbedderConnection
(
)
{
core
.
MojoHandle
servicesHandle
=
new
core
.
MojoHandle
(
internals
.
takeServicesProvidedByEmbedder
());
core
.
MojoHandle
exposedServicesHandle
=
new
core
.
MojoHandle
(
internals
.
takeServicesProvidedToEmbedder
());
ServiceProviderProxy
services
=
servicesHandle
.
isValid
?
new
ServiceProviderProxy
.
fromHandle
(
servicesHandle
)
:
null
;
ServiceProvider
Stub
exposedServices
=
exposedServicesHandle
.
isValid
?
new
ServiceProviderStub
.
fromHandle
(
exposedServicesHandle
)
:
null
;
if
(!
servicesHandle
.
isValid
||
!
exposedServicesHandle
.
isValid
)
return
null
;
ServiceProvider
Proxy
services
=
new
ServiceProviderProxy
.
fromHandle
(
servicesHandle
);
ServiceProviderStub
exposedServices
=
new
ServiceProviderStub
.
fromHandle
(
exposedServicesHandle
)
;
return
new
ApplicationConnection
(
exposedServices
,
services
);
}
...
...
@@ -56,7 +56,7 @@ class _Shell {
if
(
_shell
==
null
||
url
==
null
)
{
// If we don't have a shell or a url, we try to get the services from the
// embedder directly instead of using the shell to connect.
_embedderConnection
.
requestService
(
proxy
);
_embedderConnection
?
.
requestService
(
proxy
);
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment