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

Commit 21c7153d authored by Jeff Brown's avatar Jeff Brown
Browse files

Disable wifi display API when the adapter is not registered. 

Bug: 7132341
Change-Id: I46d859082077afd2c8adc829ad285977dff80d07
parent a3909a93

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

+0 −7
Original line number Diff line number Diff line
@@ -22,18 +22,15 @@ import android.bluetooth.BluetoothAdapter.BluetoothStateChangeCallback; 
import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.CursorLoader;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.Loader;

import android.content.res.Resources;

import android.database.Cursor;

import android.database.DataSetObserver;

import android.graphics.drawable.ClipDrawable;

import android.hardware.display.DisplayManager;

import android.hardware.display.WifiDisplay;

import android.hardware.display.WifiDisplayStatus;

import android.hardware.input.KeyboardLayout;

import android.net.Uri;

import android.provider.ContactsContract;

import android.provider.Settings;
@@ -44,12 +41,8 @@ import android.view.WindowManager; 
import android.widget.AdapterView;

import android.widget.ArrayAdapter;

import android.widget.Button;

import android.widget.CheckedTextView;

import android.widget.ListView;

import android.widget.RadioButton;

import android.widget.TextView;

import android.widget.Toast;

import android.widget.ListAdapter;



import java.util.ArrayList;

import java.util.Comparator;

services/java/com/android/server/display/DisplayManagerService.java

+14 −4
Original line number Diff line number Diff line
@@ -352,8 +352,10 @@ public final class DisplayManagerService extends IDisplayManager.Stub { 
        final long token = Binder.clearCallingIdentity();

        try {

            synchronized (mSyncRoot) {

                if (mWifiDisplayAdapter != null) {

                    mWifiDisplayAdapter.requestScanLocked();

                }

            }

        } finally {

            Binder.restoreCallingIdentity(token);

        }
@@ -372,8 +374,10 @@ public final class DisplayManagerService extends IDisplayManager.Stub { 
        final long token = Binder.clearCallingIdentity();

        try {

            synchronized (mSyncRoot) {

                if (mWifiDisplayAdapter != null) {

                    mWifiDisplayAdapter.requestConnectLocked(address);

                }

            }

        } finally {

            Binder.restoreCallingIdentity(token);

        }
@@ -389,8 +393,10 @@ public final class DisplayManagerService extends IDisplayManager.Stub { 
        final long token = Binder.clearCallingIdentity();

        try {

            synchronized (mSyncRoot) {

                if (mWifiDisplayAdapter != null) {

                    mWifiDisplayAdapter.requestDisconnectLocked();

                }

            }

        } finally {

            Binder.restoreCallingIdentity(token);

        }
@@ -406,7 +412,11 @@ public final class DisplayManagerService extends IDisplayManager.Stub { 
        final long token = Binder.clearCallingIdentity();

        try {

            synchronized (mSyncRoot) {

                if (mWifiDisplayAdapter != null) {

                    return mWifiDisplayAdapter.getWifiDisplayStatusLocked();

                } else {

                    return new WifiDisplayStatus();

                }

            }

        } finally {

            Binder.restoreCallingIdentity(token);