Merge "More framework tests cleanup." into froyo

# Include all test java files.

LOCAL_SRC_FILES := \

	$(call all-java-files-under, src) \

	$(call all-java-files-under, DisabledTestApp/src) \

	$(call all-java-files-under, EnabledTestApp/src) \

	src/android/os/IAidlTest.aidl

LOCAL_STATIC_JAVA_LIBRARIES += android-common

include $(BUILD_PACKAGE)

include $(call all-makefiles-under,$(LOCAL_PATH))

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          android:installLocation="internalOnly"

          package="com.android.frameworks.coretests">

          package="com.android.frameworks.coretests"

          android:sharedUserId="com.android.uid.test">

    <permission android:name="com.android.frameworks.coretests.permission.TEST_GRANTED"

        android:protectionLevel="normal"

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.frameworks.coretests.disabled_app"

        android:sharedUserId="com.android.uid.test">

<resources>

	<bool name="trueRes">true</bool>

	<bool name="falseRes">false</bool>

</resources>

    <application enabled="false">

        <!-- Used to test package component enabling and disabling -->

        <activity android:name=".DisabledActivity" android:enabled="false" >

        </activity>

        <activity android:name=".EnabledActivity" >

        </activity>

    </application>

</manifest>

 * limitations under the License.

 */

package com.android.unit_tests.disabled_app;

package com.android.frameworks.coretests.disabled_app;

import android.app.Activity;