Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE for CompanionDeviceActivity.setResultAndFinish()" into sc-v2-dev

Browse Source
This commit is contained in:
Evan Chen
2021-11-09 01:09:11 +00:00
committed by Android (Google) Code Review
parent 06a8244cf2 23ee5c2716
commit efea2ad2d9
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
View File

@@ -78,6 +78,7 @@ public class CompanionDeviceActivity extends Activity {
getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
sInstance = this; sInstance = this;
getService().mActivity = this;
String deviceProfile = getRequest().getDeviceProfile(); String deviceProfile = getRequest().getDeviceProfile();
String profilePrivacyDisclaimer = emptyIfNull(getRequest() String profilePrivacyDisclaimer = emptyIfNull(getRequest()
@@ -141,8 +142,6 @@ public class CompanionDeviceActivity extends Activity {
profileSummary.setVisibility(View.GONE); profileSummary.setVisibility(View.GONE);
} }
getService().mActivity = this;
mCancelButton = findViewById(R.id.button_cancel); mCancelButton = findViewById(R.id.button_cancel);
mCancelButton.setOnClickListener(v -> cancel()); mCancelButton.setOnClickListener(v -> cancel());
} }
@@ -194,6 +193,7 @@ public class CompanionDeviceActivity extends Activity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
getService().mActivity = null;
if (sInstance == this) { if (sInstance == this) {
sInstance = null; sInstance = null;
} }

9
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
View File

@@ -258,12 +258,8 @@ public class CompanionDeviceDiscoveryService extends Service {
if (!mIsScanning) return; if (!mIsScanning) return;
mIsScanning = false; mIsScanning = false;
CompanionDeviceActivity activity = mActivity; if (mActivity != null && mActivity.mDeviceListView != null) {
if (activity != null) { mActivity.mDeviceListView.removeFooterView(mActivity.mLoadingIndicator);
if (activity.mDeviceListView != null) {
activity.mDeviceListView.removeFooterView(activity.mLoadingIndicator);
}
mActivity = null;
} }
mBluetoothAdapter.cancelDiscovery(); mBluetoothAdapter.cancelDiscovery();
@@ -337,6 +333,7 @@ public class CompanionDeviceDiscoveryService extends Service {
void onCancel() { void onCancel() {
if (DEBUG) Log.i(LOG_TAG, "onCancel()"); if (DEBUG) Log.i(LOG_TAG, "onCancel()");
mActivity = null;
mServiceCallback.cancel(true); mServiceCallback.cancel(true);
} }