diff options
14 files changed, 280 insertions, 249 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 1cb2353071af..d114ecce3d96 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -1307,7 +1307,7 @@ public abstract class ContentResolver { String blockingPackage = ActivityThread.currentPackageName(); EventLog.writeEvent( - EventLogTags.CONTENT_QUERY_OPERATION, + EventLogTags.CONTENT_QUERY_SAMPLE, uri.toString(), projectionBuffer.toString(), selection != null ? selection : "", @@ -1329,7 +1329,7 @@ public abstract class ContentResolver { } String blockingPackage = ActivityThread.currentPackageName(); EventLog.writeEvent( - EventLogTags.CONTENT_UPDATE_OPERATION, + EventLogTags.CONTENT_UPDATE_SAMPLE, uri.toString(), operation, selection != null ? selection : "", diff --git a/core/java/android/content/EventLogTags.logtags b/core/java/android/content/EventLogTags.logtags index 0a8c9b074fed..21ea90ad2e1e 100644 --- a/core/java/android/content/EventLogTags.logtags +++ b/core/java/android/content/EventLogTags.logtags @@ -2,6 +2,6 @@ option java_package android.content; -52002 content_query_operation (uri|3),(projection|3),(selection|3),(sortorder|3),(time|1|3),(blocking_package|3),(sample_percent|1|6) -52003 content_update_operation (uri|3),(operation|3),(selection|3),(time|1|3),(blocking_package|3),(sample_percent|1|6) -52004 binder_operation (descriptor|3),(method_num|1|5),(time|1|3),(blocking_package|3),(sample_percent|1|6) +52002 content_query_sample (uri|3),(projection|3),(selection|3),(sortorder|3),(time|1|3),(blocking_package|3),(sample_percent|1|6) +52003 content_update_sample (uri|3),(operation|3),(selection|3),(time|1|3),(blocking_package|3),(sample_percent|1|6) +52004 binder_sample (descriptor|3),(method_num|1|5),(time|1|3),(blocking_package|3),(sample_percent|1|6) diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index ad8e2bffbc68..0d64dab179e9 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -23,12 +23,12 @@ import java.io.RandomAccessFile; import java.io.IOException; /** - * Class that provides network traffic statistics. These statistics include bytes transmitted and - * received and network packets transmitted and received, over all interfaces, over the mobile - * interface, and on a per-UID basis. + * Class that provides network traffic statistics. These statistics include + * bytes transmitted and received and network packets transmitted and received, + * over all interfaces, over the mobile interface, and on a per-UID basis. * <p> - * These statistics may not be available on all platforms. If the statistics are not supported - * by this device, {@link #UNSUPPORTED} will be returned. + * These statistics may not be available on all platforms. If the statistics + * are not supported by this device, {@link #UNSUPPORTED} will be returned. */ public class TrafficStats { /** @@ -36,27 +36,13 @@ public class TrafficStats { */ public final static int UNSUPPORTED = -1; - // Logging tag. - private final static String TAG = "trafficstats"; - - // We pre-create all the File objects so we don't spend a lot of - // CPU at runtime converting from Java Strings to byte[] for the - // kernel calls. - private final static File[] MOBILE_TX_PACKETS = mobileFiles("tx_packets"); - private final static File[] MOBILE_RX_PACKETS = mobileFiles("rx_packets"); - private final static File[] MOBILE_TX_BYTES = mobileFiles("tx_bytes"); - private final static File[] MOBILE_RX_BYTES = mobileFiles("rx_bytes"); - private final static File SYS_CLASS_NET_DIR = new File("/sys/class/net"); - /** * Get the total number of packets transmitted through the mobile interface. * * @return number of packets. If the statistics are not supported by this device, * {@link #UNSUPPORTED} will be returned. */ - public static long getMobileTxPackets() { - return getMobileStat(MOBILE_TX_PACKETS); - } + public static native long getMobileTxPackets(); /** * Get the total number of packets received through the mobile interface. @@ -64,9 +50,7 @@ public class TrafficStats { * @return number of packets. If the statistics are not supported by this device, * {@link #UNSUPPORTED} will be returned. */ - public static long getMobileRxPackets() { - return getMobileStat(MOBILE_RX_PACKETS); - } + public static native long getMobileRxPackets(); /** * Get the total number of bytes transmitted through the mobile interface. @@ -74,9 +58,7 @@ public class TrafficStats { * @return number of bytes. If the statistics are not supported by this device, * {@link #UNSUPPORTED} will be returned. */ - public static long getMobileTxBytes() { - return getMobileStat(MOBILE_TX_BYTES); - } + public static native long getMobileTxBytes(); /** * Get the total number of bytes received through the mobile interface. @@ -84,9 +66,7 @@ public class TrafficStats { * @return number of bytes. If the statistics are not supported by this device, * {@link #UNSUPPORTED} will be returned. */ - public static long getMobileRxBytes() { - return getMobileStat(MOBILE_RX_BYTES); - } + public static native long getMobileRxBytes(); /** * Get the total number of packets sent through all network interfaces. @@ -94,9 +74,7 @@ public class TrafficStats { * @return the number of packets. If the statistics are not supported by this device, * {@link #UNSUPPORTED} will be returned. */ - public static long getTotalTxPackets() { - return getTotalStat("tx_packets"); - } + public static native long getTotalTxPackets(); /** * Get the total number of packets received through all network interfaces. @@ -104,9 +82,7 @@ public class TrafficStats { * @return number of packets. If the statistics are not supported by this device, * {@link #UNSUPPORTED} will be returned. */ - public static long getTotalRxPackets() { - return getTotalStat("rx_packets"); - } + public static native long getTotalRxPackets(); /** * Get the total number of bytes sent through all network interfaces. @@ -114,9 +90,7 @@ public class TrafficStats { * @return number of bytes. If the statistics are not supported by this device, * {@link #UNSUPPORTED} will be returned. */ - public static long getTotalTxBytes() { - return getTotalStat("tx_bytes"); - } + public static native long getTotalTxBytes(); /** * Get the total number of bytes received through all network interfaces. @@ -124,9 +98,7 @@ public class TrafficStats { * @return number of bytes. If the statistics are not supported by this device, * {@link #UNSUPPORTED} will be returned. */ - public static long getTotalRxBytes() { - return getTotalStat("rx_bytes"); - } + public static native long getTotalRxBytes(); /** * Get the number of bytes sent through the network for this UID. @@ -138,9 +110,7 @@ public class TrafficStats { * @return number of bytes. If the statistics are not supported by this device, * {@link #UNSUPPORTED} will be returned. */ - public static long getUidTxBytes(int uid) { - return getNumberFromFilePath("/proc/uid_stat/" + uid + "/tcp_snd"); - } + public static native long getUidTxBytes(int uid); /** * Get the number of bytes received through the network for this UID. @@ -151,115 +121,5 @@ public class TrafficStats { * @param uid The UID of the process to examine. * @return number of bytes */ - public static long getUidRxBytes(int uid) { - return getNumberFromFilePath("/proc/uid_stat/" + uid + "/tcp_rcv"); - } - - /** - * Returns the array of two possible File locations for a given - * statistic. - */ - private static File[] mobileFiles(String whatStat) { - // Note that we stat them at runtime to see which is - // available, rather than here, to guard against the files - // coming & going later as modules shut down (e.g. airplane - // mode) and whatnot. The runtime stat() isn't expensive compared - // to the previous charset conversion that happened before we - // were reusing File instances. - File[] files = new File[2]; - files[0] = new File("/sys/class/net/rmnet0/statistics/" + whatStat); - files[1] = new File("/sys/class/net/ppp0/statistics/" + whatStat); - return files; - } - - private static long getTotalStat(String whatStat) { - File netdir = new File("/sys/class/net"); - - File[] nets = SYS_CLASS_NET_DIR.listFiles(); - if (nets == null) { - return UNSUPPORTED; - } - long total = 0; - StringBuffer strbuf = new StringBuffer(); - for (File net : nets) { - strbuf.append(net.getPath()).append(File.separator).append("statistics") - .append(File.separator).append(whatStat); - total += getNumberFromFilePath(strbuf.toString()); - strbuf.setLength(0); - } - return total; - } - - private static long getMobileStat(File[] files) { - for (int i = 0; i < files.length; i++) { - File file = files[i]; - if (!file.exists()) { - continue; - } - try { - RandomAccessFile raf = new RandomAccessFile(file, "r"); - return getNumberFromFile(raf, file.getAbsolutePath()); - } catch (IOException e) { - Log.w(TAG, - "Exception opening TCP statistics file " + file.getAbsolutePath(), - e); - } - } - return UNSUPPORTED; - } - - // File will have format <number><newline> - private static long getNumberFromFilePath(String filename) { - RandomAccessFile raf = getFile(filename); - if (raf == null) { - return UNSUPPORTED; - } - return getNumberFromFile(raf, filename); - } - - // Private buffer for getNumberFromFile. Safe for re-use because - // getNumberFromFile is synchronized. - private final static byte[] buf = new byte[16]; - - private static synchronized long getNumberFromFile(RandomAccessFile raf, String filename) { - try { - raf.read(buf); - raf.close(); - } catch (IOException e) { - Log.w(TAG, "Exception getting TCP bytes from " + filename, e); - return UNSUPPORTED; - } finally { - if (raf != null) { - try { - raf.close(); - } catch (IOException e) { - Log.w(TAG, "Exception closing " + filename, e); - } - } - } - - long num = 0L; - for (int i = 0; i < buf.length; i++) { - if (buf[i] < '0' || buf[i] > '9') { - break; - } - num *= 10; - num += buf[i] - '0'; - } - return num; - } - - private static RandomAccessFile getFile(String filename) { - File f = new File(filename); - if (!f.canRead()) { - return null; - } - - try { - return new RandomAccessFile(f, "r"); - } catch (IOException e) { - Log.w(TAG, "Exception opening TCP statistics file " + filename, e); - return null; - } - } + public static native long getUidRxBytes(int uid); } diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 05263628b44c..4233af196ba6 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -4882,6 +4882,9 @@ public class WebView extends AbsoluteLayout // we will not rewrite drag code here, but we // will try fling if it applies. WebViewCore.reducePriority(); + // to get better performance, pause updating the + // picture + WebViewCore.pauseUpdatePicture(mWebViewCore); // fall through to TOUCH_DRAG_MODE } else { break; @@ -4916,8 +4919,14 @@ public class WebView extends AbsoluteLayout doFling(); break; } + // fall through + case TOUCH_DRAG_START_MODE: + // TOUCH_DRAG_START_MODE should not happen for the real + // device as we almost certain will get a MOVE. But this + // is possible on emulator. mLastVelocity = 0; WebViewCore.resumePriority(); + WebViewCore.resumeUpdatePicture(mWebViewCore); break; } stopTouch(); @@ -4963,6 +4972,8 @@ public class WebView extends AbsoluteLayout private void startDrag() { WebViewCore.reducePriority(); + // to get better performance, pause updating the picture + WebViewCore.pauseUpdatePicture(mWebViewCore); if (!mDragFromTextInput) { nativeHideCursor(); } @@ -5026,6 +5037,7 @@ public class WebView extends AbsoluteLayout } if (mTouchMode == TOUCH_DRAG_MODE) { WebViewCore.resumePriority(); + WebViewCore.resumeUpdatePicture(mWebViewCore); } mPrivateHandler.removeMessages(SWITCH_TO_SHORTPRESS); mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS); @@ -5360,6 +5372,7 @@ public class WebView extends AbsoluteLayout } if ((maxX == 0 && vy == 0) || (maxY == 0 && vx == 0)) { WebViewCore.resumePriority(); + WebViewCore.resumeUpdatePicture(mWebViewCore); return; } float currentVelocity = mScroller.getCurrVelocity(); @@ -6369,6 +6382,7 @@ public class WebView extends AbsoluteLayout break; case RESUME_WEBCORE_PRIORITY: WebViewCore.resumePriority(); + WebViewCore.resumeUpdatePicture(mWebViewCore); break; case LONG_PRESS_CENTER: diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 85d1a6f17dff..a39d06b6c62c 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -58,6 +58,7 @@ LOCAL_SRC_FILES:= \ android_os_UEventObserver.cpp \ android_net_LocalSocketImpl.cpp \ android_net_NetUtils.cpp \ + android_net_TrafficStats.cpp \ android_net_wifi_Wifi.cpp \ android_nio_utils.cpp \ android_pim_EventRecurrence.cpp \ diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 7f8e8548c15f..487f3d403975 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -139,6 +139,7 @@ extern int register_android_os_UEventObserver(JNIEnv* env); extern int register_android_os_MemoryFile(JNIEnv* env); extern int register_android_net_LocalSocketImpl(JNIEnv* env); extern int register_android_net_NetworkUtils(JNIEnv* env); +extern int register_android_net_TrafficStats(JNIEnv* env); extern int register_android_net_wifi_WifiManager(JNIEnv* env); extern int register_android_security_Md5MessageDigest(JNIEnv *env); extern int register_android_text_AndroidCharacter(JNIEnv *env); @@ -1246,6 +1247,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_os_UEventObserver), REG_JNI(register_android_net_LocalSocketImpl), REG_JNI(register_android_net_NetworkUtils), + REG_JNI(register_android_net_TrafficStats), REG_JNI(register_android_net_wifi_WifiManager), REG_JNI(register_android_os_MemoryFile), REG_JNI(register_com_android_internal_os_ZygoteInit), diff --git a/core/jni/android_net_TrafficStats.cpp b/core/jni/android_net_TrafficStats.cpp new file mode 100644 index 000000000000..db8fdf2d4b56 --- /dev/null +++ b/core/jni/android_net_TrafficStats.cpp @@ -0,0 +1,165 @@ +/* + * Copyright (C) 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 "TrafficStats" + +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include <android_runtime/AndroidRuntime.h> +#include <cutils/logger.h> +#include <jni.h> +#include <utils/misc.h> +#include <utils/Log.h> + +namespace android { + +// Returns an ASCII decimal number read from the specified file, -1 on error. +static jlong readNumber(char const* filename) { + char buf[80]; + int fd = open(filename, O_RDONLY); + if (fd < 0) { + if (errno != ENOENT) LOGE("Can't open %s: %s", filename, strerror(errno)); + return -1; + } + + int len = read(fd, buf, sizeof(buf) - 1); + if (len < 0) { + LOGE("Can't read %s: %s", filename, strerror(errno)); + close(fd); + return -1; + } + + close(fd); + buf[len] = '\0'; + return atoll(buf); +} + +// Return the number from the first file which exists and contains data +static jlong tryBoth(char const* a, char const* b) { + jlong num = readNumber(a); + return num >= 0 ? num : readNumber(b); +} + +// Returns the sum of numbers from the specified path under /sys/class/net/*, +// -1 if no such file exists. +static jlong readTotal(char const* suffix) { + char filename[PATH_MAX] = "/sys/class/net/"; + DIR *dir = opendir(filename); + if (dir == NULL) { + LOGE("Can't list %s: %s", filename, strerror(errno)); + return -1; + } + + int len = strlen(filename); + jlong total = -1; + while (struct dirent *entry = readdir(dir)) { + // Skip ., .., and localhost interfaces. + if (entry->d_name[0] != '.' && strncmp(entry->d_name, "lo", 2) != 0) { + strlcpy(filename + len, entry->d_name, sizeof(filename) - len); + strlcat(filename, suffix, sizeof(filename)); + jlong num = readNumber(filename); + if (num >= 0) total = total < 0 ? num : total + num; + } + } + + closedir(dir); + return total; +} + +// Mobile stats get accessed a lot more often than total stats. +// Note the individual files can come and go at runtime, so we check +// each file every time (rather than caching which ones exist). + +static jlong getMobileTxPackets(JNIEnv* env, jobject clazz) { + return tryBoth( + "/sys/class/net/rmnet0/statistics/tx_packets", + "/sys/class/net/ppp0/statistics/tx_packets"); +} + +static jlong getMobileRxPackets(JNIEnv* env, jobject clazz) { + return tryBoth( + "/sys/class/net/rmnet0/statistics/rx_packets", + "/sys/class/net/ppp0/statistics/rx_packets"); +} + +static jlong getMobileTxBytes(JNIEnv* env, jobject clazz) { + return tryBoth( + "/sys/class/net/rmnet0/statistics/tx_bytes", + "/sys/class/net/ppp0/statistics/tx_bytes"); +} + +static jlong getMobileRxBytes(JNIEnv* env, jobject clazz) { + return tryBoth( + "/sys/class/net/rmnet0/statistics/rx_bytes", + "/sys/class/net/ppp0/statistics/rx_bytes"); +} + +// Total stats are read less often, so we're willing to put up +// with listing the directory and concatenating filenames. + +static jlong getTotalTxPackets(JNIEnv* env, jobject clazz) { + return readTotal("/statistics/tx_packets"); +} + +static jlong getTotalRxPackets(JNIEnv* env, jobject clazz) { + return readTotal("/statistics/rx_packets"); +} + +static jlong getTotalTxBytes(JNIEnv* env, jobject clazz) { + return readTotal("/statistics/tx_bytes"); +} + +static jlong getTotalRxBytes(JNIEnv* env, jobject clazz) { + return readTotal("/statistics/rx_bytes"); +} + +// Per-UID stats require reading from a constructed filename. + +static jlong getUidRxBytes(JNIEnv* env, jobject clazz, jint uid) { + char filename[80]; + sprintf(filename, "/proc/uid_stat/%d/tcp_rcv", uid); + return readNumber(filename); +} + +static jlong getUidTxBytes(JNIEnv* env, jobject clazz, jint uid) { + char filename[80]; + sprintf(filename, "/proc/uid_stat/%d/tcp_snd", uid); + return readNumber(filename); +} + +static JNINativeMethod gMethods[] = { + {"getMobileTxPackets", "()J", (void*) getMobileTxPackets}, + {"getMobileRxPackets", "()J", (void*) getMobileRxPackets}, + {"getMobileTxBytes", "()J", (void*) getMobileTxBytes}, + {"getMobileRxBytes", "()J", (void*) getMobileRxBytes}, + {"getTotalTxPackets", "()J", (void*) getTotalTxPackets}, + {"getTotalRxPackets", "()J", (void*) getTotalRxPackets}, + {"getTotalTxBytes", "()J", (void*) getTotalTxBytes}, + {"getTotalRxBytes", "()J", (void*) getTotalRxBytes}, + {"getUidTxBytes", "(I)J", (void*) getUidTxBytes}, + {"getUidRxBytes", "(I)J", (void*) getUidRxBytes}, +}; + +int register_android_net_TrafficStats(JNIEnv* env) { + return AndroidRuntime::registerNativeMethods(env, "android/net/TrafficStats", + gMethods, NELEM(gMethods)); +} + +} diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 36dc07c4c37e..45d7aeae4f4b 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2260,11 +2260,11 @@ <!-- Strings for throttling notification --> <!-- Shown when the user is in danger of being throttled --> - <string name="throttle_warning_notification_title">Excessive data use warning</string> - <string name="throttle_warning_notification_message">If your data use pattern continues you may be subject to bandwidth restrictions - touch for more information</string> + <string name="throttle_warning_notification_title">High mobile data use</string> + <string name="throttle_warning_notification_message">Touch to learn more about mobile data use</string> <!-- Strings for throttling notification --> <!-- Shown when the users bandwidth is reduced because of excessive data use --> - <string name="throttled_notification_title">Bandwidth Restricted</string> - <string name="throttled_notification_message">Your mobile data bandwidth is being reduced because of excessive data use - touch for more information</string> + <string name="throttled_notification_title">Mobile data limit exceeded</string> + <string name="throttled_notification_message">Touch to learn more about mobile data use</string> </resources> diff --git a/services/java/com/android/server/ThrottleService.java b/services/java/com/android/server/ThrottleService.java index 36931b23588c..99dbfd50d805 100644 --- a/services/java/com/android/server/ThrottleService.java +++ b/services/java/com/android/server/ThrottleService.java @@ -362,7 +362,8 @@ public class ThrottleService extends IThrottleManager.Stub { postNotification(com.android.internal.R.string.throttled_notification_title, com.android.internal.R.string.throttled_notification_message, - com.android.internal.R.drawable.stat_sys_throttled); + com.android.internal.R.drawable.stat_sys_throttled, + Notification.FLAG_ONGOING_EVENT); Intent broadcast = new Intent(ThrottleManager.THROTTLE_ACTION); broadcast.putExtra(ThrottleManager.EXTRA_THROTTLE_LEVEL, mPolicyThrottleValue); @@ -380,7 +381,8 @@ public class ThrottleService extends IThrottleManager.Stub { throttle_warning_notification_title, com.android.internal.R.string. throttle_warning_notification_message, - com.android.internal.R.drawable.stat_sys_throttle_warning); + com.android.internal.R.drawable.stat_sys_throttle_warning, + 0); } else { mWarningNotificationSent =false; } @@ -388,7 +390,7 @@ public class ThrottleService extends IThrottleManager.Stub { } } - private void postNotification(int titleInt, int messageInt, int icon) { + private void postNotification(int titleInt, int messageInt, int icon, int flags) { Intent intent = new Intent(); // TODO - fix up intent intent.setClassName("com.android.settings", "com.android.settings.TetherSettings"); @@ -405,8 +407,8 @@ public class ThrottleService extends IThrottleManager.Stub { // TODO - fixup icon mThrottlingNotification.icon = icon; mThrottlingNotification.defaults &= ~Notification.DEFAULT_SOUND; -// mThrottlingNotification.flags = Notification.FLAG_ONGOING_EVENT; } + mThrottlingNotification.flags = flags; mThrottlingNotification.tickerText = title; mThrottlingNotification.setLatestEventInfo(mContext, title, message, pi); diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java index e8e18a117a74..3b9e6cc351b0 100644 --- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java @@ -19,7 +19,6 @@ package com.android.internal.telephony; import android.app.PendingIntent; import android.os.AsyncResult; import android.os.Handler; -import android.os.INetStatService; import android.os.Message; import android.os.RemoteException; import android.provider.Settings; @@ -172,7 +171,6 @@ public abstract class DataConnectionTracker extends Handler { protected Handler mDataConnectionTracker = null; - protected INetStatService netstat; protected long txPkts, rxPkts, sentSinceLastRecv; protected int netStatPollPeriod; protected int mNoRecvPollCount = 0; diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java index 2f801cccb12a..217e1e86b093 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java @@ -26,9 +26,9 @@ import android.content.SharedPreferences; import android.net.ConnectivityManager; import android.net.IConnectivityManager; import android.net.NetworkInfo; +import android.net.TrafficStats; import android.net.wifi.WifiManager; import android.os.AsyncResult; -import android.os.INetStatService; import android.os.Message; import android.os.RemoteException; import android.os.ServiceManager; @@ -176,8 +176,6 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { p.mSST.registerForRoamingOff(this, EVENT_ROAMING_OFF, null); p.mCM.registerForCdmaOtaProvision(this, EVENT_CDMA_OTA_PROVISION, null); - this.netstat = INetStatService.Stub.asInterface(ServiceManager.getService("netstat")); - IntentFilter filter = new IntentFilter(); filter.addAction(INTENT_RECONNECT_ALARM); filter.addAction(Intent.ACTION_SCREEN_ON); @@ -495,78 +493,70 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { preTxPkts = txPkts; preRxPkts = rxPkts; - // check if netstat is still valid to avoid NullPointerException after NTC - if (netstat != null) { - try { - txPkts = netstat.getMobileTxPackets(); - rxPkts = netstat.getMobileRxPackets(); - } catch (RemoteException e) { - txPkts = 0; - rxPkts = 0; - } + txPkts = TrafficStats.getMobileTxPackets(); + rxPkts = TrafficStats.getMobileRxPackets(); - //Log.d(LOG_TAG, "rx " + String.valueOf(rxPkts) + " tx " + String.valueOf(txPkts)); + //Log.d(LOG_TAG, "rx " + String.valueOf(rxPkts) + " tx " + String.valueOf(txPkts)); - if (netStatPollEnabled && (preTxPkts > 0 || preRxPkts > 0)) { - sent = txPkts - preTxPkts; - received = rxPkts - preRxPkts; + if (netStatPollEnabled && (preTxPkts > 0 || preRxPkts > 0)) { + sent = txPkts - preTxPkts; + received = rxPkts - preRxPkts; - if ( sent > 0 && received > 0 ) { - sentSinceLastRecv = 0; - newActivity = Activity.DATAINANDOUT; - } else if (sent > 0 && received == 0) { - if (phone.getState() == Phone.State.IDLE) { - sentSinceLastRecv += sent; - } else { - sentSinceLastRecv = 0; - } - newActivity = Activity.DATAOUT; - } else if (sent == 0 && received > 0) { - sentSinceLastRecv = 0; - newActivity = Activity.DATAIN; - } else if (sent == 0 && received == 0) { - newActivity = (activity == Activity.DORMANT) ? activity : Activity.NONE; + if ( sent > 0 && received > 0 ) { + sentSinceLastRecv = 0; + newActivity = Activity.DATAINANDOUT; + } else if (sent > 0 && received == 0) { + if (phone.getState() == Phone.State.IDLE) { + sentSinceLastRecv += sent; } else { sentSinceLastRecv = 0; - newActivity = (activity == Activity.DORMANT) ? activity : Activity.NONE; } + newActivity = Activity.DATAOUT; + } else if (sent == 0 && received > 0) { + sentSinceLastRecv = 0; + newActivity = Activity.DATAIN; + } else if (sent == 0 && received == 0) { + newActivity = (activity == Activity.DORMANT) ? activity : Activity.NONE; + } else { + sentSinceLastRecv = 0; + newActivity = (activity == Activity.DORMANT) ? activity : Activity.NONE; + } - if (activity != newActivity) { - activity = newActivity; - phone.notifyDataActivity(); - } + if (activity != newActivity) { + activity = newActivity; + phone.notifyDataActivity(); } + } - if (sentSinceLastRecv >= NUMBER_SENT_PACKETS_OF_HANG) { - // Packets sent without ack exceeded threshold. + if (sentSinceLastRecv >= NUMBER_SENT_PACKETS_OF_HANG) { + // Packets sent without ack exceeded threshold. - if (mNoRecvPollCount == 0) { - EventLog.writeEvent( - EventLogTags.PDP_RADIO_RESET_COUNTDOWN_TRIGGERED, - sentSinceLastRecv); - } + if (mNoRecvPollCount == 0) { + EventLog.writeEvent( + EventLogTags.PDP_RADIO_RESET_COUNTDOWN_TRIGGERED, + sentSinceLastRecv); + } - if (mNoRecvPollCount < NO_RECV_POLL_LIMIT) { - mNoRecvPollCount++; - // Slow down the poll interval to let things happen - netStatPollPeriod = POLL_NETSTAT_SLOW_MILLIS; - } else { - if (DBG) log("Sent " + String.valueOf(sentSinceLastRecv) + - " pkts since last received"); - // We've exceeded the threshold. Restart the radio. - netStatPollEnabled = false; - stopNetStatPoll(); - restartRadio(); - EventLog.writeEvent(EventLogTags.PDP_RADIO_RESET, NO_RECV_POLL_LIMIT); - } + if (mNoRecvPollCount < NO_RECV_POLL_LIMIT) { + mNoRecvPollCount++; + // Slow down the poll interval to let things happen + netStatPollPeriod = POLL_NETSTAT_SLOW_MILLIS; } else { - mNoRecvPollCount = 0; - netStatPollPeriod = POLL_NETSTAT_MILLIS; + if (DBG) log("Sent " + String.valueOf(sentSinceLastRecv) + + " pkts since last received"); + // We've exceeded the threshold. Restart the radio. + netStatPollEnabled = false; + stopNetStatPoll(); + restartRadio(); + EventLog.writeEvent(EventLogTags.PDP_RADIO_RESET, NO_RECV_POLL_LIMIT); } + } else { + mNoRecvPollCount = 0; + netStatPollPeriod = POLL_NETSTAT_MILLIS; + } - if (netStatPollEnabled) { - mDataConnectionTracker.postDelayed(this, netStatPollPeriod); - } + if (netStatPollEnabled) { + mDataConnectionTracker.postDelayed(this, netStatPollPeriod); } } }; diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index f96865239d88..cbfb550109be 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -30,10 +30,10 @@ import android.database.Cursor; import android.net.ConnectivityManager; import android.net.IConnectivityManager; import android.net.NetworkInfo; +import android.net.TrafficStats; import android.net.Uri; import android.net.wifi.WifiManager; import android.os.AsyncResult; -import android.os.INetStatService; import android.os.Message; import android.os.RemoteException; import android.os.ServiceManager; @@ -83,7 +83,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { //***** Instance Variables - INetStatService netstat; // Indicates baseband will not auto-attach private boolean noAutoAttach = false; @@ -219,8 +218,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { p.mSST.registerForPsRestrictedEnabled(this, EVENT_PS_RESTRICT_ENABLED, null); p.mSST.registerForPsRestrictedDisabled(this, EVENT_PS_RESTRICT_DISABLED, null); - this.netstat = INetStatService.Stub.asInterface(ServiceManager.getService("netstat")); - IntentFilter filter = new IntentFilter(); filter.addAction(INTENT_RECONNECT_ALARM); filter.addAction(Intent.ACTION_SCREEN_ON); @@ -841,13 +838,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { preTxPkts = txPkts; preRxPkts = rxPkts; - try { - txPkts = netstat.getMobileTxPackets(); - rxPkts = netstat.getMobileRxPackets(); - } catch (RemoteException e) { - txPkts = 0; - rxPkts = 0; - } + txPkts = TrafficStats.getMobileTxPackets(); + rxPkts = TrafficStats.getMobileRxPackets(); //Log.d(LOG_TAG, "rx " + String.valueOf(rxPkts) + " tx " + String.valueOf(txPkts)); diff --git a/tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java b/tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java index f313a90b5af3..64882aa30eb1 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java +++ b/tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java @@ -55,7 +55,11 @@ public class OneEditTextActivitySelected extends Activity ((ScrollView) mRootView).addView(layout); setContentView(mRootView); - } + + // set to resize so IME is always shown (and also so + // ImfBaseTestCase#destructiveCheckImeInitialState thinks it should always be shown + this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); + } public View getRootView() { return mRootView; diff --git a/tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java b/tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java index 19576407696b..50e2009656b5 100755 --- a/tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java +++ b/tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java @@ -19,6 +19,7 @@ package com.android.imftest.samples; import android.app.Activity; import android.app.KeyguardManager; import android.content.Context; +import android.content.res.Configuration; import android.os.SystemClock; import android.test.InstrumentationTestCase; import android.view.KeyEvent; @@ -43,7 +44,6 @@ public abstract class ImfBaseTestCase<T extends Activity> extends Instrumentatio public final int IME_MIN_HEIGHT = 150; public final int IME_MAX_HEIGHT = 300; - public final String TARGET_PACKAGE_NAME = "com.android.imftest"; protected InputMethodManager mImm; protected T mTargetActivity; protected boolean mExpectAutoPop; @@ -56,9 +56,12 @@ public abstract class ImfBaseTestCase<T extends Activity> extends Instrumentatio @Override public void setUp() throws Exception { super.setUp(); + final String packageName = getInstrumentation().getTargetContext().getPackageName(); + mTargetActivity = launchActivity(packageName, mTargetActivityClass, null); + // expect ime to auto pop up if device has no hard keyboard + mExpectAutoPop = mTargetActivity.getResources().getConfiguration().hardKeyboardHidden == + Configuration.HARDKEYBOARDHIDDEN_YES; - mTargetActivity = launchActivity(TARGET_PACKAGE_NAME, mTargetActivityClass, null); - mExpectAutoPop = mTargetActivity.getResources().getBoolean(R.bool.def_expect_ime_autopop); mImm = InputMethodManager.getInstance(mTargetActivity); KeyguardManager keyguardManager = @@ -104,9 +107,9 @@ public abstract class ImfBaseTestCase<T extends Activity> extends Instrumentatio } public void destructiveCheckImeInitialState(View rootView, View servedView) { - if (mExpectAutoPop && (mTargetActivity.getWindow().getAttributes(). - softInputMode&WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST) - == WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) { + int windowSoftInputMode = mTargetActivity.getWindow().getAttributes().softInputMode; + int adjustMode = windowSoftInputMode & WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST; + if (mExpectAutoPop && adjustMode == WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) { assertTrue(destructiveCheckImeUp(rootView, servedView)); } else { assertFalse(destructiveCheckImeUp(rootView, servedView)); |