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

Commit 875ad7f2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove android.telephony.action.NETWORK_SET_TIME" am: 99d116cb am: ed18df1b 

Change-Id: Ida91bfe0fef7ec594a1a953ada969e34440ad868
parents 803fd24c ed18df1b

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -9232,7 +9232,6 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -637,10 +637,6 @@ 


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



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

         removed. -->

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



    <!-- For tether entitlement recheck-->

    <protected-broadcast

        android:name="com.android.server.connectivity.tethering.PROVISIONING_RECHECK_ALARM" />

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

+0 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.annotation.Nullable; 
import android.app.timedetector.ManualTimeSuggestion;

import android.app.timedetector.NetworkTimeSuggestion;

import android.app.timedetector.PhoneTimeSuggestion;

import android.content.Intent;

import android.os.TimestampedValue;



import java.io.PrintWriter;
@@ -73,9 +72,6 @@ public interface TimeDetectorStrategy { 


        /** Release the wake lock acquired by a call to {@link #acquireWakeLock()}. */

        void releaseWakeLock();



        /** Send the supplied intent as a stick broadcast. */

        void sendStickyBroadcast(@NonNull Intent intent);

    }



    /** Initialize the strategy. */

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

+0 −7
Original line number Diff line number Diff line
@@ -20,11 +20,9 @@ import android.annotation.NonNull; 
import android.app.AlarmManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.os.PowerManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.Slog;
@@ -112,11 +110,6 @@ public final class TimeDetectorStrategyCallbackImpl implements TimeDetectorStrat 
        mWakeLock.release();

    }



    @Override

    public void sendStickyBroadcast(@NonNull Intent intent) {

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }



    private void checkWakeLockHeld() {

        if (!mWakeLock.isHeld()) {

            Slog.wtf(TAG, "WakeLock " + mWakeLock + " not held");

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

+0 −13
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ import android.app.AlarmManager; 
import android.app.timedetector.ManualTimeSuggestion;

import android.app.timedetector.NetworkTimeSuggestion;

import android.app.timedetector.PhoneTimeSuggestion;

import android.content.Intent;

import android.os.TimestampedValue;

import android.telephony.TelephonyManager;

import android.util.LocalLog;

import android.util.Slog;
@@ -535,17 +533,6 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy { 
        } else {

            mLastAutoSystemClockTimeSet = null;

        }



        // 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(TelephonyManager.ACTION_NETWORK_SET_TIME);

            intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

            intent.putExtra("time", newSystemClockMillis);

            mCallback.sendStickyBroadcast(intent);

        }

    }



    /**