diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-09-30 18:27:22 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-09-30 18:27:22 -0700 |
commit | cef65eeb0315c3118bf8860d6f723cb49ff6bc52 (patch) | |
tree | 2917e5a149a267eac00b13a27a88627e252cfe23 /core | |
parent | 727d67d4fb8721b0291312e4cca33927dfba0e31 (diff) | |
download | frameworks_base-cef65eeb0315c3118bf8860d6f723cb49ff6bc52.zip frameworks_base-cef65eeb0315c3118bf8860d6f723cb49ff6bc52.tar.gz frameworks_base-cef65eeb0315c3118bf8860d6f723cb49ff6bc52.tar.bz2 |
Rub in a little 'ol log-b-gone.
Mmmmmm... great fresh scent!
Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/app/ActivityThread.java | 2 | ||||
-rw-r--r-- | core/java/android/content/pm/PackageParser.java | 5 | ||||
-rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 2 | ||||
-rw-r--r-- | core/java/android/net/NetworkStateTracker.java | 8 | ||||
-rw-r--r-- | core/res/res/values/arrays.xml | 14 |
5 files changed, 11 insertions, 20 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index a10a823..63a5ff6 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -3262,7 +3262,7 @@ public final class ActivityThread { while (i.hasNext()) { ProviderInfo cpi = i.next(); StringBuilder buf = new StringBuilder(128); - buf.append("Publishing provider "); + buf.append("Pub "); buf.append(cpi.authority); buf.append(": "); buf.append(cpi.name); diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index e853120..6dfc72f 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -1717,6 +1717,11 @@ public class PackageParser { XmlUtils.skipCurrentTag(parser); + } else if (tagName.equals("uses-package")) { + // Dependencies for app installers; we don't currently try to + // enforce this. + XmlUtils.skipCurrentTag(parser); + } else { if (!RIGID_PARSER) { Log.w(TAG, "Unknown element under <application>: " + tagName diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index eb7117b..ffbd69d 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -42,7 +42,7 @@ import android.text.TextUtils; public class MobileDataStateTracker extends NetworkStateTracker { private static final String TAG = "MobileDataStateTracker"; - private static final boolean DBG = true; + private static final boolean DBG = false; private Phone.DataState mMobileDataState; private ITelephony mPhoneService; diff --git a/core/java/android/net/NetworkStateTracker.java b/core/java/android/net/NetworkStateTracker.java index 7803bf2..d340a99 100644 --- a/core/java/android/net/NetworkStateTracker.java +++ b/core/java/android/net/NetworkStateTracker.java @@ -47,7 +47,7 @@ public abstract class NetworkStateTracker extends Handler { protected int mDefaultGatewayAddr; private boolean mTeardownRequested; - private static boolean DBG = true; + private static boolean DBG = false; private static final String TAG = "NetworkStateTracker"; // Share the event space with ConnectivityService (which we can't see, but @@ -186,7 +186,7 @@ public abstract class NetworkStateTracker extends Handler { String bufferSizes = SystemProperties.get(key); if (bufferSizes.length() == 0) { - Log.e(TAG, key + " not found in system properties. Using defaults"); + Log.w(TAG, key + " not found in system properties. Using defaults"); // Setting to default values so we won't be stuck to previous values key = "net.tcp.buffersize.default"; @@ -230,10 +230,10 @@ public abstract class NetworkStateTracker extends Handler { stringToFile(prefix + "wmem_def", values[4]); stringToFile(prefix + "wmem_max", values[5]); } else { - Log.e(TAG, "Invalid buffersize string: " + bufferSizes); + Log.w(TAG, "Invalid buffersize string: " + bufferSizes); } } catch (IOException e) { - Log.e(TAG, "Can't set tcp buffer sizes:" + e); + Log.w(TAG, "Can't set tcp buffer sizes:" + e); } } diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index aeee8af..a33851c 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -71,20 +71,6 @@ <item>@drawable/indicator_code_lock_point_area_default</item> <item>@drawable/indicator_code_lock_point_area_green</item> <item>@drawable/indicator_code_lock_point_area_red</item> - <!-- SlidingTab drawables shared by InCallScreen and LockScreen --> - <item>@drawable/jog_tab_bar_left_end_confirm_gray</item> - <item>@drawable/jog_tab_bar_left_end_normal</item> - <item>@drawable/jog_tab_bar_left_end_pressed</item> - <item>@drawable/jog_tab_bar_right_end_confirm_gray</item> - <item>@drawable/jog_tab_bar_right_end_normal</item> - <item>@drawable/jog_tab_bar_right_end_pressed</item> - <item>@drawable/jog_tab_left_confirm_gray</item> - <item>@drawable/jog_tab_left_normal</item> - <item>@drawable/jog_tab_left_pressed</item> - <item>@drawable/jog_tab_right_confirm_gray</item> - <item>@drawable/jog_tab_right_normal</item> - <item>@drawable/jog_tab_right_pressed</item> - <item>@drawable/jog_tab_target_gray</item> </array> <!-- Do not translate. These are all of the color state list resources that should be |