Merge "More performance work:" into ics-mr1 (17bd9a22) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityManagerService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		/**
		* Historical data of past broadcasts, for debugging.
		*/
		static final int MAX_BROADCAST_HISTORY = 100;
		static final int MAX_BROADCAST_HISTORY = 25;
		final BroadcastRecord[] mBroadcastHistory
		= new BroadcastRecord[MAX_BROADCAST_HISTORY];

		@@ -13898,7 +13898,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (curLevel >= ComponentCallbacks2.TRIM_MEMORY_COMPLETE) {
		// For these apps we will also finish their activities
		// to help them free memory.
		mMainStack.destroyActivitiesLocked(app, false);
		mMainStack.destroyActivitiesLocked(app, false, "trim");
		}
		}
		app.trimMemoryLevel = curLevel;
		@@ -13962,7 +13962,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}

		if (mAlwaysFinishActivities) {
		mMainStack.destroyActivitiesLocked(null, false);
		mMainStack.destroyActivitiesLocked(null, false, "always-finish");
		}
		}

services/java/com/android/server/am/ActivityStack.java

+12 −11

Original line number	Diff line number	Diff line
		@@ -947,7 +947,7 @@ final class ActivityStack {
		r.state = ActivityState.STOPPED;
		if (!r.finishing) {
		if (r.configDestroy) {
		destroyActivityLocked(r, true, false);
		destroyActivityLocked(r, true, false, "stop-config");
		resumeTopActivityLocked(null);
		}
		}
		@@ -976,7 +976,7 @@ final class ActivityStack {
		// instance right now, we need to first completely stop
		// the current instance before starting the new one.
		if (DEBUG_PAUSE) Slog.v(TAG, "Destroying after pause: " + prev);
		destroyActivityLocked(prev, true, false);
		destroyActivityLocked(prev, true, false, "pause-config");
		} else {
		mStoppingActivities.add(prev);
		if (mStoppingActivities.size() > 3) {
		@@ -1364,7 +1364,8 @@ final class ActivityStack {
		}
		}

		if (!prev.finishing && prev.app != null && prev.app != next.app) {
		if (!prev.finishing && prev.app != null && prev.app != next.app
		&& prev.app != mService.mHomeProcess) {
		// We are switching to a new activity that is in a different
		// process than the previous one. Note the previous process,
		// so we can try to keep it around.
		@@ -3113,7 +3114,7 @@ final class ActivityStack {
		if (DEBUG_STATES) Slog.v(TAG, "Stop failed; moving to STOPPED: " + r);
		r.state = ActivityState.STOPPED;
		if (r.configDestroy) {
		destroyActivityLocked(r, true, false);
		destroyActivityLocked(r, true, false, "stop-except");
		}
		}
		}
		@@ -3288,7 +3289,7 @@ final class ActivityStack {
		for (i=0; i<NF; i++) {
		ActivityRecord r = (ActivityRecord)finishes.get(i);
		synchronized (mService) {
		destroyActivityLocked(r, true, false);
		destroyActivityLocked(r, true, false, "finish-idle");
		}
		}

		@@ -3487,7 +3488,7 @@ final class ActivityStack {
		\|\| prevState == ActivityState.INITIALIZING) {
		// If this activity is already stopped, we can just finish
		// it right now.
		return destroyActivityLocked(r, true, true) ? null : r;
		return destroyActivityLocked(r, true, true, "finish-imm") ? null : r;
		} else {
		// Need to go through the full pause cycle to get this
		// activity into the stopped state and then finish it.
		@@ -3593,7 +3594,7 @@ final class ActivityStack {
		}
		}

		final void destroyActivitiesLocked(ProcessRecord owner, boolean oomAdj) {
		final void destroyActivitiesLocked(ProcessRecord owner, boolean oomAdj, String reason) {
		for (int i=mHistory.size()-1; i>=0; i--) {
		ActivityRecord r = mHistory.get(i);
		if (owner != null && r.app != owner) {
		@@ -3604,7 +3605,7 @@ final class ActivityStack {
		if (r.app != null && r.haveState && !r.visible && r.stopped && !r.finishing
		&& r.state != ActivityState.DESTROYING
		&& r.state != ActivityState.DESTROYED) {
		destroyActivityLocked(r, true, oomAdj);
		destroyActivityLocked(r, true, oomAdj, "trim");
		}
		}
		}
		@@ -3616,13 +3617,13 @@ final class ActivityStack {
		* but then create a new client-side object for this same HistoryRecord.
		*/
		final boolean destroyActivityLocked(ActivityRecord r,
		boolean removeFromApp, boolean oomAdj) {
		boolean removeFromApp, boolean oomAdj, String reason) {
		if (DEBUG_SWITCH) Slog.v(
		TAG, "Removing activity: token=" + r
		+ ", app=" + (r.app != null ? r.app.processName : "(null)"));
		EventLog.writeEvent(EventLogTags.AM_DESTROY_ACTIVITY,
		System.identityHashCode(r),
		r.task.taskId, r.shortComponentName);
		r.task.taskId, r.shortComponentName, reason);

		boolean removedFromHistory = false;

		@@ -4109,7 +4110,7 @@ final class ActivityStack {
		if (r.app == null \|\| r.app.thread == null) {
		if (DEBUG_SWITCH \|\| DEBUG_CONFIGURATION) Slog.v(TAG,
		"Switch is destroying non-running " + r);
		destroyActivityLocked(r, true, false);
		destroyActivityLocked(r, true, false, "config");
		} else if (r.state == ActivityState.PAUSING) {
		// A little annoying: we are waiting for this activity to
		// finish pausing. Let's not do anything now, but just

services/java/com/android/server/am/EventLogTags.logtags

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ option java_package com.android.server.am
		# Reporting to applications that memory is low
		30017 am_low_memory (Num Processes\|1\|1)
		# An activity is being destroyed:
		30018 am_destroy_activity (Token\|1\|5),(Task ID\|1\|5),(Component Name\|3)
		30018 am_destroy_activity (Token\|1\|5),(Task ID\|1\|5),(Component Name\|3),(Reason\|3)
		# An activity has been relaunched, resumed, and is now in the foreground:
		30019 am_relaunch_resume_activity (Token\|1\|5),(Task ID\|1\|5),(Component Name\|3)
		# An activity has been relaunched:

tests/FrameworkPerf/res/layout/button_layout.xml

0 → 100644

+119 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2011 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent" >
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="FooBarYou" />
		</LinearLayout>

tests/FrameworkPerf/res/layout/image_button_layout.xml

0 → 100644

+119 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2011 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent" >
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:src="@drawable/stat_happy"/>
		</LinearLayout>