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

Commit 69f066c8 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Merge commit 'goog/master' into merge_master

parents 151e859e b0b160ae

Android.mk

+8 −7
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IIntentSender.aidl \

	core/java/android/app/INotificationManager.aidl \

	core/java/android/app/ISearchManager.aidl \

	core/java/android/app/ISearchManagerCallback.aidl \

	core/java/android/app/IServiceConnection.aidl \

	core/java/android/app/IStatusBar.aidl \

	core/java/android/app/IThumbnailReceiver.aidl \
@@ -86,9 +87,9 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IWallpaperService.aidl \

	core/java/android/app/IWallpaperServiceCallback.aidl \

	core/java/android/backup/IBackupManager.aidl \

	core/java/android/backup/IRestoreSession.aidl \

	core/java/android/bluetooth/IBluetoothA2dp.aidl \

	core/java/android/bluetooth/IBluetoothDevice.aidl \

	core/java/android/bluetooth/IBluetoothDeviceCallback.aidl \

	core/java/android/bluetooth/IBluetoothHeadset.aidl \

        core/java/android/content/IContentService.aidl \

	core/java/android/content/ISyncAdapter.aidl \
@@ -121,6 +122,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/view/IWindowSession.aidl \

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

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

	core/java/android/speech/tts/ITts.aidl \

	core/java/android/speech/tts/ITtsCallback.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 \
@@ -150,10 +153,9 @@ LOCAL_SRC_FILES += \ 
	telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \

	telephony/java/com/android/internal/telephony/IIccPhoneBook.aidl \

	telephony/java/com/android/internal/telephony/ISms.aidl \

	tts/java/android/tts/ITtsCallback.aidl \

	tts/java/android/tts/ITts.aidl \

	wifi/java/android/net/wifi/IWifiManager.aidl \

	telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl

	telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \

	vpn/java/android/net/vpn/IVpnService.aidl \



# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk

LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
@@ -226,7 +228,8 @@ aidl_files := \ 
	frameworks/base/location/java/android/location/Location.aidl \

	frameworks/base/telephony/java/android/telephony/ServiceState.aidl \

	frameworks/base/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \

	frameworks/base/telephony/java/com/android/internal/telephony/ITelephony.aidl

	frameworks/base/telephony/java/com/android/internal/telephony/ITelephony.aidl \

	frameworks/base/vpn/java/android/net/vpn/IVpnService.aidl \



gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl

$(gen): PRIVATE_SRC_FILES := $(aidl_files)
@@ -478,5 +481,3 @@ include $(BUILD_JAVA_LIBRARY) 
ifeq (,$(ONE_SHOT_MAKEFILE))

include $(call first-makefiles-under,$(LOCAL_PATH))

endif

api/4.xml

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

>

</field>

<field name="ADD_SYSTEM_SERVICE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.ADD_SYSTEM_SERVICE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="BATTERY_STATS"

 type="java.lang.String"

 transient="false"
@@ -463,17 +452,6 @@ 
 visibility="public"

>

</field>

<field name="FOTA_UPDATE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.FOTA_UPDATE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="GET_ACCOUNTS"

 type="java.lang.String"

 transient="false"
@@ -925,17 +903,6 @@ 
 visibility="public"

>

</field>

<field name="SET_PROCESS_FOREGROUND"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.SET_PROCESS_FOREGROUND&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SET_PROCESS_LIMIT"

 type="java.lang.String"

 transient="false"

api/current.xml

+662 −2117

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/CameraService.cpp

+7 −7
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ status_t CameraService::Client::unlock() 
{

    Mutex::Autolock _l(mLock);

    // allow anyone to use camera

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

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

    status_t result = checkPid();

    if (result == NO_ERROR) {

        mClientPid = 0;
@@ -230,7 +230,7 @@ status_t CameraService::Client::unlock() 
status_t CameraService::Client::connect(const sp<ICameraClient>& client)

{

    // connect a new process to the camera

    LOGV("connect (%p)", client->asBinder().get());

    LOGD("connect (%p)", client->asBinder().get());



    // I hate this hack, but things get really ugly when the media recorder

    // service is handing back the camera to the app. The ICameraClient
@@ -245,7 +245,7 @@ status_t CameraService::Client::connect(const sp<ICameraClient>& client) 
        sp<ICameraClient> oldClient;

        {

            Mutex::Autolock _l(mLock);

            if (mClientPid != 0) {

            if (mClientPid != 0 && checkPid() != NO_ERROR) {

                LOGW("Tried to connect to locked camera");

                return -EBUSY;

            }
@@ -257,7 +257,7 @@ status_t CameraService::Client::connect(const sp<ICameraClient>& client) 
            mCameraClient = client;

            mClientPid = -1;

            mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP;

            LOGV("connect new process (%d) to existing camera client", mClientPid);

            LOGD("connect new process (%d) to existing camera client", mClientPid);

        }



    }
@@ -319,17 +319,17 @@ void CameraService::Client::disconnect() 
            IPCThreadState::self()->getCallingPid());

    Mutex::Autolock lock(mLock);

    if (mClientPid <= 0) {

        LOGV("camera is unlocked, don't tear down hardware");

        LOGD("camera is unlocked, don't tear down hardware");

        return;

    }

    if (checkPid() != NO_ERROR) {

        LOGV("Different client - don't disconnect");

        LOGD("Different client - don't disconnect");

        return;

    }



    mCameraService->removeClient(mCameraClient);

    if (mHardware != 0) {

        LOGV("hardware teardown");

        LOGD("hardware teardown");

        // Before destroying mHardware, we must make sure it's in the

        // idle state.

        mHardware->stopPreview();

cmds/bmgr/Android.mk

0 → 100644
+15 −0
Original line number Diff line number Diff line 
# Copyright 2007 The Android Open Source Project

#

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_MODULE := bmgr

include $(BUILD_JAVA_LIBRARY)





include $(CLEAR_VARS)

ALL_PREBUILT += $(TARGET_OUT)/bin/bmgr

$(TARGET_OUT)/bin/bmgr : $(LOCAL_PATH)/bmgr | $(ACP)

	$(transform-prebuilt-to-target)