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

Commit 5ebb78ff authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7783696 from 3da1d635 to sc-qpr1-release

Change-Id: I827f8efce5a6f669776684f4cc8f2c20be2671ae
parents cafffd40 3da1d635
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class TaskSnapshotWindow {
     * Ideally the delay time will be shorter when receiving
     * {@link StartingSurfaceDrawer#onImeDrawnOnTask(int)}.
     */
    private static final long MAX_DELAY_REMOVAL_TIME_IME_VISIBLE = 450;
    private static final long MAX_DELAY_REMOVAL_TIME_IME_VISIBLE = 600;

    //tmp vars for unused relayout params
    private static final Point TMP_SURFACE_SIZE = new Point();
+2 −6
Original line number Diff line number Diff line
@@ -262,12 +262,8 @@ public class GpsNavigationMessage implements Parcelable {
            parcel.readByteArray(data);
            navigationMessage.setData(data);

            if (parcel.dataAvail() >= Integer.SIZE) {
            int status = parcel.readInt();
            navigationMessage.setStatus((short) status);
            } else {
                navigationMessage.setStatus(STATUS_UNKNOWN);
            }

            return navigationMessage;
        }
+1 −12
Original line number Diff line number Diff line
@@ -2253,17 +2253,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
        }
    }

    void removeStartingWindowIfNeeded() {
        // Removing the task snapshot after the task is actually focused (see
        // Task#onWindowFocusChanged). Since some of the app contents may draw in this time and
        // requires more times to draw finish, in case flicking may happen when removing the task
        // snapshot too early. (i.e. Showing IME.)
        if ((mStartingData instanceof SnapshotStartingData) && !getTask().isFocused()) {
            return;
        }
        removeStartingWindow();
    }

    void removeStartingWindow() {
        removeStartingWindowAnimation(true /* prepareAnimation */);
    }
@@ -5835,7 +5824,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
            // own stuff.
            win.cancelAnimation();
        }
        removeStartingWindowIfNeeded();
        removeStartingWindow();
        updateReportedVisibilityLocked();
    }

+0 −4
Original line number Diff line number Diff line
@@ -5206,10 +5206,6 @@ class Task extends WindowContainer<WindowContainer> {
     * @param hasFocus
     */
    void onWindowFocusChanged(boolean hasFocus) {
        final ActivityRecord topAct = getTopVisibleActivity();
        if (topAct != null && (topAct.mStartingData instanceof SnapshotStartingData)) {
            topAct.removeStartingWindowIfNeeded();
        }
        updateShadowsRadius(hasFocus, getSyncTransaction());
        // TODO(b/180525887): Un-comment once there is resolution on the bug.
        // dispatchTaskInfoChangedIfNeeded(false /* force */);
+1 −0
Original line number Diff line number Diff line
@@ -14060,6 +14060,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
        final CallerIdentity caller = getCallerIdentity();
        Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle));
        Preconditions.checkCallAuthorization(canManageUsers(caller));
        Preconditions.checkCallAuthorization(isManagedProfile(userHandle),
                "You can not get organization name outside a managed profile, userId = %d",
                userHandle);
Loading