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

Commit f0660788 authored by Xiaohui Chen's avatar Xiaohui Chen
Browse files

Cleanup USER_OWNER in PDB Service 

This assumes that the calling uid is always from user 0, even in split
system user mode.

Bug: 19913735
Change-Id: I99b6a0ca534ac1627c1abb8609c92ff74a5aeabf
parent 3403b744

services/core/java/com/android/server/PersistentDataBlockService.java

+9 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.os.IBinder; 
import android.os.RemoteException;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.service.persistentdata.IPersistentDataBlockService;

import android.util.Slog;
@@ -84,7 +85,7 @@ public class PersistentDataBlockService extends SystemService { 
        mContext = context;

        mDataBlockFile = SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP);

        mBlockDeviceSize = -1; // Load lazily

        mAllowedUid = getAllowedUid(UserHandle.USER_OWNER);

        mAllowedUid = getAllowedUid(UserHandle.USER_SYSTEM);

    }



    private int getAllowedUid(int userHandle) {
@@ -131,9 +132,12 @@ public class PersistentDataBlockService extends SystemService { 
        }

    }



    private void enforceIsOwner() {

        if (!Binder.getCallingUserHandle().isOwner()) {

            throw new SecurityException("Only the Owner is allowed to change OEM unlock state");

    private void enforceIsAdmin() {

        final int userId = UserHandle.getCallingUserId();

        final boolean isAdmin = UserManager.get(mContext).isUserAdmin(userId);

        if (!isAdmin) {

            throw new SecurityException(

                    "Only the Admin user is allowed to change OEM unlock state");

        }

    }

    private int getTotalDataSizeLocked(DataInputStream inputStream) throws IOException {
@@ -434,7 +438,7 @@ public class PersistentDataBlockService extends SystemService { 
                return;

            }

            enforceOemUnlockPermission();

            enforceIsOwner();

            enforceIsAdmin();



            synchronized (mLock) {

                doSetOemUnlockEnabledLocked(enabled);