Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable wifi display API when the adapter is not registered." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Brown
2012-09-09 13:29:19 -07:00
committed by Android (Google) Code Review
parent 25c925e665 21c7153d30
commit fdb5bd261d
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,18 +22,15 @@ import android.bluetooth.BluetoothAdapter.BluetoothStateChangeCallback;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.CursorLoader; import android.content.CursorLoader;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.Loader; import android.content.Loader;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.Cursor; import android.database.Cursor;
import android.database.DataSetObserver;
import android.graphics.drawable.ClipDrawable; import android.graphics.drawable.ClipDrawable;
import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager;
import android.hardware.display.WifiDisplay; import android.hardware.display.WifiDisplay;
import android.hardware.display.WifiDisplayStatus; import android.hardware.display.WifiDisplayStatus;
import android.hardware.input.KeyboardLayout;
import android.net.Uri; import android.net.Uri;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.provider.Settings; import android.provider.Settings;
@@ -44,12 +41,8 @@ import android.view.WindowManager;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.CheckedTextView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.RadioButton;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import android.widget.ListAdapter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;

18
services/java/com/android/server/display/DisplayManagerService.java
View File

@@ -352,7 +352,9 @@ public final class DisplayManagerService extends IDisplayManager.Stub {
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
synchronized (mSyncRoot) { synchronized (mSyncRoot) {
mWifiDisplayAdapter.requestScanLocked(); if (mWifiDisplayAdapter != null) {
mWifiDisplayAdapter.requestScanLocked();
}
} }
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
@@ -372,7 +374,9 @@ public final class DisplayManagerService extends IDisplayManager.Stub {
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
synchronized (mSyncRoot) { synchronized (mSyncRoot) {
mWifiDisplayAdapter.requestConnectLocked(address); if (mWifiDisplayAdapter != null) {
mWifiDisplayAdapter.requestConnectLocked(address);
}
} }
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
@@ -389,7 +393,9 @@ public final class DisplayManagerService extends IDisplayManager.Stub {
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
synchronized (mSyncRoot) { synchronized (mSyncRoot) {
mWifiDisplayAdapter.requestDisconnectLocked(); if (mWifiDisplayAdapter != null) {
mWifiDisplayAdapter.requestDisconnectLocked();
}
} }
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
@@ -406,7 +412,11 @@ public final class DisplayManagerService extends IDisplayManager.Stub {
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
synchronized (mSyncRoot) { synchronized (mSyncRoot) {
return mWifiDisplayAdapter.getWifiDisplayStatusLocked(); if (mWifiDisplayAdapter != null) {
return mWifiDisplayAdapter.getWifiDisplayStatusLocked();
} else {
return new WifiDisplayStatus();
}
} }
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);