Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8022d28e
authored
Sep 18, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make certain we have appropriate locks held for playback tests.
parent
3538e577
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
0 deletions
playbacktests/src/main/AndroidManifest.xml
playbacktests/src/main/java/com/google/android/exoplayer/playbacktests/util/HostActivity.java
playbacktests/src/main/AndroidManifest.xml
View file @
8022d28e
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
android:versionName=
"1.4.1"
>
android:versionName=
"1.4.1"
>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.WAKE_LOCK"
/>
<uses-sdk
android:minSdkVersion=
"9"
android:targetSdkVersion=
"22"
/>
<uses-sdk
android:minSdkVersion=
"9"
android:targetSdkVersion=
"22"
/>
...
...
playbacktests/src/main/java/com/google/android/exoplayer/playbacktests/util/HostActivity.java
View file @
8022d28e
...
@@ -19,11 +19,18 @@ import static junit.framework.Assert.fail;
...
@@ -19,11 +19,18 @@ import static junit.framework.Assert.fail;
import
com.google.android.exoplayer.playbacktests.R
;
import
com.google.android.exoplayer.playbacktests.R
;
import
com.google.android.exoplayer.util.Assertions
;
import
com.google.android.exoplayer.util.Assertions
;
import
com.google.android.exoplayer.util.Util
;
import
android.annotation.SuppressLint
;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.content.Context
;
import
android.net.wifi.WifiManager
;
import
android.net.wifi.WifiManager.WifiLock
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.ConditionVariable
;
import
android.os.ConditionVariable
;
import
android.os.Handler
;
import
android.os.Handler
;
import
android.os.PowerManager
;
import
android.os.PowerManager.WakeLock
;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.Surface
;
import
android.view.Surface
;
import
android.view.SurfaceHolder
;
import
android.view.SurfaceHolder
;
...
@@ -78,6 +85,9 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
...
@@ -78,6 +85,9 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
private
static
final
String
TAG
=
"HostActivity"
;
private
static
final
String
TAG
=
"HostActivity"
;
private
WakeLock
wakeLock
;
private
WifiLock
wifiLock
;
private
SurfaceView
surfaceView
;
private
SurfaceView
surfaceView
;
private
Handler
mainHandler
;
private
Handler
mainHandler
;
private
CheckFinishedRunnable
checkFinishedRunnable
;
private
CheckFinishedRunnable
checkFinishedRunnable
;
...
@@ -138,6 +148,18 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
...
@@ -138,6 +148,18 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
}
}
@Override
@Override
public
void
onStart
()
{
Context
appContext
=
getApplicationContext
();
WifiManager
wifiManager
=
(
WifiManager
)
appContext
.
getSystemService
(
Context
.
WIFI_SERVICE
);
wifiLock
=
wifiManager
.
createWifiLock
(
getWifiLockMode
(),
TAG
);
wifiLock
.
acquire
();
PowerManager
powerManager
=
(
PowerManager
)
appContext
.
getSystemService
(
Context
.
POWER_SERVICE
);
wakeLock
=
powerManager
.
newWakeLock
(
PowerManager
.
PARTIAL_WAKE_LOCK
,
TAG
);
wakeLock
.
acquire
();
super
.
onStart
();
}
@Override
public
void
onResume
()
{
public
void
onResume
()
{
super
.
onResume
();
super
.
onResume
();
maybeInitializeHostedTest
();
maybeInitializeHostedTest
();
...
@@ -149,6 +171,15 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
...
@@ -149,6 +171,15 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
maybeReleaseHostedTest
();
maybeReleaseHostedTest
();
}
}
@Override
public
void
onStop
()
{
super
.
onStop
();
wakeLock
.
release
();
wakeLock
=
null
;
wifiLock
.
release
();
wifiLock
=
null
;
}
// SurfaceHolder.Callback
// SurfaceHolder.Callback
@Override
@Override
...
@@ -190,6 +221,11 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
...
@@ -190,6 +221,11 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
}
}
}
}
@SuppressLint
(
"InlinedApi"
)
private
static
final
int
getWifiLockMode
()
{
return
Util
.
SDK_INT
<
12
?
WifiManager
.
WIFI_MODE_FULL
:
WifiManager
.
WIFI_MODE_FULL_HIGH_PERF
;
}
private
final
class
CheckFinishedRunnable
implements
Runnable
{
private
final
class
CheckFinishedRunnable
implements
Runnable
{
private
static
final
long
CHECK_INTERVAL_MS
=
1000
;
private
static
final
long
CHECK_INTERVAL_MS
=
1000
;
...
...
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