From 3c2682af4e9e7896b01352794ab65d77991a2bf5 Mon Sep 17 00:00:00 2001
From: Yan Zhu <yanzhuyan@google.com>
Date: Fri, 26 Jun 2020 09:04:24 -0700
Subject: [PATCH] Do not lock headless system user 0 data

Bug: 161541858
Test: manual with EmbeddedKitchenSinkApp; lock user 0 should return
IllegalArgumentException

Change-Id: Idd707f217c063a1fcb963e2b9c67435dd554a51d
---
 .../core/java/com/android/server/StorageManagerService.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 816d663e09de4..1520dd351c978 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -3238,6 +3238,12 @@ class StorageManagerService extends IStorageManager.Stub
 
     @Override
     public void lockUserKey(int userId) {
+        //  Do not lock user 0 data for headless system user
+        if (userId == UserHandle.USER_SYSTEM
+                && UserManager.isHeadlessSystemUserMode()) {
+            throw new IllegalArgumentException("Headless system user data cannot be locked..");
+        }
+
         enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);
 
         try {