Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 (88f10c6c) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -175,11 +175,11 @@ public final class ActivityThread {
		// These can be accessed by multiple threads; mPackages is the lock.
		// XXX For now we keep around information about all packages we have
		// seen, not removing entries from this map.
		// NOTE: The activity manager in its process needs to call in to
		// NOTE: The activity and window managers need to call in to
		// ActivityThread to do things like update resource configurations,
		// which means this lock gets held while the activity manager holds its
		// own lock. Thus you MUST NEVER call back into the activity manager
		// or anything that depends on it while holding this lock.
		// which means this lock gets held while the activity and window managers
		// holds their own lock. Thus you MUST NEVER call back into the activity manager
		// or window manager or anything that depends on them while holding this lock.
		final HashMap<String, WeakReference<LoadedApk>> mPackages
		= new HashMap<String, WeakReference<LoadedApk>>();
		final HashMap<String, WeakReference<LoadedApk>> mResourcePackages

services/java/com/android/server/wm/WindowManagerService.java

+59 −36

Original line number	Diff line number	Diff line
		@@ -429,6 +429,18 @@ public class WindowManagerService extends IWindowManager.Stub
		boolean mSystemBooted = false;
		boolean mForceDisplayEnabled = false;
		boolean mShowingBootMessages = false;

		// This protects the following display size properties, so that
		// getDisplaySize() doesn't need to acquire the global lock. This is
		// needed because the window manager sometimes needs to use ActivityThread
		// while it has its global state locked (for example to load animation
		// resources), but the ActivityThread also needs get the current display
		// size sometimes when it has its package lock held.
		//
		// These will only be modified with both mWindowMap and mDisplaySizeLock
		// held (in that order) so the window manager doesn't need to acquire this
		// lock when needing these values in its normal operation.
		final Object mDisplaySizeLock = new Object();
		int mInitialDisplayWidth = 0;
		int mInitialDisplayHeight = 0;
		int mBaseDisplayWidth = 0;
		@@ -437,6 +449,7 @@ public class WindowManagerService extends IWindowManager.Stub
		int mCurDisplayHeight = 0;
		int mAppDisplayWidth = 0;
		int mAppDisplayHeight = 0;

		int mRotation = 0;
		int mForcedAppOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
		boolean mAltOrientation = false;
		@@ -6006,6 +6019,7 @@ public class WindowManagerService extends IWindowManager.Stub
		final int realdw = rotated ? mBaseDisplayHeight : mBaseDisplayWidth;
		final int realdh = rotated ? mBaseDisplayWidth : mBaseDisplayHeight;

		synchronized(mDisplaySizeLock) {
		if (mAltOrientation) {
		mCurDisplayWidth = realdw;
		mCurDisplayHeight = realdh;
		@@ -6026,6 +6040,7 @@ public class WindowManagerService extends IWindowManager.Stub
		mCurDisplayWidth = realdw;
		mCurDisplayHeight = realdh;
		}
		}

		final int dw = mCurDisplayWidth;
		final int dh = mCurDisplayHeight;
		@@ -6043,8 +6058,12 @@ public class WindowManagerService extends IWindowManager.Stub

		// Update application display metrics.
		final DisplayMetrics dm = mDisplayMetrics;
		mAppDisplayWidth = mPolicy.getNonDecorDisplayWidth(dw, dh, mRotation);
		mAppDisplayHeight = mPolicy.getNonDecorDisplayHeight(dw, dh, mRotation);
		final int appWidth = mPolicy.getNonDecorDisplayWidth(dw, dh, mRotation);
		final int appHeight = mPolicy.getNonDecorDisplayHeight(dw, dh, mRotation);
		synchronized(mDisplaySizeLock) {
		mAppDisplayWidth = appWidth;
		mAppDisplayHeight = appHeight;
		}
		if (false) {
		Slog.i(TAG, "Set app display size: " + mAppDisplayWidth
		+ " x " + mAppDisplayHeight);
		@@ -6414,6 +6433,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		WindowManager wm = (WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE);
		mDisplay = wm.getDefaultDisplay();
		synchronized(mDisplaySizeLock) {
		mInitialDisplayWidth = mDisplay.getRawWidth();
		mInitialDisplayHeight = mDisplay.getRawHeight();
		int rot = mDisplay.getRotation();
		@@ -6426,6 +6446,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		mBaseDisplayWidth = mCurDisplayWidth = mAppDisplayWidth = mInitialDisplayWidth;
		mBaseDisplayHeight = mCurDisplayHeight = mAppDisplayHeight = mInitialDisplayHeight;
		}
		mInputManager.setDisplaySize(Display.DEFAULT_DISPLAY,
		mDisplay.getRawWidth(), mDisplay.getRawHeight(),
		mDisplay.getRawExternalWidth(), mDisplay.getRawExternalHeight());
		@@ -6963,28 +6984,28 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		public void getDisplaySize(Point size) {
		synchronized(mWindowMap) {
		synchronized(mDisplaySizeLock) {
		size.x = mAppDisplayWidth;
		size.y = mAppDisplayHeight;
		}
		}

		public void getRealDisplaySize(Point size) {
		synchronized(mWindowMap) {
		synchronized(mDisplaySizeLock) {
		size.x = mCurDisplayWidth;
		size.y = mCurDisplayHeight;
		}
		}

		public void getInitialDisplaySize(Point size) {
		synchronized(mWindowMap) {
		synchronized(mDisplaySizeLock) {
		size.x = mInitialDisplayWidth;
		size.y = mInitialDisplayHeight;
		}
		}

		public int getMaximumSizeDimension() {
		synchronized(mWindowMap) {
		synchronized(mDisplaySizeLock) {
		// Do this based on the raw screen size, until we are smarter.
		return mBaseDisplayWidth > mBaseDisplayHeight
		? mBaseDisplayWidth : mBaseDisplayHeight;
		@@ -7077,8 +7098,10 @@ public class WindowManagerService extends IWindowManager.Stub
		private void setForcedDisplaySizeLocked(int width, int height) {
		Slog.i(TAG, "Using new display size: " + width + "x" + height);

		synchronized(mDisplaySizeLock) {
		mBaseDisplayWidth = width;
		mBaseDisplayHeight = height;
		}
		mPolicy.setInitialDisplaySize(mBaseDisplayWidth, mBaseDisplayHeight);

		mLayoutNeeded = true;