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

Commit 9dc25e3c authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'master' into froyo-release

parents f32c7291 bb961a05

cmds/stagefright/stagefright.cpp

+3 −1
Original line number Diff line number Diff line
@@ -370,7 +370,9 @@ int main(int argc, char **argv) { 


        const char *kMimeTypes[] = {

            MEDIA_MIMETYPE_VIDEO_AVC, MEDIA_MIMETYPE_VIDEO_MPEG4,

            MEDIA_MIMETYPE_VIDEO_H263

            MEDIA_MIMETYPE_VIDEO_H263, MEDIA_MIMETYPE_AUDIO_AAC,

            MEDIA_MIMETYPE_AUDIO_AMR_NB, MEDIA_MIMETYPE_AUDIO_AMR_WB,

            MEDIA_MIMETYPE_AUDIO_MPEG

        };



        for (size_t k = 0; k < sizeof(kMimeTypes) / sizeof(kMimeTypes[0]);

core/java/android/app/ActivityManager.java

+17 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.ConfigurationInfo;

import android.content.pm.IPackageDataObserver;

import android.graphics.Bitmap;
@@ -858,6 +859,22 @@ public class ActivityManager { 
        }

    }

    

    /**

     * Returns a list of application processes installed on external media

     * that are running on the device.

     *

     * @return Returns a list of ApplicationInfo records, or null if none

     * This list ordering is not specified.

     * @hide

     */

    public List<ApplicationInfo> getRunningExternalApplications() {

        try {

            return ActivityManagerNative.getDefault().getRunningExternalApplications();

        } catch (RemoteException e) {

            return null;

        }

    }



    /**

     * Returns a list of application processes that are running on the device.

     *

core/java/android/app/ActivityManagerNative.java

+21 −0
Original line number Diff line number Diff line
@@ -491,6 +491,14 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case GET_RUNNING_EXTERNAL_APPLICATIONS_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            List<ApplicationInfo> list = getRunningExternalApplications();

            reply.writeNoException();

            reply.writeTypedList(list);

            return true;

        }



        case MOVE_TASK_TO_FRONT_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            int task = data.readInt();
@@ -1716,6 +1724,19 @@ class ActivityManagerProxy implements IActivityManager 
        reply.recycle();

        return list;

    }

    public List<ApplicationInfo> getRunningExternalApplications()

            throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        mRemote.transact(GET_RUNNING_EXTERNAL_APPLICATIONS_TRANSACTION, data, reply, 0);

        reply.readException();

        ArrayList<ApplicationInfo> list

        = reply.createTypedArrayList(ApplicationInfo.CREATOR);

        data.recycle();

        reply.recycle();

        return list;

    }

    public void moveTaskToFront(int task) throws RemoteException

    {

        Parcel data = Parcel.obtain();

core/java/android/app/IActivityManager.java

+6 −1
Original line number Diff line number Diff line
@@ -262,9 +262,13 @@ public interface IActivityManager extends IInterface { 
     * SIGUSR1 is delivered. All others are ignored.

     */

    public void signalPersistentProcesses(int signal) throws RemoteException;

    // Retrieve running application processes in the system

    // Retrieve info of applications installed on external media that are currently

    // running.

    public List<ActivityManager.RunningAppProcessInfo> getRunningAppProcesses()

            throws RemoteException;

 // Retrieve running application processes in the system

    public List<ApplicationInfo> getRunningExternalApplications()

            throws RemoteException;

    // Get device configuration

    public ConfigurationInfo getDeviceConfigurationInfo() throws RemoteException;
@@ -508,4 +512,5 @@ public interface IActivityManager extends IInterface { 
    int START_ACTIVITY_AND_WAIT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+104;

    int WILL_ACTIVITY_BE_VISIBLE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+105;

    int START_ACTIVITY_WITH_CONFIG_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+106;

    int GET_RUNNING_EXTERNAL_APPLICATIONS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+107;

}

core/java/android/content/EventLogTags.logtags

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 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)