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

Commit c92bc851 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge remote-tracking branch 'github/cm-11.0' into HEAD

parents 4e52b186 5d230672

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/content/pm/IPackageManager.aidl \

	core/java/android/content/pm/IPackageMoveObserver.aidl \

	core/java/android/content/pm/IPackageStatsObserver.aidl \

	core/java/android/content/res/IThemeChangeListener.aidl \

	core/java/android/content/res/IThemeService.aidl \

	core/java/android/database/IContentObserver.aidl \

	core/java/android/hardware/ICameraService.aidl \

	core/java/android/hardware/ICameraServiceListener.aidl \
@@ -221,7 +223,6 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/app/IProcessStats.aidl \

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

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

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

	core/java/com/android/internal/appwidget/IAppWidgetService.aidl \

	core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \

	core/java/com/android/internal/backup/IBackupTransport.aidl \

cmds/bootanimation/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_C_INCLUDES := \

	$(call include-path-for, corecg graphics)



ifeq ($(TARGET_CONTINUOUS_SPLASH_ENABLED),true)

    LOCAL_CFLAGS += -DCONTINUOUS_SPLASH

endif



ifeq ($(TARGET_BOOTANIMATION_PRELOAD),true)

    LOCAL_CFLAGS += -DPRELOAD_BOOTANIMATION

endif

cmds/bootanimation/BootAnimation.cpp

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include "BootAnimation.h"



#define USER_BOOTANIMATION_FILE "/data/local/bootanimation.zip"

#define THEME_BOOTANIMATION_FILE "/data/system/theme/bootanimation.zip"

#define SYSTEM_BOOTANIMATION_FILE "/system/media/bootanimation.zip"

#define SYSTEM_ENCRYPTED_BOOTANIMATION_FILE "/system/media/bootanimation-encrypted.zip"

#define EXIT_PROP_NAME "service.bootanim.exit"
@@ -288,6 +289,9 @@ status_t BootAnimation::readyToRun() { 
            ((access(USER_BOOTANIMATION_FILE, R_OK) == 0) &&

            (mZip.open(USER_BOOTANIMATION_FILE) == NO_ERROR)) ||



            ((access(THEME_BOOTANIMATION_FILE, R_OK) == 0) &&

            (mZip.open(THEME_BOOTANIMATION_FILE) == NO_ERROR)) ||



            ((access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0) &&

            (mZip.open(SYSTEM_BOOTANIMATION_FILE) == NO_ERROR))) {

        mAndroidAnimation = false;
@@ -302,6 +306,8 @@ status_t BootAnimation::readyToRun() { 
        fd = fopen(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, "r");

    else if (access(USER_BOOTANIMATION_FILE, R_OK) == 0)

        fd = fopen(USER_BOOTANIMATION_FILE, "r");

    else if (access(THEME_BOOTANIMATION_FILE, R_OK) == 0)

        fd = fopen(THEME_BOOTANIMATION_FILE, "r");

    else if (access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0)

        fd = fopen(SYSTEM_BOOTANIMATION_FILE, "r");

    else
@@ -504,6 +510,7 @@ bool BootAnimation::movie() 
        }

    }



#ifndef CONTINUOUS_SPLASH

    // clear screen

    glShadeModel(GL_FLAT);

    glDisable(GL_DITHER);
@@ -513,6 +520,7 @@ bool BootAnimation::movie() 
    glClear(GL_COLOR_BUFFER_BIT);



    eglSwapBuffers(mDisplay, mSurface);

#endif



    glBindTexture(GL_TEXTURE_2D, 0);

    glEnable(GL_TEXTURE_2D);

core/java/android/app/ActivityManager.java

+0 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 The Android Open Source Project

 * This code has been modified.  Portions copyright (C) 2010, T-Mobile USA, Inc.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

core/java/android/app/ActivityManagerNative.java

+4 −2
Original line number Diff line number Diff line
@@ -2064,6 +2064,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 


class ActivityManagerProxy implements IActivityManager

{

    static final String TAG_TIMELINE = "Timeline";



    public ActivityManagerProxy(IBinder remote)

    {

        mRemote = remote;
@@ -2082,7 +2084,7 @@ class ActivityManagerProxy implements IActivityManager 
        Parcel reply = Parcel.obtain();



        if (intent.getComponent() != null) {

            Log.i("ActivityManager", "Timeline: Activity_launch_request id:"

            Log.i(TAG_TIMELINE, "Timeline: Activity_launch_request id:"

                    + intent.getComponent().getPackageName() + " time:"

                    + SystemClock.uptimeMillis());

        }
@@ -2436,7 +2438,7 @@ class ActivityManagerProxy implements IActivityManager 
    public void activityIdle(IBinder token, Configuration config, boolean stopProfiling)

            throws RemoteException

    {

        Log.i("ActivityManager", "Timeline: Activity_idle id: " + token + " time:"

        Log.i(TAG_TIMELINE, "Timeline: Activity_idle id: " + token + " time:"

                + SystemClock.uptimeMillis());

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();