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

Commit 11abc8a3 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Merge commit 'goog/master' into merge_master 

Conflicts:
	opengl/libagl/Android.mk
	opengl/libs/Android.mk
	opengl/libs/egl_impl.h
parents 6ec72e3f e52a5a5f

api/1.xml

+2 −2
Original line number Diff line number Diff line
@@ -88531,7 +88531,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="predicates" type="com.android.internal.util.Predicate...">

<parameter name="predicates" type="com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...">

</parameter>

</method>

<method name="build"
@@ -169208,7 +169208,7 @@ 
>

<parameter name="loader" type="java.lang.ClassLoader">

</parameter>

<parameter name="interfaces" type="java.lang.Class...">

<parameter name="interfaces" type="java.lang.Class&lt;?&gt;...">

</parameter>

<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">

</exception>

api/2.xml

+2 −2
Original line number Diff line number Diff line
@@ -88575,7 +88575,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="predicates" type="com.android.internal.util.Predicate...">

<parameter name="predicates" type="com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...">

</parameter>

</method>

<method name="build"
@@ -169353,7 +169353,7 @@ 
>

<parameter name="loader" type="java.lang.ClassLoader">

</parameter>

<parameter name="interfaces" type="java.lang.Class...">

<parameter name="interfaces" type="java.lang.Class&lt;?&gt;...">

</parameter>

<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">

</exception>

api/4.xml

+0 −424
Original line number Diff line number Diff line
@@ -31801,97 +31801,6 @@ 
>

</field>

</class>

<interface name="IPackageInstallObserver"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.IInterface">

</implements>

<method name="packageInstalled"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">

</parameter>

<parameter name="returnCode" type="int">

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

</interface>

<class name="IPackageInstallObserver.Stub"

 extends="android.os.Binder"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.content.pm.IPackageInstallObserver">

</implements>

<constructor name="IPackageInstallObserver.Stub"

 type="android.content.pm.IPackageInstallObserver.Stub"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<method name="asBinder"

 return="android.os.IBinder"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="asInterface"

 return="android.content.pm.IPackageInstallObserver"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="obj" type="android.os.IBinder">

</parameter>

</method>

<method name="onTransact"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="code" type="int">

</parameter>

<parameter name="data" type="android.os.Parcel">

</parameter>

<parameter name="reply" type="android.os.Parcel">

</parameter>

<parameter name="flags" type="int">

</parameter>

<exception name="RemoteException" type="android.os.RemoteException">

</exception>

</method>

</class>

<class name="InstrumentationInfo"

 extends="android.content.pm.PackageItemInfo"

 abstract="false"
@@ -33041,36 +32950,6 @@ 
<parameter name="appInfo" type="android.content.pm.ApplicationInfo">

</parameter>

</method>

<method name="installPackage"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageURI" type="android.net.Uri">

</parameter>

<parameter name="observer" type="android.content.pm.IPackageInstallObserver">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<method name="installPackage"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageURI" type="android.net.Uri">

</parameter>

</method>

<method name="isSafeMode"

 return="boolean"

 abstract="true"
@@ -33344,17 +33223,6 @@ 
 visibility="public"

>

</field>

<field name="FORWARD_LOCK_PACKAGE"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="GET_ACTIVITIES"

 type="int"

 transient="false"
@@ -33531,270 +33399,6 @@ 
 visibility="public"

>

</field>

<field name="INSTALL_FAILED_ALREADY_EXISTS"

 type="int"

 transient="false"

 volatile="false"

 value="-1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_CONFLICTING_PROVIDER"

 type="int"

 transient="false"

 volatile="false"

 value="-13"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_DEXOPT"

 type="int"

 transient="false"

 volatile="false"

 value="-11"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_DUPLICATE_PACKAGE"

 type="int"

 transient="false"

 volatile="false"

 value="-5"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_INSUFFICIENT_STORAGE"

 type="int"

 transient="false"

 volatile="false"

 value="-4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_INVALID_APK"

 type="int"

 transient="false"

 volatile="false"

 value="-2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_INVALID_URI"

 type="int"

 transient="false"

 volatile="false"

 value="-3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_MISSING_SHARED_LIBRARY"

 type="int"

 transient="false"

 volatile="false"

 value="-9"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_NO_SHARED_USER"

 type="int"

 transient="false"

 volatile="false"

 value="-6"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_OLDER_SDK"

 type="int"

 transient="false"

 volatile="false"

 value="-12"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_REPLACE_COULDNT_DELETE"

 type="int"

 transient="false"

 volatile="false"

 value="-10"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_SHARED_USER_INCOMPATIBLE"

 type="int"

 transient="false"

 volatile="false"

 value="-8"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_FAILED_UPDATE_INCOMPATIBLE"

 type="int"

 transient="false"

 volatile="false"

 value="-7"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_BAD_MANIFEST"

 type="int"

 transient="false"

 volatile="false"

 value="-101"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME"

 type="int"

 transient="false"

 volatile="false"

 value="-106"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_BAD_SHARED_USER_ID"

 type="int"

 transient="false"

 volatile="false"

 value="-107"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING"

 type="int"

 transient="false"

 volatile="false"

 value="-105"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES"

 type="int"

 transient="false"

 volatile="false"

 value="-104"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_MANIFEST_EMPTY"

 type="int"

 transient="false"

 volatile="false"

 value="-109"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_MANIFEST_MALFORMED"

 type="int"

 transient="false"

 volatile="false"

 value="-108"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_NOT_APK"

 type="int"

 transient="false"

 volatile="false"

 value="-100"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_NO_CERTIFICATES"

 type="int"

 transient="false"

 volatile="false"

 value="-103"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION"

 type="int"

 transient="false"

 volatile="false"

 value="-102"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_SUCCEEDED"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="MATCH_DEFAULT_ONLY"

 type="int"

 transient="false"
@@ -33850,17 +33454,6 @@ 
 visibility="public"

>

</field>

<field name="REPLACE_EXISTING_PACKAGE"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SIGNATURE_FIRST_NOT_SIGNED"

 type="int"

 transient="false"
@@ -101178,23 +100771,6 @@ 
<parameter name="appInfo" type="android.content.pm.ApplicationInfo">

</parameter>

</method>

<method name="installPackage"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="packageURI" type="android.net.Uri">

</parameter>

<parameter name="observer" type="android.content.pm.IPackageInstallObserver">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<method name="isSafeMode"

 return="boolean"

 abstract="false"

api/current.xml

+713 −589

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/CameraService.cpp

+8 −8
Original line number Diff line number Diff line
@@ -915,24 +915,24 @@ String8 CameraService::Client::getParameters() const 
void CameraService::Client::postAutoFocus(bool focused)

{

    LOGV("postAutoFocus");

    mCameraClient->autoFocusCallback(focused);

    mCameraClient->notifyCallback(CAMERA_MSG_FOCUS, (int32_t)focused, 0);

}



void CameraService::Client::postShutter()

{

    mCameraClient->shutterCallback();

    mCameraClient->notifyCallback(CAMERA_MSG_SHUTTER, 0, 0);

}



void CameraService::Client::postRaw(const sp<IMemory>& mem)

{

    LOGD("postRaw");

    mCameraClient->rawCallback(mem);

    mCameraClient->dataCallback(CAMERA_MSG_RAW_IMAGE, mem);

}



void CameraService::Client::postJpeg(const sp<IMemory>& mem)

{

    LOGD("postJpeg");

    mCameraClient->jpegCallback(mem);

    mCameraClient->dataCallback(CAMERA_MSG_COMPRESSED_IMAGE, mem);

}



void CameraService::Client::copyFrameAndPostCopiedFrame(sp<IMemoryHeap> heap, size_t offset, size_t size)
@@ -960,7 +960,7 @@ void CameraService::Client::copyFrameAndPostCopiedFrame(sp<IMemoryHeap> heap, si 
        LOGE("failed to allocate space for frame callback");

        return;

    }

    mCameraClient->previewCallback(frame);

    mCameraClient->dataCallback(CAMERA_MSG_PREVIEW_FRAME, frame);

}



void CameraService::Client::postRecordingFrame(const sp<IMemory>& frame)
@@ -970,7 +970,7 @@ void CameraService::Client::postRecordingFrame(const sp<IMemory>& frame) 
        LOGW("frame is a null pointer");

        return;

    }

    mCameraClient->recordingCallback(frame);

    mCameraClient->dataCallback(CAMERA_MSG_VIDEO_FRAME, frame);

}



void CameraService::Client::postPreviewFrame(const sp<IMemory>& mem)
@@ -1004,7 +1004,7 @@ void CameraService::Client::postPreviewFrame(const sp<IMemory>& mem) 
        copyFrameAndPostCopiedFrame(heap, offset, size);

    } else {

        LOGV("frame is directly sent out without copying");

        mCameraClient->previewCallback(mem);

        mCameraClient->dataCallback(CAMERA_MSG_PREVIEW_FRAME, mem);

    }



    // Is this is one-shot only?
@@ -1018,7 +1018,7 @@ void CameraService::Client::postPreviewFrame(const sp<IMemory>& mem) 


void CameraService::Client::postError(status_t error)

{

    mCameraClient->errorCallback(error);

    mCameraClient->notifyCallback(CAMERA_MSG_ERROR, error, 0);

}



status_t CameraService::dump(int fd, const Vector<String16>& args)