OSDN Git Service
(root)
/
android-x86
/
packages-apps-Launcher3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8ad682d
)
Fixing NPE in onFinishBindingItems (issue 10975740)
author
Adam Cohen
<adamcohen@google.com>
Sun, 29 Sep 2013 19:57:34 +0000
(12:57 -0700)
committer
Adam Cohen
<adamcohen@google.com>
Sun, 29 Sep 2013 19:58:39 +0000
(12:58 -0700)
-> See bug for explanation. Seems like the circumstances leading to this
NPE are understandable.
Change-Id: I89637a2da50be1081632e05cf79678c983a74d3a
src/com/android/launcher3/Launcher.java
patch
|
blob
|
history
diff --git
a/src/com/android/launcher3/Launcher.java
b/src/com/android/launcher3/Launcher.java
index
bf12d79
..
ba34c13
100644
(file)
--- a/
src/com/android/launcher3/Launcher.java
+++ b/
src/com/android/launcher3/Launcher.java
@@
-915,7
+915,7
@@
public class Launcher extends Activity
}
protected void onFinishBindingItems() {
- if (hasCustomContentToLeft() && mWorkspace.hasCustomContent()) {
+ if (
mWorkspace != null &&
hasCustomContentToLeft() && mWorkspace.hasCustomContent()) {
addCustomContentToLeft();
}
}