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

Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev am: 95ac43c8bd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799650

Change-Id: Ia2e250a28117690c24384272a0940def19f8d9a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-17 19:29:13 +00:00
committed by Automerger Merge Worker
parent df9326f6d2 95ac43c8bd
commit 0a6bc03b73
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java
View File

@@ -301,6 +301,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
* Sets a {@link PersistableBundle} that contains admin-specific extras. * Sets a {@link PersistableBundle} that contains admin-specific extras.
*/ */
@NonNull @NonNull
//TODO(b/235783053) The adminExtras parameter is actually @Nullable.
public Builder setAdminExtras(@NonNull PersistableBundle adminExtras) { public Builder setAdminExtras(@NonNull PersistableBundle adminExtras) {
mAdminExtras = adminExtras != null mAdminExtras = adminExtras != null
? new PersistableBundle(adminExtras) ? new PersistableBundle(adminExtras)
@@ -333,7 +334,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable {
mLocalTime, mLocalTime,
mLocale, mLocale,
mDeviceOwnerCanGrantSensorsPermissions, mDeviceOwnerCanGrantSensorsPermissions,
mAdminExtras, mAdminExtras != null ? mAdminExtras : new PersistableBundle(),
mDemoDevice); mDemoDevice);
} }
} }

3
core/java/android/app/admin/ManagedProfileProvisioningParams.java
View File

@@ -252,6 +252,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable {
* Sets a {@link Bundle} that contains admin-specific extras. * Sets a {@link Bundle} that contains admin-specific extras.
*/ */
@NonNull @NonNull
//TODO(b/235783053) The adminExtras parameter is actually @Nullable.
public Builder setAdminExtras(@NonNull PersistableBundle adminExtras) { public Builder setAdminExtras(@NonNull PersistableBundle adminExtras) {
mAdminExtras = adminExtras != null mAdminExtras = adminExtras != null
? new PersistableBundle(adminExtras) ? new PersistableBundle(adminExtras)
@@ -274,7 +275,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable {
mLeaveAllSystemAppsEnabled, mLeaveAllSystemAppsEnabled,
mOrganizationOwnedProvisioning, mOrganizationOwnedProvisioning,
mKeepingAccountOnMigration, mKeepingAccountOnMigration,
mAdminExtras); mAdminExtras != null ? mAdminExtras : new PersistableBundle());
} }
} }