diff options
| -rw-r--r-- | core/java/android/app/AlarmManager.java | 5 | ||||
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 8 | ||||
| -rw-r--r-- | core/java/android/os/Looper.java | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java index 92fbd5927244..676baceffb87 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 f7aea978f5d1..57ec17842ff1 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<Configuration protoOutputStream.write(FONT_SCALE, fontScale); protoOutputStream.write(MCC, mcc); protoOutputStream.write(MNC, mnc); - mLocaleList.writeToProto(protoOutputStream, LOCALES); + if (mLocaleList != null) { + mLocaleList.writeToProto(protoOutputStream, LOCALES); + } protoOutputStream.write(SCREEN_LAYOUT, screenLayout); protoOutputStream.write(COLOR_MODE, colorMode); protoOutputStream.write(TOUCHSCREEN, touchscreen); @@ -1111,7 +1113,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration protoOutputStream.write(SCREEN_HEIGHT_DP, screenHeightDp); protoOutputStream.write(SMALLEST_SCREEN_WIDTH_DP, smallestScreenWidthDp); protoOutputStream.write(DENSITY_DPI, densityDpi); - windowConfiguration.writeToProto(protoOutputStream, WINDOW_CONFIGURATION); + if (windowConfiguration != null) { + windowConfiguration.writeToProto(protoOutputStream, WINDOW_CONFIGURATION); + } protoOutputStream.end(token); } diff --git a/core/java/android/os/Looper.java b/core/java/android/os/Looper.java index f17e0f026fda..684a8ee43c87 100644 --- a/core/java/android/os/Looper.java +++ b/core/java/android/os/Looper.java @@ -386,7 +386,9 @@ public final class Looper { final long looperToken = proto.start(fieldId); proto.write(LooperProto.THREAD_NAME, mThread.getName()); proto.write(LooperProto.THREAD_ID, mThread.getId()); - mQueue.writeToProto(proto, LooperProto.QUEUE); + if (mQueue != null) { + mQueue.writeToProto(proto, LooperProto.QUEUE); + } proto.end(looperToken); } |