Disable wifi display API when the adapter is not registered.
Bug: 7132341
Change-Id: I46d859082077afd2c8adc829ad285977dff80d07
diff --git a/services/java/com/android/server/display/DisplayManagerService.java b/services/java/com/android/server/display/DisplayManagerService.java
index e11d454..39f2418 100644
--- a/services/java/com/android/server/display/DisplayManagerService.java
+++ b/services/java/com/android/server/display/DisplayManagerService.java
@@ -352,7 +352,9 @@
final long token = Binder.clearCallingIdentity();
try {
synchronized (mSyncRoot) {
- mWifiDisplayAdapter.requestScanLocked();
+ if (mWifiDisplayAdapter != null) {
+ mWifiDisplayAdapter.requestScanLocked();
+ }
}
} finally {
Binder.restoreCallingIdentity(token);
@@ -372,7 +374,9 @@
final long token = Binder.clearCallingIdentity();
try {
synchronized (mSyncRoot) {
- mWifiDisplayAdapter.requestConnectLocked(address);
+ if (mWifiDisplayAdapter != null) {
+ mWifiDisplayAdapter.requestConnectLocked(address);
+ }
}
} finally {
Binder.restoreCallingIdentity(token);
@@ -389,7 +393,9 @@
final long token = Binder.clearCallingIdentity();
try {
synchronized (mSyncRoot) {
- mWifiDisplayAdapter.requestDisconnectLocked();
+ if (mWifiDisplayAdapter != null) {
+ mWifiDisplayAdapter.requestDisconnectLocked();
+ }
}
} finally {
Binder.restoreCallingIdentity(token);
@@ -406,7 +412,11 @@
final long token = Binder.clearCallingIdentity();
try {
synchronized (mSyncRoot) {
- return mWifiDisplayAdapter.getWifiDisplayStatusLocked();
+ if (mWifiDisplayAdapter != null) {
+ return mWifiDisplayAdapter.getWifiDisplayStatusLocked();
+ } else {
+ return new WifiDisplayStatus();
+ }
}
} finally {
Binder.restoreCallingIdentity(token);