diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java index 92fbd5927244d..676baceffb874 100644 --- a/core/java/android/app/AlarmManager.java +++ b/core/java/android/app/AlarmManager.java @@ -29,7 +29,6 @@ import android.os.Handler; import android.os.Parcel; import android.os.Parcelable; import android.os.RemoteException; -import android.os.UserHandle; import android.os.WorkSource; import android.text.TextUtils; import android.util.ArrayMap; @@ -1150,7 +1149,9 @@ public class AlarmManager { public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); proto.write(AlarmClockInfoProto.TRIGGER_TIME_MS, mTriggerTime); - mShowIntent.writeToProto(proto, AlarmClockInfoProto.SHOW_INTENT); + if (mShowIntent != null) { + mShowIntent.writeToProto(proto, AlarmClockInfoProto.SHOW_INTENT); + } proto.end(token); } } diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index f7aea978f5d12..57ec17842ff14 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -1096,7 +1096,9 @@ public final class Configuration implements Parcelable, Comparable