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

Commit aca8d31c authored by Issei Suzuki's avatar Issei Suzuki Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypick-setDismissKeyguard-sh5oh7kmyi" into tm-d1-dev 

* changes:
  Clear ActivityRecord#mDismissKeyguard flag after app launches.
  Clear ActivityRecord#mDismissKeyguard flag after app launches.
parents 7cb14424 e12c8f5d

core/proto/android/server/windowmanagerservice.proto

+2 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,7 @@ message KeyguardControllerProto { 
    repeated KeyguardOccludedProto keyguard_occluded_states = 2 [deprecated=true];

    repeated KeyguardOccludedProto keyguard_occluded_states = 2 [deprecated=true];

    optional bool aod_showing = 3;

    optional bool aod_showing = 3;

    repeated KeyguardPerDisplayProto keyguard_per_display = 4;

    repeated KeyguardPerDisplayProto keyguard_per_display = 4;

    optional bool keyguard_going_away = 5;

}

}





message KeyguardOccludedProto {

message KeyguardOccludedProto {
@@ -132,6 +133,7 @@ message KeyguardPerDisplayProto { 
    optional bool keyguard_showing = 2;

    optional bool keyguard_showing = 2;

    optional bool aod_showing = 3;

    optional bool aod_showing = 3;

    optional bool keyguard_occluded = 4;

    optional bool keyguard_occluded = 4;

    optional bool keyguard_going_away = 5;

}

}





/* represents PhoneWindowManager */

/* represents PhoneWindowManager */

services/core/java/com/android/server/wm/KeyguardController.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM; 
import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS;

import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS;

import static com.android.server.wm.KeyguardControllerProto.AOD_SHOWING;

import static com.android.server.wm.KeyguardControllerProto.AOD_SHOWING;

import static com.android.server.wm.KeyguardControllerProto.KEYGUARD_GOING_AWAY;

import static com.android.server.wm.KeyguardControllerProto.KEYGUARD_PER_DISPLAY;

import static com.android.server.wm.KeyguardControllerProto.KEYGUARD_PER_DISPLAY;

import static com.android.server.wm.KeyguardControllerProto.KEYGUARD_SHOWING;

import static com.android.server.wm.KeyguardControllerProto.KEYGUARD_SHOWING;
@@ -594,6 +595,7 @@ class KeyguardController { 
                } else if (top.canShowWhenLocked()) {

                } else if (top.canShowWhenLocked()) {

                    mTopOccludesActivity = top;

                    mTopOccludesActivity = top;

                }

                }

                top.mDismissKeyguard = false;





                // Only the top activity may control occluded, as we can't occlude the Keyguard

                // Only the top activity may control occluded, as we can't occlude the Keyguard

                // if the top app doesn't want to occlude it.

                // if the top app doesn't want to occlude it.
@@ -671,6 +673,7 @@ class KeyguardController { 
            proto.write(KeyguardPerDisplayProto.KEYGUARD_SHOWING, mKeyguardShowing);

            proto.write(KeyguardPerDisplayProto.KEYGUARD_SHOWING, mKeyguardShowing);

            proto.write(KeyguardPerDisplayProto.AOD_SHOWING, mAodShowing);

            proto.write(KeyguardPerDisplayProto.AOD_SHOWING, mAodShowing);

            proto.write(KeyguardPerDisplayProto.KEYGUARD_OCCLUDED, mOccluded);

            proto.write(KeyguardPerDisplayProto.KEYGUARD_OCCLUDED, mOccluded);

            proto.write(KeyguardPerDisplayProto.KEYGUARD_GOING_AWAY, mKeyguardGoingAway);

            proto.end(token);

            proto.end(token);

        }

        }

    }

    }
@@ -691,6 +694,7 @@ class KeyguardController { 
        final long token = proto.start(fieldId);

        final long token = proto.start(fieldId);

        proto.write(AOD_SHOWING, default_state.mAodShowing);

        proto.write(AOD_SHOWING, default_state.mAodShowing);

        proto.write(KEYGUARD_SHOWING, default_state.mKeyguardShowing);

        proto.write(KEYGUARD_SHOWING, default_state.mKeyguardShowing);

        proto.write(KEYGUARD_GOING_AWAY, default_state.mKeyguardGoingAway);

        writeDisplayStatesToProto(proto, KEYGUARD_PER_DISPLAY);

        writeDisplayStatesToProto(proto, KEYGUARD_PER_DISPLAY);

        proto.end(token);

        proto.end(token);

    }

    }