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

Commit 9f6264de authored by Wysie's avatar Wysie
Browse files

Merge branch 'eclair' of git://github.com/cyanogen/android_frameworks_base into eclair 

Conflicts:
	core/java/android/provider/Settings.java
parents 4742dba6 605020f7

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -118283,6 +118283,17 @@ 
 visibility="public"

>

</field>

<field name="MEDIA_IGNORE_FILENAME"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;.nomedia&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="MEDIA_SCANNER_VOLUME"

 type="java.lang.String"

 transient="false"

camera/libcameraservice/CameraService.cpp

+4 −1
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService, 
        const sp<ICameraClient>& cameraClient, pid_t clientPid)

{

    int callingPid = getCallingPid();

    char propVal[PROPERTY_VALUE_MAX];

    LOGD("Client::Client E (pid %d)", callingPid);

    mCameraService = cameraService;

    mCameraClient = cameraClient;
@@ -233,6 +234,8 @@ CameraService::Client::Client(const sp<CameraService>& cameraService, 
                             CAMERA_MSG_ZOOM |

                             CAMERA_MSG_FOCUS);



    property_get("persist.camera.shutter.disable", propVal, "0");

    if(atoi(propVal) != 1)

        mMediaPlayerClick = newMediaPlayer("/system/media/audio/ui/camera_click.ogg");

    mMediaPlayerBeep = newMediaPlayer("/system/media/audio/ui/VideoRecord.ogg");

    mOverlayW = 0;

cmds/am/src/com/android/commands/am/Am.java

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class Am { 
        String uri = nextArg();

        if (uri != null) {

            Intent oldIntent = intent;

            intent = Intent.getIntent(uri);

            intent = Intent.parseUri(uri, 0);

            if (oldIntent.getAction() != null) {

                intent.setAction(oldIntent.getAction());

            }

core/java/android/app/ListActivity.java

+2 −4
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ package android.app; 


import android.os.Bundle;

import android.os.Handler;

import android.view.KeyEvent;

import android.view.View;

import android.widget.Adapter;

import android.widget.AdapterView;

import android.widget.ListAdapter;

import android.widget.ListView;
@@ -68,7 +66,7 @@ import android.widget.ListView; 
 *               android:layout_weight=&quot;1&quot;

 *               android:drawSelectorOnTop=&quot;false&quot;/&gt;

 * 

 *     &lt;TextView id=&quot;@id/android:empty&quot;

 *     &lt;TextView android:id=&quot;@id/android:empty&quot;

 *               android:layout_width=&quot;fill_parent&quot; 

 *               android:layout_height=&quot;fill_parent&quot;

 *               android:background=&quot;#FF0000&quot;
@@ -307,7 +305,7 @@ public class ListActivity extends Activity { 
    }



    private AdapterView.OnItemClickListener mOnClickListener = new AdapterView.OnItemClickListener() {

        public void onItemClick(AdapterView parent, View v, int position, long id)

        public void onItemClick(AdapterView<?> parent, View v, int position, long id)

        {

            onListItemClick((ListView)parent, v, position, id);

        }

core/java/android/content/ContentService.java

+3 −0
Original line number Diff line number Diff line
@@ -496,6 +496,9 @@ public final class ContentService extends IContentService.Stub { 


            // Look to see if the proper child already exists

            String segment = getUriSegment(uri, index);

            if (segment == null) {

                throw new IllegalArgumentException("Invalid Uri (" + uri + ") used for observer");

            }

            int N = mChildren.size();

            for (int i = 0; i < N; i++) {

                ObserverNode node = mChildren.get(i);