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

Commit 95ac43c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 916e42bd 498fb25f

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());

        }

        }

    }

    }