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

Commit 8fbc73c4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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 am: 38c90458

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



Change-Id: I3bb5ff7f5a680724db9abb149f2b1a8276936477
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35cc11ad 38c90458

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -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());

        }

    }