Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
d01295b3
Commit
d01295b3
authored
Dec 25, 2012
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a crash when timeout in Exec
parent
88ecb02e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
5 deletions
+18
-5
AndroidManifest.xml
AndroidManifest.xml
+2
-2
pom.xml
pom.xml
+1
-1
src/com/github/shadowsocks/Utils.java
src/com/github/shadowsocks/Utils.java
+15
-2
No files found.
AndroidManifest.xml
View file @
d01295b3
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.github.shadowsocks"
package=
"com.github.shadowsocks"
android:installLocation=
"auto"
android:installLocation=
"auto"
android:versionCode=
"
7
"
android:versionCode=
"
8
"
android:versionName=
"1.1.
3
"
>
android:versionName=
"1.1.
4
"
>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
...
...
pom.xml
View file @
d01295b3
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.github.shadowsocks
</groupId>
<groupId>
com.github.shadowsocks
</groupId>
<artifactId>
shadowsocks
</artifactId>
<artifactId>
shadowsocks
</artifactId>
<version>
1.1.
3
</version>
<version>
1.1.
4
</version>
<packaging>
apk
</packaging>
<packaging>
apk
</packaging>
<name>
Shadowsocks
</name>
<name>
Shadowsocks
</name>
...
...
src/com/github/shadowsocks/Utils.java
View file @
d01295b3
...
@@ -271,6 +271,21 @@ public class Utils {
...
@@ -271,6 +271,21 @@ public class Utils {
private
final
boolean
asroot
;
private
final
boolean
asroot
;
public
int
exitcode
=
-
1
;
public
int
exitcode
=
-
1
;
private
int
[]
pid
=
new
int
[
1
];
private
FileDescriptor
pipe
;
@Override
public
void
destroy
()
{
if
(
pid
[
0
]
!=
-
1
)
{
Exec
.
hangupProcessGroup
(
pid
[
0
]);
pid
[
0
]
=
-
1
;
}
if
(
pipe
!=
null
)
{
Exec
.
close
(
pipe
);
pipe
=
null
;
}
}
/**
/**
* Creates a new script runner.
* Creates a new script runner.
*
*
...
@@ -344,8 +359,6 @@ public class Utils {
...
@@ -344,8 +359,6 @@ public class Utils {
@Override
@Override
public
void
run
()
{
public
void
run
()
{
FileDescriptor
pipe
=
null
;
int
pid
[]
=
new
int
[
1
];
pid
[
0
]
=
-
1
;
pid
[
0
]
=
-
1
;
try
{
try
{
...
...
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