OSDN Git Service

Fix NPE when serializing roles.xml and add nullability annotations.
authorHai Zhang <zhanghai@google.com>
Mon, 3 Dec 2018 23:41:11 +0000 (15:41 -0800)
committerHai Zhang <zhanghai@google.com>
Tue, 4 Dec 2018 20:55:55 +0000 (12:55 -0800)
commit458cedbe65401c02e0b1940346359786a47e9512
tree3b5d41aada41d94f8beaf72223942b0deb500018
parent3af0f3a7c33454b7847a64a7c1ea550e4dbe9432
Fix NPE when serializing roles.xml and add nullability annotations.

This change fixes the NPE when serializing roles.xml if package hash
is null, and added the missing nullability annotations in role manager
service to make things clear and let the IDE warn.

Bug: 110557011
Test: manual
Change-Id: I27b5942ff6091414c527d7d337d7d01218e88fb0
services/core/java/com/android/server/role/RoleManagerService.java
services/core/java/com/android/server/role/RoleManagerShellCommand.java
services/core/java/com/android/server/role/RoleUserState.java