Merge branch 'froyo' into froyo-release (646ef654) · Commits · e / os / android_frameworks_base

core/java/android/app/KeyguardManager.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,9 @@ public class KeyguardManager {
		*
		* A good place to call this is from {@link android.app.Activity#onResume()}
		*
		* Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
		* is enabled that requires a password.
		*
		* @see #reenableKeyguard()
		*/
		public void disableKeyguard() {
		@@ -68,6 +71,9 @@ public class KeyguardManager {
		*
		* A good place to call this is from {@link android.app.Activity#onPause()}
		*
		* Note: This call has no effect while any {@link android.app.admin.DevicePolicyManager}
		* is enabled that requires a password.
		*
		* @see #disableKeyguard()
		*/
		public void reenableKeyguard() {

core/java/android/provider/Settings.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -2367,6 +2367,24 @@ public final class Settings {
		*/
		public static final String TETHER_SUPPORTED = "tether_supported";

		/**
		* Used to require DUN APN on the device or not - defaults to a build config value
		* which defaults to false
		* @hide
		*/
		public static final String TETHER_DUN_REQUIRED = "tether_dun_required";

		/**
		* Used to hold a gservices-provisioned apn value for DUN. If set, or the
		* corresponding build config values are set it will override the APN DB
		* values.
		* Consists of a comma seperated list of strings:
		* "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
		* note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN"
		* @hide
		*/
		public static final String TETHER_DUN_APN = "tether_dun_apn";

		/**
		* No longer supported.
		*/

core/jni/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ LOCAL_SRC_FILES:= \
		android_server_BluetoothService.cpp \
		android_server_BluetoothEventLoop.cpp \
		android_server_BluetoothA2dpService.cpp \
		android_server_Watchdog.cpp \
		android_message_digest_sha1.cpp \
		android_ddm_DdmHandleNativeHeap.cpp \
		android_location_GpsLocationProvider.cpp \

core/jni/AndroidRuntime.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,7 @@ extern int register_android_bluetooth_ScoSocket(JNIEnv *env);
		extern int register_android_server_BluetoothService(JNIEnv* env);
		extern int register_android_server_BluetoothEventLoop(JNIEnv *env);
		extern int register_android_server_BluetoothA2dpService(JNIEnv* env);
		extern int register_android_server_Watchdog(JNIEnv* env);
		extern int register_android_ddm_DdmHandleNativeHeap(JNIEnv *env);
		extern int register_com_android_internal_os_ZygoteInit(JNIEnv* env);
		extern int register_android_location_GpsLocationProvider(JNIEnv* env);
		@@ -1276,6 +1277,7 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_server_BluetoothService),
		REG_JNI(register_android_server_BluetoothEventLoop),
		REG_JNI(register_android_server_BluetoothA2dpService),
		REG_JNI(register_android_server_Watchdog),
		REG_JNI(register_android_message_digest_sha1),
		REG_JNI(register_android_ddm_DdmHandleNativeHeap),
		REG_JNI(register_android_location_GpsLocationProvider),

core/jni/android_server_Watchdog.cpp

0 → 100644

+111 −0

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

		#define LOG_TAG "Watchdog_N"
		#include <utils/Log.h>

		#include <sys/types.h>
		#include <fcntl.h>
		#include <dirent.h>
		#include <string.h>
		#include <errno.h>

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

		static void dumpOneStack(int tid, int outFd) {
		char buf[64];

		snprintf(buf, sizeof(buf), "/proc/%d/stack", tid);
		int stackFd = open(buf, O_RDONLY);
		if (stackFd >= 0) {
		// header for readability
		strncat(buf, ":\n", sizeof(buf) - strlen(buf) - 1);
		write(outFd, buf, strlen(buf));

		// copy the stack dump text
		int nBytes;
		while ((nBytes = read(stackFd, buf, sizeof(buf))) > 0) {
		write(outFd, buf, nBytes);
		}

		// footer and done
		write(outFd, "\n", 1);
		close(stackFd);
		} else {
		LOGE("Unable to open stack of tid %d : %d (%s)", tid, errno, strerror(errno));
		}
		}

		static void dumpKernelStacks(JNIEnv* env, jobject clazz, jstring pathStr) {
		char buf[128];
		DIR* taskdir;

		LOGI("dumpKernelStacks");
		if (!pathStr) {
		jniThrowException(env, "java/lang/IllegalArgumentException", "Null path");
		return;
		}

		const char *path = env->GetStringUTFChars(pathStr, NULL);

		int outFd = open(path, O_WRONLY \| O_APPEND \| O_CREAT);
		if (outFd < 0) {
		LOGE("Unable to open stack dump file: %d (%s)", errno, strerror(errno));
		goto done;
		}

		snprintf(buf, sizeof(buf), "\n----- begin pid %d kernel stacks -----\n", getpid());
		write(outFd, buf, strlen(buf));

		// look up the list of all threads in this process
		snprintf(buf, sizeof(buf), "/proc/%d/task", getpid());
		taskdir = opendir(buf);
		if (taskdir != NULL) {
		struct dirent * ent;
		while ((ent = readdir(taskdir)) != NULL) {
		int tid = atoi(ent->d_name);
		if (tid > 0 && tid <= 65535) {
		// dump each stack trace
		dumpOneStack(tid, outFd);
		}
		}
		closedir(taskdir);
		}

		snprintf(buf, sizeof(buf), "----- end pid %d kernel stacks -----\n", getpid());
		write(outFd, buf, strlen(buf));

		close(outFd);
		done:
		env->ReleaseStringUTFChars(pathStr, path);
		}

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

		namespace android {

		static const JNINativeMethod g_methods[] = {
		{ "native_dumpKernelStacks", "(Ljava/lang/String;)V", (void*)dumpKernelStacks },
		};

		int register_android_server_Watchdog(JNIEnv* env) {
		return AndroidRuntime::registerNativeMethods(env, "com/android/server/Watchdog",
		g_methods, NELEM(g_methods));
		}

		}