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

Commit 2da99bda authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Merge commit 'goog/master' into merge_master 

Conflicts:
	include/ui/Rect.h
	libs/ui/ISurfaceComposer.cpp
parents 947f4f4d cc77841f

Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ 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
@@ -346,7 +348,7 @@ web_docs_sample_code_flags := \ 
# 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_REL_ID :=   2

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



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

api/current.xml

+852 −513

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/CameraService.cpp

+0 −6
Original line number Diff line number Diff line
@@ -1052,12 +1052,6 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) 
}





#define CHECK_INTERFACE(interface, data, reply) \

        do { if (!data.enforceInterface(interface::getInterfaceDescriptor())) { \

            LOGW("Call incorrectly routed to " #interface); \

            return PERMISSION_DENIED; \

        } } while (0)



status_t CameraService::onTransact(

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

{

cmds/dumpstate/dumpstate.c

+2 −1
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ int main(int argc, char *argv[]) { 
    int c, fd, vibrate_fd, fds[2];

    char path[PATH_MAX];

    pid_t   pid;

    gid_t groups[] = { AID_LOG, AID_SDCARD_RW };



    /* set as high priority, and protect from OOM killer */

    setpriority(PRIO_PROCESS, 0, -20);
@@ -207,7 +208,7 @@ int main(int argc, char *argv[]) { 
        vibrate_fd = -1;



    /* switch to non-root user and group */

    setgid(AID_LOG);

    setgroups(sizeof(groups)/sizeof(groups[0]), groups);

    setuid(AID_SHELL);



    /* make it safe to use both printf and STDOUT_FILENO */

cmds/pm/src/com/android/commands/pm/Pm.java

+3 −0
Original line number Diff line number Diff line
@@ -543,6 +543,9 @@ public final class Pm { 
        case PackageManager.INSTALL_FAILED_TEST_ONLY:

            s = "INSTALL_FAILED_TEST_ONLY";

            break;

        case PackageManager.INSTALL_FAILED_CPU_ABI_INCOMPATIBLE:

            s = "INSTALL_FAILED_CPU_ABI_INCOMPATIBLE";

            break;

        case PackageManager.INSTALL_PARSE_FAILED_NOT_APK:

            s = "INSTALL_PARSE_FAILED_NOT_APK";

            break;