Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 (84b02130) · Commits · e / os / android_frameworks_base

preloaded-classes

+45 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,12 @@ android.accounts.IAccountManagerResponse
	android.accounts.IAccountManagerResponse$Stub		android.accounts.IAccountManagerResponse$Stub
	android.animation.Animator		android.animation.Animator
	android.animation.Animator$AnimatorListener		android.animation.Animator$AnimatorListener
			android.animation.AnimatorInflater
	android.animation.AnimatorListenerAdapter		android.animation.AnimatorListenerAdapter
			android.animation.AnimatorSet
			android.animation.AnimatorSet$AnimatorSetListener
			android.animation.AnimatorSet$Builder
			android.animation.AnimatorSet$Node
	android.animation.FloatEvaluator		android.animation.FloatEvaluator
	android.animation.FloatKeyframeSet		android.animation.FloatKeyframeSet
	android.animation.IntEvaluator		android.animation.IntEvaluator
	@@ -57,6 +62,7 @@ android.app.ActivityThread$CreateServiceData
	android.app.ActivityThread$GcIdler		android.app.ActivityThread$GcIdler
	android.app.ActivityThread$H		android.app.ActivityThread$H
	android.app.ActivityThread$Idler		android.app.ActivityThread$Idler
			android.app.ActivityThread$Profiler
	android.app.ActivityThread$ProviderClientRecord		android.app.ActivityThread$ProviderClientRecord
	android.app.ActivityThread$ProviderRefCount		android.app.ActivityThread$ProviderRefCount
	android.app.ActivityThread$ReceiverData		android.app.ActivityThread$ReceiverData
	@@ -71,6 +77,8 @@ android.app.ApplicationLoaders
	android.app.ApplicationPackageManager		android.app.ApplicationPackageManager
	android.app.ApplicationPackageManager$ResourceName		android.app.ApplicationPackageManager$ResourceName
	android.app.ApplicationThreadNative		android.app.ApplicationThreadNative
			android.app.BackStackRecord
			android.app.BackStackRecord$Op
	android.app.ContextImpl		android.app.ContextImpl
	android.app.ContextImpl$1		android.app.ContextImpl$1
	android.app.ContextImpl$10		android.app.ContextImpl$10
	@@ -111,9 +119,15 @@ android.app.ContextImpl$StaticServiceFetcher
	android.app.Dialog		android.app.Dialog
	android.app.Dialog$1		android.app.Dialog$1
	android.app.Dialog$ListenersHandler		android.app.Dialog$ListenersHandler
			android.app.DialogFragment
			android.app.Fragment
	android.app.FragmentManager		android.app.FragmentManager
			android.app.FragmentManager$BackStackEntry
	android.app.FragmentManagerImpl		android.app.FragmentManagerImpl
	android.app.FragmentManagerImpl$1		android.app.FragmentManagerImpl$1
			android.app.FragmentManagerImpl$2
			android.app.FragmentManagerImpl$3
			android.app.FragmentTransaction
	android.app.IActivityManager		android.app.IActivityManager
	android.app.IActivityManager$ContentProviderHolder		android.app.IActivityManager$ContentProviderHolder
	android.app.IActivityManager$ContentProviderHolder$1		android.app.IActivityManager$ContentProviderHolder$1
	@@ -134,6 +148,10 @@ android.app.Instrumentation
	android.app.IntentReceiverLeaked		android.app.IntentReceiverLeaked
	android.app.IntentService		android.app.IntentService
	android.app.IntentService$ServiceHandler		android.app.IntentService$ServiceHandler
			android.app.ListActivity
			android.app.ListActivity$1
			android.app.ListActivity$2
			android.app.ListFragment
	android.app.LoadedApk		android.app.LoadedApk
	android.app.LoadedApk$ReceiverDispatcher		android.app.LoadedApk$ReceiverDispatcher
	android.app.LoadedApk$ReceiverDispatcher$Args		android.app.LoadedApk$ReceiverDispatcher$Args
	@@ -328,6 +346,7 @@ android.emoji.EmojiFactory
	android.graphics.AvoidXfermode		android.graphics.AvoidXfermode
	android.graphics.Bitmap		android.graphics.Bitmap
	android.graphics.Bitmap$1		android.graphics.Bitmap$1
			android.graphics.Bitmap$2
	android.graphics.Bitmap$BitmapFinalizer		android.graphics.Bitmap$BitmapFinalizer
	android.graphics.Bitmap$Config		android.graphics.Bitmap$Config
	android.graphics.BitmapFactory		android.graphics.BitmapFactory
	@@ -719,6 +738,7 @@ android.text.style.LineHeightSpan
	android.text.style.MetricAffectingSpan		android.text.style.MetricAffectingSpan
	android.text.style.ParagraphStyle		android.text.style.ParagraphStyle
	android.text.style.ReplacementSpan		android.text.style.ReplacementSpan
			android.text.style.SpellCheckSpan
	android.text.style.StyleSpan		android.text.style.StyleSpan
	android.text.style.SuggestionSpan		android.text.style.SuggestionSpan
	android.text.style.UpdateAppearance		android.text.style.UpdateAppearance
	@@ -870,6 +890,7 @@ android.view.View$OnLongClickListener
	android.view.View$OnTouchListener		android.view.View$OnTouchListener
	android.view.View$PerformClick		android.view.View$PerformClick
	android.view.View$ScrollabilityCache		android.view.View$ScrollabilityCache
			android.view.View$TransformationInfo
	android.view.View$UnsetPressedState		android.view.View$UnsetPressedState
	android.view.ViewConfiguration		android.view.ViewConfiguration
	android.view.ViewGroup		android.view.ViewGroup
	@@ -934,6 +955,7 @@ android.view.inputmethod.EditorInfo$1
	android.view.inputmethod.ExtractedText		android.view.inputmethod.ExtractedText
	android.view.inputmethod.ExtractedText$1		android.view.inputmethod.ExtractedText$1
	android.view.inputmethod.InputConnection		android.view.inputmethod.InputConnection
			android.view.inputmethod.InputConnectionWrapper
	android.view.inputmethod.InputMethodManager		android.view.inputmethod.InputMethodManager
	android.view.inputmethod.InputMethodManager$1		android.view.inputmethod.InputMethodManager$1
	android.view.inputmethod.InputMethodManager$ControlledInputConnectionWrapper		android.view.inputmethod.InputMethodManager$ControlledInputConnectionWrapper
	@@ -946,12 +968,16 @@ android.webkit.WebViewCore
	android.widget.AbsListView		android.widget.AbsListView
	android.widget.AbsListView$1		android.widget.AbsListView$1
	android.widget.AbsListView$2		android.widget.AbsListView$2
			android.widget.AbsListView$3
	android.widget.AbsListView$AdapterDataSetObserver		android.widget.AbsListView$AdapterDataSetObserver
	android.widget.AbsListView$CheckForTap		android.widget.AbsListView$CheckForTap
			android.widget.AbsListView$FlingRunnable
			android.widget.AbsListView$FlingRunnable$1
	android.widget.AbsListView$LayoutParams		android.widget.AbsListView$LayoutParams
	android.widget.AbsListView$OnScrollListener		android.widget.AbsListView$OnScrollListener
	android.widget.AbsListView$PerformClick		android.widget.AbsListView$PerformClick
	android.widget.AbsListView$RecycleBin		android.widget.AbsListView$RecycleBin
			android.widget.AbsListView$RecyclerListener
	android.widget.AbsListView$SavedState		android.widget.AbsListView$SavedState
	android.widget.AbsListView$SavedState$1		android.widget.AbsListView$SavedState$1
	android.widget.AbsListView$SelectionBoundsAdjuster		android.widget.AbsListView$SelectionBoundsAdjuster
	@@ -975,13 +1001,19 @@ android.widget.CheckBox
	android.widget.Checkable		android.widget.Checkable
	android.widget.CheckedTextView		android.widget.CheckedTextView
	android.widget.CompoundButton		android.widget.CompoundButton
			android.widget.CompoundButton$OnCheckedChangeListener
	android.widget.CursorAdapter		android.widget.CursorAdapter
	android.widget.CursorFilter$CursorFilterClient		android.widget.CursorFilter$CursorFilterClient
			android.widget.EdgeEffect
	android.widget.EdgeGlow		android.widget.EdgeGlow
	android.widget.EditText		android.widget.EditText
	android.widget.ExpandableListView		android.widget.ExpandableListView
			android.widget.FastScroller
			android.widget.FastScroller$1
			android.widget.FastScroller$ScrollFade
	android.widget.Filter		android.widget.Filter
	android.widget.Filter$FilterListener		android.widget.Filter$FilterListener
			android.widget.Filter$FilterResults
	android.widget.Filter$ResultsHandler		android.widget.Filter$ResultsHandler
	android.widget.Filterable		android.widget.Filterable
	android.widget.FrameLayout		android.widget.FrameLayout
	@@ -1030,17 +1062,30 @@ android.widget.SearchView
	android.widget.Spinner		android.widget.Spinner
	android.widget.SpinnerAdapter		android.widget.SpinnerAdapter
	android.widget.StackView		android.widget.StackView
			android.widget.Switch
	android.widget.TabHost		android.widget.TabHost
			android.widget.TabHost$ContentStrategy
			android.widget.TabHost$FactoryContentStrategy
			android.widget.TabHost$IndicatorStrategy
			android.widget.TabHost$LabelAndIconIndicatorStrategy
			android.widget.TabHost$OnTabChangeListener
			android.widget.TabHost$TabContentFactory
			android.widget.TabHost$TabSpec
			android.widget.TabHost$ViewIndicatorStrategy
	android.widget.TabWidget		android.widget.TabWidget
			android.widget.TabWidget$OnTabSelectionChanged
			android.widget.TabWidget$TabClickListener
	android.widget.TableLayout		android.widget.TableLayout
	android.widget.TableRow		android.widget.TableRow
	android.widget.TextView		android.widget.TextView
			android.widget.TextView$2
	android.widget.TextView$3		android.widget.TextView$3
	android.widget.TextView$Blink		android.widget.TextView$Blink
	android.widget.TextView$BufferType		android.widget.TextView$BufferType
	android.widget.TextView$ChangeWatcher		android.widget.TextView$ChangeWatcher
	android.widget.TextView$CharWrapper		android.widget.TextView$CharWrapper
	android.widget.TextView$Drawables		android.widget.TextView$Drawables
			android.widget.TextView$EasyEditSpanController
	android.widget.TextView$InputContentType		android.widget.TextView$InputContentType
	android.widget.TextView$InputMethodState		android.widget.TextView$InputMethodState
	android.widget.TextView$OnEditorActionListener		android.widget.TextView$OnEditorActionListener

tests/FrameworkPerf/AndroidManifest.xml

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,10 @@
	</activity>		</activity>
	<service android:name="SchedulerService">		<service android:name="SchedulerService">
	</service>		</service>
			<service android:name="TestService" android:process=":test">
			</service>
			<service android:name="LocalTestService">
			</service>
	<receiver android:name="Receiver" android:exported="true">		<receiver android:name="Receiver" android:exported="true">
	</receiver>		</receiver>
	</application>		</application>

tests/FrameworkPerf/res/layout/main.xml

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -91,6 +91,11 @@
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:text="@string/stop"		android:text="@string/stop"
	/>		/>
			<CheckBox android:id="@+id/local"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="Local"
			/>
	</LinearLayout>		</LinearLayout>

	<TextView android:id="@+id/log"		<TextView android:id="@+id/log"

tests/FrameworkPerf/src/com/android/frameworkperf/FrameworkPerfActivity.java

+147 −1026

File changed.

Preview size limit exceeded, changes collapsed.

tests/FrameworkPerf/src/com/android/frameworkperf/LocalTestService.java

0 → 100644

+6 −0

Original line number	Original line	Diff line number	Diff line
			package com.android.frameworkperf;

			public class LocalTestService extends TestService {
			void terminate() {
			}
			}