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

Merge "Fix NPE in CompanionDeviceServiceConnector" into tm-dev

Browse Source
This commit is contained in:
Sergey Nikolaienkov
2022-03-18 17:45:43 +00:00
committed by Android (Google) Code Review
parent 0de55a3459 6253682e66
commit 2d3584caeb
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java
View File

@@ -51,12 +51,12 @@ class CompanionDeviceServiceConnector extends ServiceConnector.Impl<ICompanionDe
void onBindingDied(@UserIdInt int userId, @NonNull String packageName); void onBindingDied(@UserIdInt int userId, @NonNull String packageName);
} }
@UserIdInt private final @UserIdInt int mUserId;
private final int mUserId; private final @NonNull ComponentName mComponentName;
@NonNull // IMPORTANT: this can (and will!) be null (at the moment, CompanionApplicationController only
private final ComponentName mComponentName; // installs a listener to the primary ServiceConnector), hence we should always null-check the
@Nullable // reference before calling on it.
private Listener mListener; private @Nullable Listener mListener;
/** /**
* Create a CompanionDeviceServiceConnector instance. * Create a CompanionDeviceServiceConnector instance.
@@ -125,7 +125,9 @@ class CompanionDeviceServiceConnector extends ServiceConnector.Impl<ICompanionDe
if (DEBUG) Log.d(TAG, "onBindingDied() " + mComponentName.toShortString()); if (DEBUG) Log.d(TAG, "onBindingDied() " + mComponentName.toShortString());
mListener.onBindingDied(mUserId, mComponentName.getPackageName()); if (mListener != null) {
mListener.onBindingDied(mUserId, mComponentName.getPackageName());
}
} }
@Override @Override