Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38c90458 authored Jun 17, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Jun 17, 2022

Merge "Set adminExtras as an empty persistable bundle if left null in...

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

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

Change-Id: If2bb98a3f8d76b37d4ade77e67c4f2e1fa9eebcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 314393c3 95ac43c8

core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}
	}		}

core/java/android/app/admin/ManagedProfileProvisioningParams.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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());
	}		}
	}		}