commit 9fc8356baa7816a13e0c140788ccf67301cbd28d
author Selim Gurun <sgurun@android.com> Mon Mar 02 23:02:11 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 02 23:02:11 2015 +0000
tree b9fa894657d0136a3fb85ecd11e11e28ec5f531e
parent a891d08dad829c9aacd29bd2c3b36debe3fc1cc3
parent 37bd8907cb94be69c9bd4c308e49c38524e87269

Merge "Add potential future APIs for postmessage"

core/java/android/widget/DatePickerCalendarDelegate.java

diff --git a/core/java/android/widget/DatePickerCalendarDelegate.java b/core/java/android/widget/DatePickerCalendarDelegate.java
old mode 100644
new mode 100755
index e71b383..69a2b06
--- a/core/java/android/widget/DatePickerCalendarDelegate.java
+++ b/core/java/android/widget/DatePickerCalendarDelegate.java
@@ -114,8 +114,8 @@
         mTempDate = getCalendarForLocale(mMaxDate, locale);
         mCurrentDate = getCalendarForLocale(mCurrentDate, locale);
 
-        mMinDate.set(DEFAULT_START_YEAR, 1, 1);
-        mMaxDate.set(DEFAULT_END_YEAR, 12, 31);
+        mMinDate.set(DEFAULT_START_YEAR, Calendar.JANUARY, 1);
+        mMaxDate.set(DEFAULT_END_YEAR, Calendar.DECEMBER, 31);
 
         final Resources res = mDelegator.getResources();
         final TypedArray a = mContext.obtainStyledAttributes(attrs,

core/jni/android_util_EventLog.cpp

diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index 6c95b8a..5cb8b2e 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -188,6 +188,10 @@
             break;
         }
 
+        if (log_msg.id() != LOG_ID_EVENTS) {
+            continue;
+        }
+
         int32_t tag = * (int32_t *) log_msg.msg();
 
         int found = 0;