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

Commit 802fb15d authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 9476f045: Merge "Fix issue #3215261: NPE in WiFi Settings" into honeycomb 

* commit '9476f045':
  Fix issue #3215261: NPE in WiFi Settings
parents ab847acd 9476f045

core/java/android/app/LoadedApk.java

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ final class LoadedApk { 
                final Intent intent = mCurIntent;

                mCurIntent = null;

                

                if (receiver == null) {

                if (receiver == null || !mRegistered) {

                    if (mRegistered && ordered) {

                        if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG,

                                "Finishing null broadcast to " + mReceiver);

core/res/res/anim/wallpaper_close_enter.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:shareInterpolator="false">

        android:detachWallpaper="true" android:shareInterpolator="false">

    <scale android:fromXScale="1.0" android:toXScale="1.0"

            android:fromYScale=".9" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"

core/res/res/anim/wallpaper_intra_close_enter.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:shareInterpolator="false">

        android:detachWallpaper="true" android:shareInterpolator="false">

    <scale android:fromXScale="1.0" android:toXScale="1.0"

            android:fromYScale=".9" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"

core/res/res/anim/wallpaper_intra_open_exit.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:shareInterpolator="false">

        android:detachWallpaper="true" android:shareInterpolator="false">

    <scale android:fromXScale="1.0" android:toXScale="1.0"

            android:fromYScale="1.0" android:toYScale="0.0"

            android:pivotX="50%p" android:pivotY="50%p"

core/res/res/anim/wallpaper_open_exit.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:shareInterpolator="false">

        android:detachWallpaper="true" android:shareInterpolator="false">

    <scale android:fromXScale="1.0" android:toXScale="1.0"

            android:fromYScale="1.0" android:toYScale="0.0"

            android:pivotX="50%p" android:pivotY="50%p"