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

Commit 11c6e77c authored by Raphael Kim's avatar Raphael Kim Committed by Android (Google) Code Review
Browse files

Merge "[CDM] Prevent NPE when CompanionAssociationActivity is destroyed by... 

Merge "[CDM] Prevent NPE when CompanionAssociationActivity is destroyed by user cancellation before `onStart()` is called." into main
parents ab6ce1d8 ec229e79

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements 
    }



    private void stopDiscovery() {

        if (!mRequest.isSelfManaged()) {

        if (mRequest != null && !mRequest.isSelfManaged()) {

            CompanionDeviceDiscoveryService.stop(this);

        }

    }