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

Commit 27893c96 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Only deliver latest WIFI_DISPLAY_STATUS_CHANGED." into udc-dev am: a6e607bf 

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



Change-Id: Ic91e69df05e4674e598d04cf350d91962b9bc219
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1598966e a6e607bf

services/core/java/com/android/server/display/WifiDisplayAdapter.java

+6 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.display;



import android.app.BroadcastOptions;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -421,6 +422,7 @@ final class WifiDisplayAdapter extends DisplayAdapter { 
    // Runs on the handler.

    private void handleSendStatusChangeBroadcast() {

        final Intent intent;

        final BroadcastOptions options;

        synchronized (getSyncRoot()) {

            if (!mPendingStatusChangeBroadcast) {

                return;
@@ -431,10 +433,13 @@ final class WifiDisplayAdapter extends DisplayAdapter { 
            intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

            intent.putExtra(DisplayManager.EXTRA_WIFI_DISPLAY_STATUS,

                    getWifiDisplayStatusLocked());



            options = BroadcastOptions.makeBasic();

            options.setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT);

        }



        // Send protected broadcast about wifi display status to registered receivers.

        getContext().sendBroadcastAsUser(intent, UserHandle.ALL);

        getContext().sendBroadcastAsUser(intent, UserHandle.ALL, null, options.toBundle());

    }



    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {