diff options
| -rw-r--r-- | core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java | 3 | ||||
| -rw-r--r-- | core/java/android/app/admin/ManagedProfileProvisioningParams.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java b/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java index 49992452df86..ca00154ab336 100644 --- a/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java +++ b/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java @@ -301,6 +301,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { * Sets a {@link PersistableBundle} that contains admin-specific extras. */ @NonNull + //TODO(b/235783053) The adminExtras parameter is actually @Nullable. public Builder setAdminExtras(@NonNull PersistableBundle adminExtras) { mAdminExtras = adminExtras != null ? new PersistableBundle(adminExtras) @@ -333,7 +334,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { mLocalTime, mLocale, mDeviceOwnerCanGrantSensorsPermissions, - mAdminExtras, + mAdminExtras != null ? mAdminExtras : new PersistableBundle(), mDemoDevice); } } diff --git a/core/java/android/app/admin/ManagedProfileProvisioningParams.java b/core/java/android/app/admin/ManagedProfileProvisioningParams.java index f91d60a6a9fa..474f7859788b 100644 --- a/core/java/android/app/admin/ManagedProfileProvisioningParams.java +++ b/core/java/android/app/admin/ManagedProfileProvisioningParams.java @@ -252,6 +252,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable { * Sets a {@link Bundle} that contains admin-specific extras. */ @NonNull + //TODO(b/235783053) The adminExtras parameter is actually @Nullable. public Builder setAdminExtras(@NonNull PersistableBundle adminExtras) { mAdminExtras = adminExtras != null ? new PersistableBundle(adminExtras) @@ -274,7 +275,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable { mLeaveAllSystemAppsEnabled, mOrganizationOwnedProvisioning, mKeepingAccountOnMigration, - mAdminExtras); + mAdminExtras != null ? mAdminExtras : new PersistableBundle()); } } |