Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-dev

Browse Source 
* commit '98fd6405aec16c6062f562bf6e7c5f2d50da5d60':
  Fix NPEs when using the APIs a little oddly.
This commit is contained in:
Mike Cleron
2012-06-28 14:21:28 -07:00
committed by Android Git Automerger
parent 00a82605a1 98fd6405ae
commit 9454e29896
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/Notification.java
View File

@@ -1367,7 +1367,9 @@ public class Notification implements Parcelable
public Builder setStyle(Style style) {
if (mStyle != style) {
mStyle = style;
mStyle.setBuilder(this);
if (mStyle != null) {
mStyle.setBuilder(this);
}
}
return this;
}
@@ -1637,7 +1639,9 @@ public class Notification implements Parcelable
public void setBuilder(Builder builder) {
if (mBuilder != builder) {
mBuilder = builder;
mBuilder.setStyle(this);
if (mBuilder != null) {
mBuilder.setStyle(this);
}
}
}