commit f425cb0da49bd508e510dbf0f249863b3fc57a88
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 01 00:21:08 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 01 00:21:08 2019 +0000
tree 147c4624d73202554f9d6832b4dce860b12691cf
parent 9bde289191b068436e3a0ca203eea6e909dfc4f6
parent 5ebf6de83a0c6258b2a9cc5122100d48f15421ed

Merge "Update default guest restrictions" into qt-dev

tests/carservice_unit_test/src/android/car/userlib/CarUserManagerHelperTest.java

diff --git a/tests/carservice_unit_test/src/android/car/userlib/CarUserManagerHelperTest.java b/tests/carservice_unit_test/src/android/car/userlib/CarUserManagerHelperTest.java
index 288331c..993979a 100644
--- a/tests/carservice_unit_test/src/android/car/userlib/CarUserManagerHelperTest.java
+++ b/tests/carservice_unit_test/src/android/car/userlib/CarUserManagerHelperTest.java
@@ -665,7 +665,7 @@
 
     @Test
     public void testDefaultGuestRestrictions() {
-        int guestRestrictionsExpectedCount = 8;
+        int guestRestrictionsExpectedCount = 6;
 
         ArgumentCaptor<Bundle> bundleCaptor = ArgumentCaptor.forClass(Bundle.class);
         mCarUserManagerHelper.initDefaultGuestRestrictions();
@@ -677,8 +677,6 @@
         assertThat(guestRestrictions.getBoolean(UserManager.DISALLOW_FACTORY_RESET)).isTrue();
         assertThat(guestRestrictions.getBoolean(UserManager.DISALLOW_REMOVE_USER)).isTrue();
         assertThat(guestRestrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS)).isTrue();
-        assertThat(guestRestrictions.getBoolean(UserManager.DISALLOW_OUTGOING_CALLS)).isTrue();
-        assertThat(guestRestrictions.getBoolean(UserManager.DISALLOW_SMS)).isTrue();
         assertThat(guestRestrictions.getBoolean(UserManager.DISALLOW_INSTALL_APPS)).isTrue();
         assertThat(guestRestrictions.getBoolean(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES))
             .isTrue();

user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java

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 c86b091..cfd50cd 100644
--- a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
+++ b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
@@ -73,7 +73,8 @@
     );
 
     /**
-     * Additional optional set of restrictions for Non-Admin users.
+     * Additional optional set of restrictions for Non-Admin users. These are the restrictions
+     * configurable via Settings.
      */
     public static final Set<String> OPTIONAL_NON_ADMIN_RESTRICTIONS = Sets.newArraySet(
             UserManager.DISALLOW_ADD_USER,
@@ -90,8 +91,6 @@
             UserManager.DISALLOW_FACTORY_RESET,
             UserManager.DISALLOW_REMOVE_USER,
             UserManager.DISALLOW_MODIFY_ACCOUNTS,
-            UserManager.DISALLOW_OUTGOING_CALLS,
-            UserManager.DISALLOW_SMS,
             UserManager.DISALLOW_INSTALL_APPS,
             UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
             UserManager.DISALLOW_UNINSTALL_APPS