Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb am: 3aee5e1ad0

am: 86535a3d15

Change-Id: Ia6f34a3cf6e9b64669ca494c5088791ae5021092
This commit is contained in:
Jian Zhou
2017-07-27 18:26:35 +00:00
committed by android-build-merger

View File

@@ -198,6 +198,10 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
*/ */
private void loadPermissionsStates(SparseArray<ArrayMap<String, PermissionState>> entries) { private void loadPermissionsStates(SparseArray<ArrayMap<String, PermissionState>> entries) {
// Load the packages that have been granted the permission specified in mPermission. // Load the packages that have been granted the permission specified in mPermission.
if (entries == null) {
return;
}
try { try {
for (final UserHandle profile : mProfiles) { for (final UserHandle profile : mProfiles) {
final int profileId = profile.getIdentifier(); final int profileId = profile.getIdentifier();