am a6470d45: Merge "Fix build." into jb-mr2-dev

* commit 'a6470d45148beaed765b88068bc76ad652ef33de':
  Fix build.
This commit is contained in:
Dianne Hackborn
2013-03-27 17:22:54 -07:00
committed by Android Git Automerger

View File

@ -176,8 +176,8 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
// Enable/Disable a package
PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_1);
ps.setEnabled(COMPONENT_ENABLED_STATE_DISABLED, 0);
ps.setEnabled(COMPONENT_ENABLED_STATE_ENABLED, 1);
ps.setEnabled(COMPONENT_ENABLED_STATE_DISABLED, 0, null);
ps.setEnabled(COMPONENT_ENABLED_STATE_ENABLED, 1, null);
assertEquals(COMPONENT_ENABLED_STATE_DISABLED, ps.getEnabled(0));
assertEquals(COMPONENT_ENABLED_STATE_ENABLED, ps.getEnabled(1));