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

Commit 26633c8c authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Headless: fix system update notification" into udc-dev

parents 67f0bb43 14082427

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −5
Original line number Diff line number Diff line
@@ -16547,11 +16547,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                hasCallingOrSelfPermission(permission.NOTIFY_PENDING_SYSTEM_UPDATE),

                "Only the system update service can broadcast update information");













        if (UserHandle.getCallingUserId() != UserHandle.USER_SYSTEM) {













            Slogf.w(LOG_TAG, "Only the system update service in the system user can broadcast "













        mInjector.binderWithCleanCallingIdentity(() -> {













            if (!mUserManager.getUserInfo(UserHandle.getCallingUserId()).isMain()) {













                Slogf.w(LOG_TAG, "Only the system update service in the main user can broadcast "















                        + "update information.");















                return;















            }













        });





























        if (!mOwners.saveSystemUpdateInfo(info)) {















            // Pending system update hasn't changed, don't send duplicate notification.