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

Commit b2abd8c4 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Mass merge from gingerbread - do not merge 

Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
parents 3c89f6d1 43abedde

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/7.xml 7 \

    -since ./frameworks/base/api/8.xml 8 \

    -since ./frameworks/base/api/9.xml 9 \

    -since ./frameworks/base/api/10.xml 10 \

    -since ./frameworks/base/api/current.xml Honeycomb \

		-werror -hide 113 \

		-overview $(LOCAL_PATH)/core/java/overview.html

NOTICE

+10 −0
Original line number Diff line number Diff line
@@ -51,6 +51,16 @@ the Apache2 License. 


Media Codecs

These files are Copyright 1998 - 2009 PacketVideo, but released under

the Apache2 License.



   =========================================================================

   ==  NOTICE file corresponding to the section 4 d of                    ==

   ==  the Apache License, Version 2.0,                                   ==

   ==  in this case for Additional Codecs code.                           ==

   =========================================================================



Additional Codecs

These files are Copyright 2003-2010 VisualOn, but released under

the Apache2 License.



   =========================================================================

api/current.xml

+1382 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/Activity.java

+7 −5
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ public class Activity extends ContextThemeWrapper 
    boolean mCalled;

    boolean mCheckedForLoaderManager;

    boolean mLoadersStarted;

    private boolean mResumed;

    /*package*/ boolean mResumed;

    private boolean mStopped;

    boolean mFinished;

    boolean mStartedActivity;
@@ -4363,9 +4363,8 @@ public class Activity extends ContextThemeWrapper 
        

        mLastNonConfigurationInstances = null;

        

        // First call onResume() -before- setting mResumed, so we don't

        // send out any status bar / menu notifications the client makes.

        mCalled = false;

        // mResumed is set by the instrumentation

        mInstrumentation.callActivityOnResume(this);

        if (!mCalled) {

            throw new SuperNotCalledException(
@@ -4374,7 +4373,6 @@ public class Activity extends ContextThemeWrapper 
        }



        // Now really resume, and install the current status bar and menu.

        mResumed = true;

        mCalled = false;

        

        mFragments.dispatchResume();
@@ -4399,6 +4397,7 @@ public class Activity extends ContextThemeWrapper 
                    "Activity " + mComponent.toShortString() +

                    " did not call through to super.onPause()");

        }

        mResumed = false;

    }

    

    final void performUserLeaving() {
@@ -4461,7 +4460,10 @@ public class Activity extends ContextThemeWrapper 
        }

    }

    

    final boolean isResumed() {

    /**

     * @hide

     */

    public final boolean isResumed() {

        return mResumed;

    }

core/java/android/app/ActivityThread.java

+36 −0
Original line number Diff line number Diff line
@@ -193,6 +193,9 @@ public final class ActivityThread { 
    final HashMap<IBinder, ProviderClientRecord> mLocalProviders

        = new HashMap<IBinder, ProviderClientRecord>();



    final HashMap<Activity, ArrayList<OnActivityPausedListener>> mOnPauseListeners

        = new HashMap<Activity, ArrayList<OnActivityPausedListener>>();



    final GcIdler mGcIdler = new GcIdler();

    boolean mGcIdlerScheduled = false;
@@ -1514,6 +1517,28 @@ public final class ActivityThread { 
        }

    }



    public void registerOnActivityPausedListener(Activity activity,

            OnActivityPausedListener listener) {

        synchronized (mOnPauseListeners) {

            ArrayList<OnActivityPausedListener> list = mOnPauseListeners.get(activity);

            if (list == null) {

                list = new ArrayList<OnActivityPausedListener>();

                mOnPauseListeners.put(activity, list);

            }

            list.add(listener);

        }

    }



    public void unregisterOnActivityPausedListener(Activity activity,

            OnActivityPausedListener listener) {

        synchronized (mOnPauseListeners) {

            ArrayList<OnActivityPausedListener> list = mOnPauseListeners.get(activity);

            if (list != null) {

                list.remove(listener);

            }

        }

    }



    public final ActivityInfo resolveActivityInfo(Intent intent) {

        ActivityInfo aInfo = intent.resolveActivityInfo(

                mInitialApplication.getPackageManager(), PackageManager.GET_SHARED_LIBRARY_FILES);
@@ -2454,6 +2479,17 @@ public final class ActivityThread { 
            }

        }

        r.paused = true;



        // Notify any outstanding on paused listeners

        ArrayList<OnActivityPausedListener> listeners;

        synchronized (mOnPauseListeners) {

            listeners = mOnPauseListeners.remove(r.activity);

        }

        int size = (listeners != null ? listeners.size() : 0);

        for (int i = 0; i < size; i++) {

            listeners.get(i).onPaused(r.activity);

        }



        return state;

    }