Revert "ActivityTrigger: New class to invoke when activity starts/resumes" (701510de) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ActivityTrigger.java

deleted100644 → 0

+0 −72

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in the
		* documentation and/or other materials provided with the distribution.
		* * Neither the name of Code Aurora nor
		* the names of its contributors may be used to endorse or promote
		* products derived from this software without specific prior written
		* permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		* IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
		* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
		* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
		* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
		* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
		* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
		* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/

		package com.android.internal.app;

		import android.content.ComponentName;
		import android.content.Intent;
		import android.util.Log;

		public class ActivityTrigger
		{
		private static final String TAG = "ActivityTrigger";

		/** &hide */
		public ActivityTrigger() {
		//Log.d(TAG, "ActivityTrigger initialized");
		}

		/** &hide */
		protected void finalize() {
		native_at_deinit();
		}

		/** &hide */
		public void activityStartTrigger(Intent intent) {
		ComponentName cn = intent.getComponent();
		String activity = null;

		if (cn != null)
		activity = cn.flattenToString();
		native_at_startActivity(activity);
		}

		/** &hide */
		public void activityResumeTrigger(Intent intent) {
		ComponentName cn = intent.getComponent();
		String activity = null;

		if (cn != null)
		activity = cn.flattenToString();
		native_at_resumeActivity(activity);
		}

		private native void native_at_startActivity(String activity);
		private native void native_at_resumeActivity(String activity);
		private native void native_at_deinit();
		}

core/jni/Android.mk

+1 −2

Original line number	Diff line number	Diff line
		@@ -149,7 +149,6 @@ LOCAL_SRC_FILES:= \
		android_content_res_Configuration.cpp \
		android_animation_PropertyValuesHolder.cpp \
		com_android_internal_net_NetworkStatsFactory.cpp \
		com_android_internal_app_ActivityTrigger.cpp \
		org_codeaurora_Performance.cpp

		LOCAL_C_INCLUDES += \

core/jni/AndroidRuntime.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -179,7 +179,6 @@ extern int register_android_content_res_Configuration(JNIEnv* env);
		extern int register_android_animation_PropertyValuesHolder(JNIEnv *env);
		extern int register_com_android_internal_content_NativeLibraryHelper(JNIEnv *env);
		extern int register_com_android_internal_net_NetworkStatsFactory(JNIEnv *env);
		extern int register_com_android_internal_app_ActivityTrigger(JNIEnv *env);
		extern int register_org_codeaurora_Performance(JNIEnv *env);

		static AndroidRuntime* gCurRuntime = NULL;
		@@ -1222,7 +1221,6 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_animation_PropertyValuesHolder),
		REG_JNI(register_com_android_internal_content_NativeLibraryHelper),
		REG_JNI(register_com_android_internal_net_NetworkStatsFactory),
		REG_JNI(register_com_android_internal_app_ActivityTrigger),
		REG_JNI(register_org_codeaurora_Performance),
		};

core/jni/com_android_internal_app_ActivityTrigger.cpp

deleted100644 → 0

+0 −165

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in the
		* documentation and/or other materials provided with the distribution.
		* * Neither the name of Code Aurora nor
		* the names of its contributors may be used to endorse or promote
		* products derived from this software without specific prior written
		* permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		* IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
		* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
		* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
		* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
		* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
		* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
		* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/

		#define LOG_TAG "ActTriggerJNI"

		#include "jni.h"
		#include "JNIHelp.h"
		#include <android_runtime/AndroidRuntime.h>

		#include <dlfcn.h>
		#include <limits.h>
		#include <string.h>

		#include <cutils/properties.h>
		#include <utils/Log.h>

		#define LIBRARY_PATH_PREFIX "/system/lib/"

		namespace android
		{

		// ----------------------------------------------------------------------------

		static void (startActivity)(const char ) = NULL;
		static void (resumeActivity)(const char ) = NULL;
		static void *dlhandle = NULL;

		// ----------------------------------------------------------------------------

		static void
		com_android_internal_app_ActivityTrigger_native_at_init()
		{
		const char *rc;
		void (*init)(void);
		char buf[PROPERTY_VALUE_MAX];
		int len;

		/* Retrieve name of vendor extension library */
		if (property_get("ro.vendor.extension_library", buf, NULL) <= 0) {
		return;
		}

		/* Sanity check - ensure */
		buf[PROPERTY_VALUE_MAX-1] = '\0';
		if ((strncmp(buf, LIBRARY_PATH_PREFIX, sizeof(LIBRARY_PATH_PREFIX) - 1) != 0)
		\|\|
		(strstr(buf, "..") != NULL)) {
		return;
		}

		dlhandle = dlopen(buf, RTLD_NOW \| RTLD_LOCAL);
		if (dlhandle == NULL) {
		return;
		}

		dlerror();

		(void *) (&startActivity) = dlsym(dlhandle, "activity_trigger_start");
		if ((rc = dlerror()) != NULL) {
		goto cleanup;
		}
		(void *) (&resumeActivity) = dlsym(dlhandle, "activity_trigger_resume");
		if ((rc = dlerror()) != NULL) {
		goto cleanup;
		}
		(void *) (&init) = dlsym(dlhandle, "activity_trigger_init");
		if ((rc = dlerror()) != NULL) {
		goto cleanup;
		}
		(*init)();
		return;

		cleanup:
		startActivity = NULL;
		resumeActivity = NULL;
		if (dlhandle) {
		dlclose(dlhandle);
		dlhandle = NULL;
		}
		}

		static void
		com_android_internal_app_ActivityTrigger_native_at_deinit(JNIEnv *env, jobject clazz)
		{
		void (*deinit)(void);

		if (dlhandle) {
		startActivity = NULL;
		resumeActivity = NULL;

		(void *) (&deinit) = dlsym(dlhandle, "activity_trigger_deinit");
		if (deinit) {
		(*deinit)();
		}

		dlclose(dlhandle);
		dlhandle = NULL;
		}
		}

		static void
		com_android_internal_app_ActivityTrigger_native_at_startActivity(JNIEnv *env, jobject clazz, jstring activity)
		{
		if (startActivity && activity) {
		const char *actStr = env->GetStringUTFChars(activity, NULL);
		if (actStr) {
		(*startActivity)(actStr);
		}
		}
		}

		static void
		com_android_internal_app_ActivityTrigger_native_at_resumeActivity(JNIEnv *env, jobject clazz, jstring activity)
		{
		if (resumeActivity && activity) {
		const char *actStr = env->GetStringUTFChars(activity, NULL);
		if (actStr) {
		(*resumeActivity)(actStr);
		}
		}
		}

		// ----------------------------------------------------------------------------

		static JNINativeMethod gMethods[] = {
		{"native_at_startActivity", "(Ljava/lang/String;)V", (void *)com_android_internal_app_ActivityTrigger_native_at_startActivity},
		{"native_at_resumeActivity", "(Ljava/lang/String;)V", (void *)com_android_internal_app_ActivityTrigger_native_at_resumeActivity},
		{"native_at_deinit", "()V", (void *)com_android_internal_app_ActivityTrigger_native_at_deinit},
		};


		int register_com_android_internal_app_ActivityTrigger(JNIEnv *env)
		{
		com_android_internal_app_ActivityTrigger_native_at_init();

		return AndroidRuntime::registerNativeMethods(env,
		"com/android/internal/app/ActivityTrigger", gMethods, NELEM(gMethods));
		}

		} // namespace android

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ import android.os.UserHandle;
		import android.util.EventLog;
		import android.util.Slog;
		import android.view.Display;
		import com.android.internal.app.ActivityTrigger;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -254,10 +253,7 @@ final class ActivityStack {

		final Handler mHandler;

		static final ActivityTrigger mActivityTrigger = new ActivityTrigger();

		final class ActivityStackHandler extends Handler {

		//public Handler() {
		// if (localLOGV) Slog.v(TAG, "Handler started!");
		//}
		@@ -1323,8 +1319,6 @@ final class ActivityStack {

		if (DEBUG_SWITCH) Slog.v(TAG, "Resuming " + next);

		mActivityTrigger.activityResumeTrigger(next.intent);

		// If we are currently pausing an activity, then don't do anything
		// until that is done.
		if (!mStackSupervisor.allPausedActivitiesComplete()) {
		@@ -1731,7 +1725,6 @@ final class ActivityStack {

		r.putInHistory();
		r.frontOfTask = newTask;
		mActivityTrigger.activityStartTrigger(r.intent);
		if (!isHomeStack() \|\| numActivities() > 0) {
		// We want to show the starting preview window if we are
		// switching to a new task, or the next activity's process is