Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always synchronize the OEM unlock allowed bit to the FRP partition

Browse Source 
am: 2257fda563

Change-Id: Iaa6299176ab871c41022c499f57e693ce3f36c96
This commit is contained in:
Rubin Xu
2017-10-09 16:50:30 +00:00
committed by android-build-merger
parent 133837a79c 2257fda563
commit 906026f14a
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/oemlock/OemLockService.java
View File

@@ -31,6 +31,7 @@ import android.os.UserManager;
import android.os.UserManagerInternal; import android.os.UserManagerInternal;
import android.os.UserManagerInternal.UserRestrictionsListener; import android.os.UserManagerInternal.UserRestrictionsListener;
import android.service.oemlock.IOemLockService; import android.service.oemlock.IOemLockService;
import android.service.persistentdata.PersistentDataBlockManager;
import android.util.Slog; import android.util.Slog;
import com.android.server.LocalServices; import com.android.server.LocalServices;
@@ -98,6 +99,7 @@ public class OemLockService extends SystemService {
!newRestrictions.getBoolean(UserManager.DISALLOW_FACTORY_RESET); !newRestrictions.getBoolean(UserManager.DISALLOW_FACTORY_RESET);
if (!unlockAllowedByAdmin) { if (!unlockAllowedByAdmin) {
mOemLock.setOemUnlockAllowedByDevice(false); mOemLock.setOemUnlockAllowedByDevice(false);
setPersistentDataBlockOemUnlockAllowedBit(false);
} }
} }
} }
@@ -158,6 +160,7 @@ public class OemLockService extends SystemService {
} }
mOemLock.setOemUnlockAllowedByDevice(allowedByUser); mOemLock.setOemUnlockAllowedByDevice(allowedByUser);
setPersistentDataBlockOemUnlockAllowedBit(allowedByUser);
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }
@@ -202,6 +205,20 @@ public class OemLockService extends SystemService {
} }
}; };
/**
* Always synchronize the OemUnlockAllowed bit to the FRP partition, which
* is used to erase FRP information on a unlockable device.
*/
private void setPersistentDataBlockOemUnlockAllowedBit(boolean allowed) {
final PersistentDataBlockManager pdbm = (PersistentDataBlockManager)
mContext.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
// if mOemLock is PersistentDataBlockLock, then the bit should have already been set
if (pdbm != null && !(mOemLock instanceof PersistentDataBlockLock)) {
Slog.i(TAG, "Update OEM Unlock bit in pst partition to " + allowed);
pdbm.setOemUnlockEnabled(allowed);
}
}
private boolean isOemUnlockAllowedByAdmin() { private boolean isOemUnlockAllowedByAdmin() {
return !UserManager.get(mContext) return !UserManager.get(mContext)
.hasUserRestriction(UserManager.DISALLOW_FACTORY_RESET, UserHandle.SYSTEM); .hasUserRestriction(UserManager.DISALLOW_FACTORY_RESET, UserHandle.SYSTEM);