Fix 2519335 - Caused by NPE. Here's another place where it needs to be ok for sRS to be null.
Change-Id: Iacfc0474c96c657d982a50c8d4851e2fdd79c3ae
diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java
index 8467b39..d81b442 100644
--- a/src/com/android/launcher2/AllApps3D.java
+++ b/src/com/android/launcher2/AllApps3D.java
@@ -194,8 +194,10 @@
}
public void surrender() {
- sRS.contextSetSurface(0, 0, null);
- sRS.mMessageCallback = null;
+ if (sRS != null) {
+ sRS.contextSetSurface(0, 0, null);
+ sRS.mMessageCallback = null;
+ }
mSurrendered = true;
}
@@ -1022,11 +1024,15 @@
}
void pause() {
- sRS.contextBindRootScript(null);
+ if (sRS != null) {
+ sRS.contextBindRootScript(null);
+ }
}
void resume() {
- sRS.contextBindRootScript(mScript);
+ if (sRS != null) {
+ sRS.contextBindRootScript(mScript);
+ }
}
class Params extends BaseAlloc {