Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread (d6ce6791) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/os/HandlerThread_Delegate.java

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		package android.os;

		import com.android.layoutlib.bridge.android.BridgeContext;
		import com.android.layoutlib.bridge.impl.RenderAction;
		import com.android.tools.layoutlib.annotations.LayoutlibDelegate;

		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;

		/**
		* Delegate overriding selected methods of android.os.HandlerThread
		*
		* Through the layoutlib_create tool, selected methods of Handler have been replaced
		* by calls to methods of the same name in this delegate class.
		*
		*
		*/
		public class HandlerThread_Delegate {

		private static Map<BridgeContext, List<HandlerThread>> sThreads =
		new HashMap<BridgeContext, List<HandlerThread>>();

		public static void cleanUp(BridgeContext context) {
		List<HandlerThread> list = sThreads.get(context);
		if (list != null) {
		for (HandlerThread thread : list) {
		thread.quit();
		}

		list.clear();
		sThreads.remove(context);
		}
		}

		// -------- Delegate methods

		@LayoutlibDelegate
		/package/ static void run(HandlerThread theThread) {
		// record the thread so that it can be quit() on clean up.
		BridgeContext context = RenderAction.getCurrentContext();
		List<HandlerThread> list = sThreads.get(context);
		if (list == null) {
		list = new ArrayList<HandlerThread>();
		sThreads.put(context, list);
		}

		list.add(theThread);

		// ---- START DEFAULT IMPLEMENTATION.

		theThread.mTid = Process.myTid();
		Looper.prepare();
		synchronized (theThread) {
		theThread.mLooper = Looper.myLooper();
		theThread.notifyAll();
		}
		Process.setThreadPriority(theThread.mPriority);
		theThread.onLooperPrepared();
		Looper.loop();
		theThread.mTid = -1;
		}
		}

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import com.android.layoutlib.bridge.Bridge;
		import com.android.layoutlib.bridge.android.BridgeContext;
		import com.android.resources.ResourceType;

		import android.os.HandlerThread_Delegate;
		import android.util.DisplayMetrics;

		import java.util.concurrent.TimeUnit;
		@@ -228,6 +229,10 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso
		private void tearDown() {
		// Make sure to remove static references, otherwise we could not unload the lib
		mContext.disposeResources();

		// quit HandlerThread created during this session.
		HandlerThread_Delegate.cleanUp(sCurrentContext);

		sCurrentContext = null;

		Bridge.setLog(null);

tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ public final class CreateInfo implements ICreateInfo {
		"android.content.res.Resources$Theme#resolveAttribute",
		"android.graphics.BitmapFactory#finishDecode",
		"android.os.Handler#sendMessageAtTime",
		"android.os.HandlerThread#run",
		"android.os.Build#getString",
		"android.view.LayoutInflater#parseInclude",
		"android.view.View#isInEditMode",