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

Commit 28f3fe36 authored by Neil Fuller's avatar Neil Fuller
Browse files

Switch NetworkTimeUpdateService to internal API 

Switch NetworkTimeUpdateService to using TimeDetectorInternal instead of
the binder API.

The NetworkTimeUpdateService runs in the system server, so it does not
have to use binder to communicate with the time_detector.

Also update NetworkTimeSuggestion to include uncertainty so that it
contains all the information needed for future usecases associated with
GnssLocationProvider.

Bug: 219693030
Bug: 222295093
Test: atest services/tests/servicestests/src/com/android/server/timedetector/
Test: atest services/tests/servicestests/src/com/android/server/timezonedetector/
Test: atest core/tests/coretests/src/android/app/timedetector/
Change-Id: I4665da76429bc333b34769fc362221581472690e
parent 286769a0

core/java/android/app/timedetector/ITimeDetectorService.aidl

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.app.time.TimeCapabilitiesAndConfig; 
import android.app.time.TimeConfiguration;

import android.app.timedetector.GnssTimeSuggestion;

import android.app.timedetector.ManualTimeSuggestion;

import android.app.timedetector.NetworkTimeSuggestion;

import android.app.timedetector.TelephonyTimeSuggestion;

import android.app.timedetector.TimePoint;
@@ -49,7 +48,6 @@ interface ITimeDetectorService { 
  void suggestExternalTime(in ExternalTimeSuggestion timeSuggestion);

  void suggestGnssTime(in GnssTimeSuggestion timeSuggestion);

  boolean suggestManualTime(in ManualTimeSuggestion timeSuggestion);

  void suggestNetworkTime(in NetworkTimeSuggestion timeSuggestion);

  void suggestTelephonyTime(in TelephonyTimeSuggestion timeSuggestion);



  TimePoint latestNetworkTime();

core/java/android/app/timedetector/NetworkTimeSuggestion.aidl

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.app.timedetector;



parcelable NetworkTimeSuggestion;

core/java/android/app/timedetector/NetworkTimeSuggestion.java

deleted100644 → 0
+0 −124
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.app.timedetector;



import android.annotation.NonNull;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.ShellCommand;

import android.os.TimestampedValue;



import java.io.PrintWriter;

import java.util.List;

import java.util.Objects;



/**

 * A time signal from a network time source like NTP.

 *

 * <p>See {@link TimeSuggestionHelper} for property information.

 *

 * @hide

 */

public final class NetworkTimeSuggestion implements Parcelable {



    public static final @NonNull Creator<NetworkTimeSuggestion> CREATOR =

            new Creator<NetworkTimeSuggestion>() {

                public NetworkTimeSuggestion createFromParcel(Parcel in) {

                    TimeSuggestionHelper helper = TimeSuggestionHelper.handleCreateFromParcel(

                            NetworkTimeSuggestion.class, in);

                    return new NetworkTimeSuggestion(helper);

                }



                public NetworkTimeSuggestion[] newArray(int size) {

                    return new NetworkTimeSuggestion[size];

                }

            };



    @NonNull private final TimeSuggestionHelper mTimeSuggestionHelper;



    public NetworkTimeSuggestion(@NonNull TimestampedValue<Long> unixEpochTime) {

        mTimeSuggestionHelper = new TimeSuggestionHelper(

                NetworkTimeSuggestion.class, unixEpochTime);

    }



    private NetworkTimeSuggestion(@NonNull TimeSuggestionHelper helper) {

        mTimeSuggestionHelper = Objects.requireNonNull(helper);

    }



    @Override

    public int describeContents() {

        return 0;

    }



    @Override

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        mTimeSuggestionHelper.handleWriteToParcel(dest, flags);

    }



    @NonNull

    public TimestampedValue<Long> getUnixEpochTime() {

        return mTimeSuggestionHelper.getUnixEpochTime();

    }



    @NonNull

    public List<String> getDebugInfo() {

        return mTimeSuggestionHelper.getDebugInfo();

    }



    /**

     * Associates information with the instance that can be useful for debugging / logging. The

     * information is present in {@link #toString()} but is not considered for {@link

     * #equals(Object)} and {@link #hashCode()}.

     */

    public void addDebugInfo(String... debugInfos) {

        mTimeSuggestionHelper.addDebugInfo(debugInfos);

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) {

            return true;

        }

        if (o == null || getClass() != o.getClass()) {

            return false;

        }

        NetworkTimeSuggestion that = (NetworkTimeSuggestion) o;

        return mTimeSuggestionHelper.handleEquals(that.mTimeSuggestionHelper);

    }



    @Override

    public int hashCode() {

        return mTimeSuggestionHelper.hashCode();

    }



    @Override

    public String toString() {

        return mTimeSuggestionHelper.handleToString();

    }



    /** @hide */

    public static NetworkTimeSuggestion parseCommandLineArg(@NonNull ShellCommand cmd)

            throws IllegalArgumentException {

        return new NetworkTimeSuggestion(

                TimeSuggestionHelper.handleParseCommandLineArg(NetworkTimeSuggestion.class, cmd));

    }



    /** @hide */

    public static void printCommandLineOpts(PrintWriter pw) {

        TimeSuggestionHelper.handlePrintCommandLineOpts(pw, "Network", NetworkTimeSuggestion.class);

    }

}

core/java/android/app/timedetector/TimeDetector.java

+0 −8
Original line number Diff line number Diff line
@@ -112,14 +112,6 @@ public interface TimeDetector { 
    @RequiresPermission(android.Manifest.permission.SUGGEST_MANUAL_TIME_AND_ZONE)

    boolean suggestManualTime(@NonNull ManualTimeSuggestion timeSuggestion);



    /**

     * Suggests the time according to a network time source like NTP.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.SET_TIME)

    void suggestNetworkTime(NetworkTimeSuggestion timeSuggestion);



    /**

     * Suggests the time according to a gnss time source.

     *

core/java/android/app/timedetector/TimeDetectorImpl.java

+0 −12
Original line number Diff line number Diff line
@@ -63,18 +63,6 @@ public final class TimeDetectorImpl implements TimeDetector { 
        }

    }



    @Override

    public void suggestNetworkTime(NetworkTimeSuggestion timeSuggestion) {

        if (DEBUG) {

            Log.d(TAG, "suggestNetworkTime called: " + timeSuggestion);

        }

        try {

            mITimeDetectorService.suggestNetworkTime(timeSuggestion);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @Override

    public void suggestGnssTime(GnssTimeSuggestion timeSuggestion) {

        if (DEBUG) {