Prevent against NPE inside ComponentKey
b/31063280 Change-Id: I71254fc1a3244fd6834ebf65923d194f17afc1ba
This commit is contained in:
@@ -32,8 +32,8 @@ public class ComponentKey {
|
||||
private final int mHashCode;
|
||||
|
||||
public ComponentKey(ComponentName componentName, UserHandleCompat user) {
|
||||
assert (componentName != null);
|
||||
assert (user != null);
|
||||
Preconditions.assertNotNull(componentName);
|
||||
Preconditions.assertNotNull(user);
|
||||
this.componentName = componentName;
|
||||
this.user = user;
|
||||
mHashCode = Arrays.hashCode(new Object[] {componentName, user});
|
||||
@@ -58,6 +58,8 @@ public class ComponentKey {
|
||||
componentName = ComponentName.unflattenFromString(componentKeyStr);
|
||||
user = UserHandleCompat.myUserHandle();
|
||||
}
|
||||
Preconditions.assertNotNull(componentName);
|
||||
Preconditions.assertNotNull(user);
|
||||
mHashCode = Arrays.hashCode(new Object[] {componentName, user});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user