diff options
| -rw-r--r-- | packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java index 572fc3661f1c..31131297553e 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java @@ -452,7 +452,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements } private void stopDiscovery() { - if (!mRequest.isSelfManaged()) { + if (mRequest != null && !mRequest.isSelfManaged()) { CompanionDeviceDiscoveryService.stop(this); } } |