Merge "Fix NPE for CompanionDeviceActivity.setResultAndFinish()" into sc-v2-dev (efea2ad2) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ public class CompanionDeviceActivity extends Activity {

		getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
		sInstance = this;
		getService().mActivity = this;

		String deviceProfile = getRequest().getDeviceProfile();
		String profilePrivacyDisclaimer = emptyIfNull(getRequest()
		@@ -141,8 +142,6 @@ public class CompanionDeviceActivity extends Activity {
		profileSummary.setVisibility(View.GONE);
		}

		getService().mActivity = this;

		mCancelButton = findViewById(R.id.button_cancel);
		mCancelButton.setOnClickListener(v -> cancel());
		}
		@@ -194,6 +193,7 @@ public class CompanionDeviceActivity extends Activity {
		@Override
		protected void onDestroy() {
		super.onDestroy();
		getService().mActivity = null;
		if (sInstance == this) {
		sInstance = null;
		}

+3 −6

Original line number	Diff line number	Diff line
		@@ -258,12 +258,8 @@ public class CompanionDeviceDiscoveryService extends Service {
		if (!mIsScanning) return;
		mIsScanning = false;

		CompanionDeviceActivity activity = mActivity;
		if (activity != null) {
		if (activity.mDeviceListView != null) {
		activity.mDeviceListView.removeFooterView(activity.mLoadingIndicator);
		}
		mActivity = null;
		if (mActivity != null && mActivity.mDeviceListView != null) {
		mActivity.mDeviceListView.removeFooterView(mActivity.mLoadingIndicator);
		}

		mBluetoothAdapter.cancelDiscovery();
		@@ -337,6 +333,7 @@ public class CompanionDeviceDiscoveryService extends Service {

		void onCancel() {
		if (DEBUG) Log.i(LOG_TAG, "onCancel()");
		mActivity = null;
		mServiceCallback.cancel(true);
		}