diff options
author | 2025-02-24 11:39:42 -0800 | |
---|---|---|
committer | 2025-02-24 11:39:42 -0800 | |
commit | ec229e79d62fee26dc3caf611f083af7a0fcef8c (patch) | |
tree | 959780f70f3de96b743ef165740a375916e10b73 | |
parent | b9a9cd5f30df9994e4e3eb7e10cb7820f3fe4f6f (diff) |
[CDM] Prevent NPE when CompanionAssociationActivity is destroyed by user cancellation before `onStart()` is called.
Bug: 396616085
Change-Id: I2eebef54ef7a5467f81a62b5076188ceba1d6c56
Test: m
Flag: EXEMPT bug fix
-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); } } |