Merge "Revert changes for disallowing user to run in background for now."
diff --git a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
index d1ecf13..2d8ea5d 100644
--- a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
+++ b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
@@ -63,8 +63,7 @@
* Default set of restrictions for Non-Admin users.
*/
private static final Set<String> DEFAULT_NON_ADMIN_RESTRICTIONS = Sets.newArraySet(
- UserManager.DISALLOW_FACTORY_RESET,
- UserManager.DISALLOW_RUN_IN_BACKGROUND
+ UserManager.DISALLOW_FACTORY_RESET
);
/**
@@ -782,8 +781,6 @@
}
assignDefaultIcon(user);
- // Set disallow background run for admin users, users will be killed when switched away.
- setUserRestriction(user, UserManager.DISALLOW_RUN_IN_BACKGROUND, /* enable= */ true);
return user;
}