summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Sandler <dsandler@android.com> 2014-08-07 14:12:47 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-08-07 09:28:12 +0000
commit09723fd04a8c2d0198ee11aeab1a9eefcf17ca7f (patch)
treeb4a5168202226fbc87b69a84d7df5d728dc9e6b7
parent5f2220df7f40154be5d4585c304cd2f0770068ff (diff)
parentaa21e395f536738f1f7dee01d752d69f2dff632e (diff)
Merge "Need to post-process all action icons to get the correct color." into lmp-dev
-rw-r--r--core/java/android/app/Notification.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 5684a7a0966b..90b8b869fd3c 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -32,7 +32,6 @@ import android.media.AudioManager;
import android.media.session.MediaSession;
import android.net.Uri;
import android.os.BadParcelableException;
-import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
@@ -1900,8 +1899,7 @@ public class Notification implements Parcelable
mPriority = PRIORITY_DEFAULT;
mPeople = new ArrayList<String>();
- mColorUtil = context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.L ?
- NotificationColorUtil.getInstance() : null;
+ mColorUtil = NotificationColorUtil.getInstance();
}
/**