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

Commit 887234b1 authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Stop blocking broadcast receiver thread" into udc-dev am: 2ea28e4c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21866679



Change-Id: Ib074d18db787c280ce41149deaa75edb94e64aea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0503075a 2ea28e4c

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

+22 −14
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.database.ContentObserver;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.NetworkCallback;

import android.net.Network;

import android.os.Binder;

import android.os.Handler;
@@ -140,20 +139,12 @@ public class NetworkTimeUpdateService extends Binder { 
    /** Initialize the receivers and initiate the first NTP request */

    public void systemRunning() {

        // Listen for scheduled refreshes.

        mContext.registerReceiver(

                new BroadcastReceiver() {

                    @Override

                    public void onReceive(Context context, Intent intent) {

                        onPollNetworkTime("scheduled refresh");

                    }

                },

                new IntentFilter(ACTION_POLL),

                /*broadcastPermission=*/ null,

                mHandler);

        ScheduledRefreshBroadcastReceiver receiver = new ScheduledRefreshBroadcastReceiver();

        mContext.registerReceiver(receiver, new IntentFilter(ACTION_POLL));



        // Listen for network connectivity changes.

        NetworkTimeUpdateCallback networkTimeUpdateCallback = new NetworkTimeUpdateCallback();

        mCM.registerDefaultNetworkCallback(networkTimeUpdateCallback, mHandler);

        NetworkConnectivityCallback networkConnectivityCallback = new NetworkConnectivityCallback();

        mCM.registerDefaultNetworkCallback(networkConnectivityCallback, mHandler);



        // Listen for user settings changes.

        ContentResolver resolver = mContext.getContentResolver();
@@ -223,8 +214,25 @@ public class NetworkTimeUpdateService extends Binder { 
        }

    }



    private class ScheduledRefreshBroadcastReceiver extends BroadcastReceiver implements Runnable {



        @Override

        public void onReceive(Context context, Intent intent) {

            // The BroadcastReceiver has to complete quickly or an ANR will be triggered by the

            // platform regardless of the receiver thread used. Instead of blocking the receiver

            // thread, the long-running / blocking work is posted to mHandler to allow onReceive()

            // to return immediately.

            mHandler.post(this);

        }



        @Override

        public void run() {

            onPollNetworkTime("scheduled refresh");

        }

    }



    // All callbacks will be invoked using mHandler because of how the callback is registered.

    private class NetworkTimeUpdateCallback extends NetworkCallback {

    private class NetworkConnectivityCallback extends ConnectivityManager.NetworkCallback {

        @Override

        public void onAvailable(@NonNull Network network) {

            Log.d(TAG, String.format("New default network %s; checking time.", network));