1 files changed, 66 insertions, 2 deletions

diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
index 9c44c7a..aa8b37f 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
@@ -27,6 +27,7 @@ import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.test.AndroidTestCase;
 import android.test.mock.MockContext;
 import android.text.TextUtils;
@@ -365,7 +366,7 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
         };
         Mockito.when(resources.getStringArray(R.array.config_restrict_to_region_locked_devices))
                 .thenReturn(regionRestrictedPackages);
-        assertFalse(settings.shouldPrebundledPackageBeInstalled(resources,
+        assertFalse(settings.shouldPrebundledPackageBeInstalledForRegion(resources,
                 expectedPackageNeededForRegion, resources));
     }
 
@@ -384,7 +385,70 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
 
         Mockito.when(resources.getStringArray(R.array.config_restrict_to_region_locked_devices))
                 .thenReturn(regionLockedPackages);
-        assertTrue(settings.shouldPrebundledPackageBeInstalled(resources,
+        assertTrue(settings.shouldPrebundledPackageBeInstalledForRegion(resources,
                 expectedPackageNeededForRegion, resources));
     }
+
+    // Shamelessly kanged from KeySetManagerServiceTest
+    public PackageSetting generateFakePackageSetting(String name) {
+        return new PackageSetting(name, name, new File(mContext.getCacheDir(), "fakeCodePath"),
+                new File(mContext.getCacheDir(), "fakeResPath"), "", "", "",
+                "", 1, 0, 0);
+    }
+
+    // Checks if a package that was installed and currently isn't installed for the owner
+    // is accepted for a secondary user
+    public void testPrebundledSecondaryUserAccept() {
+        Settings settings = new Settings(getContext().getFilesDir());
+        String expectedPackageToBeInstalled = "org.cyanogenmod.secondaryuser.package";
+
+        PackageSetting packageSetting =
+                generateFakePackageSetting(expectedPackageToBeInstalled);
+
+        int userOwner = UserHandle.USER_OWNER;
+        int userSecondary = 1000;
+
+        // Return true that the package was installed for the owner at some point
+        settings.markPrebundledPackageInstalledLPr(userOwner, expectedPackageToBeInstalled);
+        assertTrue(settings.wasPrebundledPackageInstalledLPr(userOwner,
+                expectedPackageToBeInstalled));
+
+        // Return false that the package was installed for the secondary user at some point
+        // DON'T MARK PREBUNDLED PACKAGE INSTALLED
+
+        // Return false that the package is currently not installed for the owner
+        packageSetting.setInstalled(false, userOwner);
+        assertFalse(packageSetting.getInstalled(userOwner));
+
+        // Return false that the package is currently not installed for the secondary user
+        packageSetting.setInstalled(false, userSecondary);
+        assertFalse(packageSetting.getInstalled(userSecondary));
+
+        assertFalse(settings.shouldPrebundledPackageBeInstalledForUserLPr(packageSetting,
+                userSecondary, expectedPackageToBeInstalled));
+    }
+
+    // Checks if a package that was installed for a secondary user and currently isn't installed
+    // for the user is accepted to be reinstalled
+    public void testPrebundledSecondaryUserReinstallAccept() {
+        Settings settings = new Settings(getContext().getFilesDir());
+        String expectedPackageToBeInstalled = "org.cyanogenmod.secondaryuser.package";
+
+        PackageSetting packageSetting =
+                generateFakePackageSetting(expectedPackageToBeInstalled);
+
+        int userSecondary = 1000;
+
+        // Return true that the package was installed for the secondary user at some point
+        settings.markPrebundledPackageInstalledLPr(userSecondary, expectedPackageToBeInstalled);
+        assertTrue(settings.wasPrebundledPackageInstalledLPr(userSecondary,
+                expectedPackageToBeInstalled));
+
+        // Return false that the package is currently not installed for the secondary user
+        packageSetting.setInstalled(false, userSecondary);
+        assertFalse(packageSetting.getInstalled(userSecondary));
+
+        assertFalse(settings.shouldPrebundledPackageBeInstalledForUserLPr(packageSetting,
+                userSecondary, expectedPackageToBeInstalled));
+    }
 }