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

Commit 64320de1 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Change package of NetworkTimeUpdateService"

parents 1cebcbb5 9bbe9f69

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ 
    <protected-broadcast android:name="com.android.bluetooth.btservice.action.ALARM_WAKEUP" />

    <protected-broadcast android:name="com.android.server.action.NETWORK_STATS_POLL" />

    <protected-broadcast android:name="com.android.server.action.NETWORK_STATS_UPDATED" />

    <protected-broadcast android:name="com.android.server.NetworkTimeUpdateService.action.POLL" />

    <protected-broadcast android:name="com.android.server.timedetector.NetworkTimeUpdateService.action.POLL" />

    <protected-broadcast android:name="com.android.server.telecom.intent.action.CALLS_ADD_ENTRY" />

    <protected-broadcast android:name="com.android.settings.location.MODE_CHANGING" />

    <protected-broadcast android:name="com.android.settings.bluetooth.ACTION_DISMISS_PAIRING" />

services/core/java/com/android/server/NetworkTimeUpdateService.java→services/core/java/com/android/server/timedetector/NetworkTimeUpdateService.java

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.timedetector;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -71,7 +71,7 @@ public class NetworkTimeUpdateService extends Binder { 
    private static final int EVENT_NETWORK_CHANGED = 3;



    private static final String ACTION_POLL =

            "com.android.server.NetworkTimeUpdateService.action.POLL";

            "com.android.server.timedetector.NetworkTimeUpdateService.action.POLL";



    private static final int POLL_REQUEST = 0;

services/core/java/com/android/server/NetworkTimeUpdateServiceShellCommand.java→services/core/java/com/android/server/timedetector/NetworkTimeUpdateServiceShellCommand.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.timedetector;



import android.annotation.NonNull;

import android.os.ShellCommand;

services/java/com/android/server/SystemServer.java

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ import com.android.server.telecom.TelecomLoaderService; 
import com.android.server.testharness.TestHarnessModeService;

import com.android.server.textclassifier.TextClassificationManagerService;

import com.android.server.textservices.TextServicesManagerService;

import com.android.server.timedetector.NetworkTimeUpdateService;

import com.android.server.tracing.TracingServiceProxy;

import com.android.server.trust.TrustManagerService;

import com.android.server.tv.TvInputManagerService;