diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2014-05-21 18:39:56 +1000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2014-05-21 18:39:56 +1000 |
commit | 4b181b4517fad106ab1ffbdab01adac9cf8e4bee (patch) | |
tree | 0c212a644e97d733260ddbd8e812f148835f203a /android/src | |
parent | 8fb0bbcc20e3348193eedc44cd5c9c0fac899ad3 (diff) | |
download | rockbox-4b181b4517fad106ab1ffbdab01adac9cf8e4bee.tar.gz rockbox-4b181b4517fad106ab1ffbdab01adac9cf8e4bee.zip |
Fix android black screen crash
Change-Id: I7a0eb121ff151b8b6e8f824ee8dbab8d99b73499
Diffstat (limited to 'android/src')
-rw-r--r-- | android/src/org/rockbox/RockboxActivity.java | 1 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxFramebuffer.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java index a6604418ed..8004046c1b 100644 --- a/android/src/org/rockbox/RockboxActivity.java +++ b/android/src/org/rockbox/RockboxActivity.java | |||
@@ -111,6 +111,7 @@ public class RockboxActivity extends Activity | |||
111 | { | 111 | { |
112 | super.onResume(); | 112 | super.onResume(); |
113 | setVisible(true); | 113 | setVisible(true); |
114 | setServiceActivity(true); | ||
114 | } | 115 | } |
115 | 116 | ||
116 | /* this is also called when the backlight goes off, | 117 | /* this is also called when the backlight goes off, |
diff --git a/android/src/org/rockbox/RockboxFramebuffer.java b/android/src/org/rockbox/RockboxFramebuffer.java index 405a771274..9c4c6a5dc3 100644 --- a/android/src/org/rockbox/RockboxFramebuffer.java +++ b/android/src/org/rockbox/RockboxFramebuffer.java | |||
@@ -61,6 +61,9 @@ public class RockboxFramebuffer extends SurfaceView | |||
61 | { | 61 | { |
62 | SurfaceHolder holder = getHolder(); | 62 | SurfaceHolder holder = getHolder(); |
63 | Canvas c = holder.lockCanvas(); | 63 | Canvas c = holder.lockCanvas(); |
64 | if (c == null) | ||
65 | return; | ||
66 | |||
64 | btm.copyPixelsFromBuffer(framebuffer); | 67 | btm.copyPixelsFromBuffer(framebuffer); |
65 | synchronized (holder) | 68 | synchronized (holder) |
66 | { /* draw */ | 69 | { /* draw */ |
@@ -73,6 +76,10 @@ public class RockboxFramebuffer extends SurfaceView | |||
73 | { | 76 | { |
74 | SurfaceHolder holder = getHolder(); | 77 | SurfaceHolder holder = getHolder(); |
75 | Canvas c = holder.lockCanvas(dirty); | 78 | Canvas c = holder.lockCanvas(dirty); |
79 | |||
80 | if (c == null) | ||
81 | return; | ||
82 | |||
76 | /* can't copy a partial buffer, but it doesn't make a noticeable difference anyway */ | 83 | /* can't copy a partial buffer, but it doesn't make a noticeable difference anyway */ |
77 | btm.copyPixelsFromBuffer(framebuffer); | 84 | btm.copyPixelsFromBuffer(framebuffer); |
78 | synchronized (holder) | 85 | synchronized (holder) |