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

Commit dc71b9e4 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 6a3eddb4 to master 

Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
parents 557ed7aa 6a3eddb4

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -3352,7 +3352,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
@@ -1730,6 +1730,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
@@ -45,7 +45,7 @@ import android.text.TextUtils; 
public class MobileDataStateTracker implements 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/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

services/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ import java.net.UnknownHostException; 
 */

public class ConnectivityService extends IConnectivityManager.Stub {



    private static final boolean DBG = true;

    private static final boolean DBG = false;

    private static final String TAG = "ConnectivityService";



    // how long to wait before switching back to a radio's default network