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

Commit f670127a authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Merge commit 'goog/master' into merge_master

parents 13b3b5c9 d004ee1b

Android.mk

+21 −11
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/view/IWindow.aidl \

	core/java/android/view/IWindowManager.aidl \

	core/java/android/view/IWindowSession.aidl \

	core/java/android/speech/IRecognitionListener.aidl \

	core/java/android/speech/IRecognitionService.aidl \

	core/java/com/android/internal/app/IBatteryStats.aidl \

	core/java/com/android/internal/app/IUsageStats.aidl \

	core/java/com/android/internal/appwidget/IAppWidgetService.aidl \
@@ -112,6 +114,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/view/IInputMethodManager.aidl \

	core/java/com/android/internal/view/IInputMethodSession.aidl \

	im/java/android/im/IImPlugin.aidl \

	location/java/android/location/IGeocodeProvider.aidl \

	location/java/android/location/IGpsStatusListener.aidl \

	location/java/android/location/ILocationCollector.aidl \

	location/java/android/location/ILocationListener.aidl \
@@ -300,12 +303,6 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 


framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:=$(call intermediates-dir-for,JAVA_LIBRARIES,framework)



web_docs_sample_code_flags := \

		-hdf android.hasSamples 1 \

		-samplecode samples/ApiDemos guide/samples/ApiDemos "API Demos" \

		-samplecode samples/LunarLander guide/samples/LunarLander "Lunar Lander" \

		-samplecode samples/NotePad guide/samples/NotePad "Note Pad"



sample_dir := development/samples



web_docs_sample_code_flags := \
@@ -317,6 +314,19 @@ web_docs_sample_code_flags := \ 
		-samplecode $(sample_dir)/NotePad \

		            guide/samples/NotePad "Note Pad"



# SDK version identifiers used in the published docs. 



# major[.minor] version for SDK. Typically identical to the 

# most current Android platform version included in the SDK package. 

framework_docs_SDK_VERSION :=  1.5

# release version for SDK (ie "Release x")

framework_docs_SDK_REL_ID :=   1

framework_docs_SDK_CURRENT_DIR := $(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID)



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \

		-hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \

		-hdf sdk.current $(framework_docs_SDK_CURRENT_DIR)



# ====  static html in the sdk ==================================

include $(CLEAR_VARS)

api/current.xml

+240 −1144

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/CameraService.cpp

+10 −4
Original line number Diff line number Diff line
@@ -217,7 +217,13 @@ status_t CameraService::Client::unlock() 
    // allow anyone to use camera

    LOGV("unlock (%p)", getCameraClient()->asBinder().get());

    status_t result = checkPid();

    if (result == NO_ERROR) mClientPid = 0;

    if (result == NO_ERROR) {

        mClientPid = 0;



        // we need to remove the reference so that when app goes

        // away, the reference count goes to 0.

        mCameraClient.clear();

    }

    return result;

}
@@ -894,8 +900,6 @@ status_t CameraService::Client::setParameters(const String8& params) 
// get preview/capture parameters - key/value pairs

String8 CameraService::Client::getParameters() const

{

    LOGD("getParameters");



    Mutex::Autolock lock(mLock);



    if (mHardware == 0) {
@@ -903,7 +907,9 @@ String8 CameraService::Client::getParameters() const 
        return String8();

    }



    return mHardware->getParameters().flatten();

    String8 params(mHardware->getParameters().flatten());

    LOGD("getParameters(%s)", params.string());

    return params;

}



void CameraService::Client::postAutoFocus(bool focused)

core/java/android/accounts/AbstractAccountAuthenticator.java

+25 −3
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ import android.os.RemoteException; 
public abstract class AbstractAccountAuthenticator {

    class Transport extends IAccountAuthenticator.Stub {

        public void addAccount(IAccountAuthenticatorResponse response, String accountType,

                String authTokenType, Bundle options)

                String authTokenType, String[] requiredFeatures, Bundle options)

                throws RemoteException {

            final Bundle result;

            try {

                result = AbstractAccountAuthenticator.this.addAccount(

                    new AccountAuthenticatorResponse(response),

                        accountType, authTokenType, options);

                        accountType, authTokenType, requiredFeatures, options);

            } catch (NetworkErrorException e) {

                response.onError(Constants.ERROR_CODE_NETWORK_ERROR, e.getMessage());

                return;
@@ -133,6 +133,25 @@ public abstract class AbstractAccountAuthenticator { 
                response.onResult(result);

            }

        }



        public void hasFeatures(IAccountAuthenticatorResponse response,

                Account account, String[] features) throws RemoteException {

            final Bundle result;

            try {

                result = AbstractAccountAuthenticator.this.hasFeatures(

                    new AccountAuthenticatorResponse(response), account, features);

            } catch (UnsupportedOperationException e) {

                response.onError(Constants.ERROR_CODE_UNSUPPORTED_OPERATION,

                        "hasFeatures not supported");

                return;

            } catch (NetworkErrorException e) {

                response.onError(Constants.ERROR_CODE_NETWORK_ERROR, e.getMessage());

                return;

            }

            if (result != null) {

                response.onResult(result);

            }

        }

    }



    Transport mTransport = new Transport();
@@ -160,7 +179,8 @@ public abstract class AbstractAccountAuthenticator { 
    public abstract Bundle editProperties(AccountAuthenticatorResponse response,

            String accountType);

    public abstract Bundle addAccount(AccountAuthenticatorResponse response, String accountType,

            String authTokenType, Bundle options) throws NetworkErrorException;

            String authTokenType, String[] requiredFeatures, Bundle options)

            throws NetworkErrorException;

    /* @deprecated */

    public abstract boolean confirmPassword(AccountAuthenticatorResponse response,

            Account account, String password) throws NetworkErrorException;
@@ -171,4 +191,6 @@ public abstract class AbstractAccountAuthenticator { 
            throws NetworkErrorException;

    public abstract Bundle updateCredentials(AccountAuthenticatorResponse response,

            Account account, String authTokenType, Bundle loginOptions);

    public abstract Bundle hasFeatures(AccountAuthenticatorResponse response,

            Account account, String[] features) throws NetworkErrorException;

}

core/java/android/accounts/AccountManager.java

+363 −27

File changed.

Preview size limit exceeded, changes collapsed.