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

Commit 58f42a59 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #5405788: Device continuously opening and closing... 

...the "Complete action using" dialog

When an application goes idle, it sends back to the activity manager
the configuration it last used, to make sure the two don't get out
of sync.  Fix a bunch of edge cases here in dealing with that, and
be sure to also send the current configuration when launching an
activity so the client is always up-to-date when launching.

Also a small fix to not show the upgrading dialog during first boot.

Change-Id: I14ed366a87cd689d1c78787369e052422290ac6f
parent 8c3e7079

core/java/android/app/ActivityThread.java

+17 −8
Original line number Diff line number Diff line
@@ -490,6 +490,15 @@ public final class ActivityThread { 
        // Formatting for checkin service - update version if row format changes

        private static final int ACTIVITY_THREAD_CHECKIN_VERSION = 1;



        private void updatePendingConfiguration(Configuration config) {

            synchronized (mPackages) {

                if (mPendingConfiguration == null ||

                        mPendingConfiguration.isOtherSeqNewer(config)) {

                    mPendingConfiguration = config;

                }

            }

        }



        public final void schedulePauseActivity(IBinder token, boolean finished,

                boolean userLeaving, int configChanges) {

            queueOrSendMessage(
@@ -530,8 +539,8 @@ public final class ActivityThread { 
        // we use token to identify this activity without having to send the

        // activity itself back to the activity manager. (matters more with ipc)

        public final void scheduleLaunchActivity(Intent intent, IBinder token, int ident,

                ActivityInfo info, CompatibilityInfo compatInfo, Bundle state,

                List<ResultInfo> pendingResults,

                ActivityInfo info, Configuration curConfig, CompatibilityInfo compatInfo,

                Bundle state, List<ResultInfo> pendingResults,

                List<Intent> pendingNewIntents, boolean notResumed, boolean isForward,

                String profileName, ParcelFileDescriptor profileFd, boolean autoStopProfiler) {

            ActivityClientRecord r = new ActivityClientRecord();
@@ -553,6 +562,8 @@ public final class ActivityThread { 
            r.profileFd = profileFd;

            r.autoStopProfiler = autoStopProfiler;



            updatePendingConfiguration(curConfig);



            queueOrSendMessage(H.LAUNCH_ACTIVITY, r);

        }
@@ -697,12 +708,7 @@ public final class ActivityThread { 
        }



        public void scheduleConfigurationChanged(Configuration config) {

            synchronized (mPackages) {

                if (mPendingConfiguration == null ||

                        mPendingConfiguration.isOtherSeqNewer(config)) {

                    mPendingConfiguration = config;

                }

            }

            updatePendingConfiguration(config);

            queueOrSendMessage(H.CONFIGURATION_CHANGED, config);

        }
@@ -1966,6 +1972,9 @@ public final class ActivityThread { 
            mProfiler.autoStopProfiler = r.autoStopProfiler;

        }



        // Make sure we are running with the most recent config.

        handleConfigurationChanged(null, null);



        if (localLOGV) Slog.v(

            TAG, "Handling launch of " + r);

        Activity a = performLaunchActivity(r, customIntent);

core/java/android/app/ApplicationThreadNative.java

+7 −5
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ public abstract class ApplicationThreadNative extends Binder 
            IBinder b = data.readStrongBinder();

            int ident = data.readInt();

            ActivityInfo info = ActivityInfo.CREATOR.createFromParcel(data);

            Configuration curConfig = Configuration.CREATOR.createFromParcel(data);

            CompatibilityInfo compatInfo = CompatibilityInfo.CREATOR.createFromParcel(data);

            Bundle state = data.readBundle();

            List<ResultInfo> ri = data.createTypedArrayList(ResultInfo.CREATOR);
@@ -142,7 +143,7 @@ public abstract class ApplicationThreadNative extends Binder 
            ParcelFileDescriptor profileFd = data.readInt() != 0

                    ? data.readFileDescriptor() : null;

            boolean autoStopProfiler = data.readInt() != 0;

            scheduleLaunchActivity(intent, b, ident, info, compatInfo, state, ri, pi,

            scheduleLaunchActivity(intent, b, ident, info, curConfig, compatInfo, state, ri, pi,

                    notResumed, isForward, profileName, profileFd, autoStopProfiler);

            return true;

        }
@@ -630,8 +631,8 @@ class ApplicationThreadProxy implements IApplicationThread { 
    }



    public final void scheduleLaunchActivity(Intent intent, IBinder token, int ident,

            ActivityInfo info, CompatibilityInfo compatInfo, Bundle state,

            List<ResultInfo> pendingResults,

            ActivityInfo info, Configuration curConfig, CompatibilityInfo compatInfo,

            Bundle state, List<ResultInfo> pendingResults,

    		List<Intent> pendingNewIntents, boolean notResumed, boolean isForward,

    		String profileName, ParcelFileDescriptor profileFd, boolean autoStopProfiler)

    		throws RemoteException {
@@ -641,6 +642,7 @@ class ApplicationThreadProxy implements IApplicationThread { 
        data.writeStrongBinder(token);

        data.writeInt(ident);

        info.writeToParcel(data, 0);

        curConfig.writeToParcel(data, 0);

        compatInfo.writeToParcel(data, 0);

        data.writeBundle(state);

        data.writeTypedList(pendingResults);

core/java/android/app/IApplicationThread.java

+4 −4
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ public interface IApplicationThread extends IInterface { 
    void scheduleResumeActivity(IBinder token, boolean isForward) throws RemoteException;

    void scheduleSendResult(IBinder token, List<ResultInfo> results) throws RemoteException;

    void scheduleLaunchActivity(Intent intent, IBinder token, int ident,

            ActivityInfo info, CompatibilityInfo compatInfo, Bundle state,

            List<ResultInfo> pendingResults,

            ActivityInfo info, Configuration curConfig, CompatibilityInfo compatInfo,

            Bundle state, List<ResultInfo> pendingResults,

    		List<Intent> pendingNewIntents, boolean notResumed, boolean isForward,

    		String profileName, ParcelFileDescriptor profileFd, boolean autoStopProfiler)

    		throws RemoteException;

core/java/android/content/pm/IPackageManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -362,4 +362,6 @@ interface IPackageManager { 
    void verifyPendingInstall(int id, int verificationCode);



    VerifierDeviceIdentity getVerifierDeviceIdentity();



    boolean isFirstBoot();

}

services/java/com/android/server/SystemServer.java

+7 −1
Original line number Diff line number Diff line
@@ -163,6 +163,11 @@ class ServerThread extends Thread { 
            pm = PackageManagerService.main(context,

                    factoryTest != SystemServer.FACTORY_TEST_OFF,

                    onlyCore);

            boolean firstBoot = false;

            try {

                firstBoot = pm.isFirstBoot();

            } catch (RemoteException e) {

            }



            ActivityManagerService.setSystemProcess();
@@ -208,7 +213,8 @@ class ServerThread extends Thread { 


            Slog.i(TAG, "Window Manager");

            wm = WindowManagerService.main(context, power,

                    factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL);

                    factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL,

                    !firstBoot);

            ServiceManager.addService(Context.WINDOW_SERVICE, wm);



            ActivityManagerService.self().setWindowManager(wm);