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

Commit d3adef06 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Gerrit Code Review
Browse files

Merge "Expose ACTION_NETWORK_SET_TIME as system API"

parents f5b6267d e477e36f

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8992,6 +8992,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String);

    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED";

    field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";

    field public static final String ACTION_NETWORK_SET_TIME = "android.telephony.action.NETWORK_SET_TIME";

    field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";

    field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";

    field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ 


    <!-- NETWORK_SET_TIME moved from com.android.phone to system server. It should ultimately be

         removed. -->

    <protected-broadcast android:name="android.intent.action.NETWORK_SET_TIME" />

    <protected-broadcast android:name="android.telephony.action.NETWORK_SET_TIME" />



    <!-- For tether entitlement recheck-->

    <protected-broadcast

services/core/java/com/android/server/NetworkTimeUpdateServiceImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ import android.os.Message; 
import android.os.PowerManager;

import android.os.SystemClock;

import android.provider.Settings;

import android.telephony.TelephonyManager;

import android.util.Log;

import android.util.NtpTrustedTime;

import android.util.TimeUtils;



import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.util.DumpUtils;



import java.io.FileDescriptor;
@@ -137,7 +137,7 @@ public class NetworkTimeUpdateServiceImpl extends Binder implements NetworkTimeU 


    private void registerForTelephonyIntents() {

        IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(TelephonyIntents.ACTION_NETWORK_SET_TIME);

        intentFilter.addAction(TelephonyManager.ACTION_NETWORK_SET_TIME);

        mContext.registerReceiver(mNitzReceiver, intentFilter);

    }
@@ -247,7 +247,7 @@ public class NetworkTimeUpdateServiceImpl extends Binder implements NetworkTimeU 
        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();

            if (DBG) Log.d(TAG, "Received " + action);

            if (TelephonyIntents.ACTION_NETWORK_SET_TIME.equals(action)) {

            if (TelephonyManager.ACTION_NETWORK_SET_TIME.equals(action)) {

                mNitzTimeSetTime = SystemClock.elapsedRealtime();

            }

        }

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

+3 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.AlarmManager; 
import android.app.timedetector.ManualTimeSuggestion;

import android.app.timedetector.PhoneTimeSuggestion;

import android.content.Intent;

import android.telephony.TelephonyManager;

import android.util.ArrayMap;

import android.util.LocalLog;

import android.util.Slog;
@@ -30,7 +31,6 @@ import android.util.TimestampedValue; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.util.IndentingPrintWriter;



import java.io.PrintWriter;
@@ -512,12 +512,12 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy { 
            mLastAutoSystemClockTimeSet = null;

        }



        // Historically, Android has sent a TelephonyIntents.ACTION_NETWORK_SET_TIME broadcast only

        // Historically, Android has sent a TelephonyManager.ACTION_NETWORK_SET_TIME broadcast only

        // when setting the time using NITZ.

        if (origin == ORIGIN_PHONE) {

            // Send a broadcast that telephony code used to send after setting the clock.

            // TODO Remove this broadcast as soon as there are no remaining listeners.

            Intent intent = new Intent(TelephonyIntents.ACTION_NETWORK_SET_TIME);

            Intent intent = new Intent(TelephonyManager.ACTION_NETWORK_SET_TIME);

            intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

            intent.putExtra("time", newSystemClockMillis);

            mCallback.sendStickyBroadcast(intent);

telephony/java/android/telephony/TelephonyManager.java

+20 −0
Original line number Diff line number Diff line
@@ -1462,6 +1462,26 @@ public class TelephonyManager { 
     */

    public static final String EXTRA_SIM_COMBINATION_NAMES =

            "android.telephony.extra.SIM_COMBINATION_NAMES";



    /**

     * Broadcast Action: The time was set by the carrier (typically by the NITZ string).

     * This is a sticky broadcast.

     * The intent will have the following extra values:</p>

     * <ul>

     *   <li><em>time</em> - The time as a long in UTC milliseconds.</li>

     * </ul>

     *

     * <p class="note">

     * Requires the READ_PHONE_STATE permission.

     *

     * <p class="note">This is a protected intent that can only be sent

     * by the system.

     *

     * @hide

     */

    @SystemApi

    public static final String ACTION_NETWORK_SET_TIME = "android.telephony.action.NETWORK_SET_TIME";



    //

    //

    // Device Info