Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dfaccfc authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Handle multiple phoneIds in time detection" am: 51c61e8b am: 1602545f am: 161d1764 

Change-Id: I49c060f1369d382f82d91f729d8fd099d4a217d4
parents 1bafcb69 161d1764

core/java/android/app/timedetector/ManualTimeSuggestion.java

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public final class ManualTimeSuggestion implements Parcelable { 


    public ManualTimeSuggestion(@NonNull TimestampedValue<Long> utcTime) {

        mUtcTime = Objects.requireNonNull(utcTime);

        Objects.requireNonNull(utcTime.getValue());

    }



    private static ManualTimeSuggestion createFromParcel(Parcel in) {

core/java/android/app/timedetector/PhoneTimeSuggestion.java

+6 −1
Original line number Diff line number Diff line
@@ -166,7 +166,12 @@ public final class PhoneTimeSuggestion implements Parcelable { 
        }



        /** Returns the builder for call chaining. */

        public Builder setUtcTime(TimestampedValue<Long> utcTime) {

        public Builder setUtcTime(@Nullable TimestampedValue<Long> utcTime) {

            if (utcTime != null) {

                // utcTime can be null, but the value it holds cannot.

                Objects.requireNonNull(utcTime.getValue());

            }



            mUtcTime = utcTime;

            return this;

        }

services/core/java/com/android/server/timedetector/SimpleTimeDetectorStrategy.java

+362 −126

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/timedetector/SimpleTimeDetectorStrategyTest.java

+313 −216

File changed.

Preview size limit exceeded, changes collapsed.