OSDN Git Service
(root)
/
android-x86
/
packages-apps-Trebuchet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
136882c
)
Fix NPE in Workspace
author
Adam Cohen
<adamcohen@google.com>
Wed, 17 Sep 2014 23:46:55 +0000
(16:46 -0700)
committer
Adam Cohen
<adamcohen@google.com>
Wed, 17 Sep 2014 23:47:08 +0000
(16:47 -0700)
Bug:
17503479
Change-Id: Ib20dfd67c5a755cd4b684163bb538a1bf77fa6ca
src/com/android/launcher3/Workspace.java
patch
|
blob
|
history
diff --git
a/src/com/android/launcher3/Workspace.java
b/src/com/android/launcher3/Workspace.java
index
909cf5f
..
051b0c0
100644
(file)
--- a/
src/com/android/launcher3/Workspace.java
+++ b/
src/com/android/launcher3/Workspace.java
@@
-1107,7
+1107,7
@@
public class Workspace extends SmoothPagedView
case MotionEvent.ACTION_UP:
if (mTouchState == TOUCH_STATE_REST) {
final CellLayout currentPage = (CellLayout) getChildAt(mCurrentPage);
- if (!currentPage.lastDownOnOccupiedCell()) {
+ if (
currentPage != null &&
!currentPage.lastDownOnOccupiedCell()) {
onWallpaperTap(ev);
}
}