Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a3eddb4 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread 

Merge commit '0a69f597' into gingerbread-plus-aosp

* commit '0a69f597':
  Rub in a little 'ol log-b-gone.
parents 0457db37 0a69f597

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/content/pm/PackageParser.java

+5 −0
Original line number Diff line number Diff line
@@ -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

core/java/android/net/MobileDataStateTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,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;

core/java/android/net/NetworkStateTracker.java

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,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
@@ -199,7 +199,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";
@@ -243,10 +243,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);

        }

    }

core/res/res/values/arrays.xml

+0 −14
Original line number Diff line number Diff line
@@ -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