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

Merge "Follow ArraySet refactoring." into lmp-mr1-dev

Browse Source 
automerge: 9c81373

* commit '9c81373bc99dd97c3e89138b008ea4c5c77c9b47':
  Follow ArraySet refactoring.
This commit is contained in:
Jeff Sharkey
2014-10-27 22:16:59 +00:00
committed by android-build-merger
parent a5921b9b79 9c81373bc9
commit 817722bb36
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
View File

@@ -21,22 +21,15 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
import com.android.internal.content.PackageHelper;
import android.test.AndroidTestCase;
import android.util.ArraySet;
import android.util.Log;
import com.android.internal.os.AtomicFile;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.HashSet;
import android.os.Debug;
import android.os.Environment;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.storage.IMountService;
import android.test.AndroidTestCase;
import android.util.Log;
public class PackageManagerSettingsTests extends AndroidTestCase {
@@ -182,11 +175,11 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
assertEquals(COMPONENT_ENABLED_STATE_ENABLED, ps.getEnabled(1));
// Enable/Disable a component
HashSet<String> components = new HashSet<String>();
ArraySet<String> components = new ArraySet<String>();
String component1 = PACKAGE_NAME_1 + "/.Component1";
components.add(component1);
ps.setDisabledComponents(components, 0);
HashSet<String> componentsDisabled = ps.getDisabledComponents(0);
ArraySet<String> componentsDisabled = ps.getDisabledComponents(0);
assertEquals(1, componentsDisabled.size());
assertEquals(component1, componentsDisabled.toArray()[0]);
boolean hasEnabled =