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

Commit e487283f authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-10.0.0_r23' into staging/lineage-17.1_merge-android-10.0.0_r23 

Android 10.0.0 release 23

* tag 'android-10.0.0_r23':
  Actually use mContext directly
  DO NOT MERGE: Fixes NPE when preparing app data during init
  Use KNOWN_PACKAGES when shared lib consumers
  Ensure SKP serialization occurs on RenderThread
  Dismissed keyguard gone runnables when aborting
  Do not register lift when sensor is not present
  Validate wallpaper dimension while generating crop
  Prevent system uid component from running in an isolated app process

Change-Id: Ic54e1decda1782fd154870c825da28f9858151b5
parents 439b220b ca9cee72

core/java/android/view/ViewDebug.java

+89 −12
Original line number Diff line number Diff line
@@ -868,6 +868,94 @@ public class ViewDebug { 
        return null;

    }



    private static class StreamingPictureCallbackHandler implements AutoCloseable,

            HardwareRenderer.PictureCapturedCallback, Runnable {

        private final HardwareRenderer mRenderer;

        private final Callable<OutputStream> mCallback;

        private final Executor mExecutor;

        private final ReentrantLock mLock = new ReentrantLock(false);

        private final ArrayDeque<byte[]> mQueue = new ArrayDeque<>(3);

        private final ByteArrayOutputStream mByteStream = new ByteArrayOutputStream();

        private boolean mStopListening;

        private Thread mRenderThread;



        private StreamingPictureCallbackHandler(HardwareRenderer renderer,

                Callable<OutputStream> callback, Executor executor) {

            mRenderer = renderer;

            mCallback = callback;

            mExecutor = executor;

            mRenderer.setPictureCaptureCallback(this);

        }



        @Override

        public void close() {

            mLock.lock();

            mStopListening = true;

            mLock.unlock();

            mRenderer.setPictureCaptureCallback(null);

        }



        @Override

        public void onPictureCaptured(Picture picture) {

            mLock.lock();

            if (mStopListening) {

                mLock.unlock();

                mRenderer.setPictureCaptureCallback(null);

                return;

            }

            if (mRenderThread == null) {

                mRenderThread = Thread.currentThread();

            }

            boolean needsInvoke = true;

            if (mQueue.size() == 3) {

                mQueue.removeLast();

                needsInvoke = false;

            }

            picture.writeToStream(mByteStream);

            mQueue.add(mByteStream.toByteArray());

            mByteStream.reset();

            mLock.unlock();



            if (needsInvoke) {

                mExecutor.execute(this);

            }

        }



        @Override

        public void run() {

            mLock.lock();

            final byte[] picture = mQueue.poll();

            final boolean isStopped = mStopListening;

            mLock.unlock();

            if (Thread.currentThread() == mRenderThread) {

                close();

                throw new IllegalStateException(

                        "ViewDebug#startRenderingCommandsCapture must be given an executor that "

                        + "invokes asynchronously");

            }

            if (isStopped) {

                return;

            }

            OutputStream stream = null;

            try {

                stream = mCallback.call();

            } catch (Exception ex) {

                Log.w("ViewDebug", "Aborting rendering commands capture "

                        + "because callback threw exception", ex);

            }

            if (stream != null) {

                try {

                    stream.write(picture);

                } catch (IOException ex) {

                    Log.w("ViewDebug", "Aborting rendering commands capture "

                            + "due to IOException writing to output stream", ex);

                }

            } else {

                close();

            }

        }

    }



    /**

     * Begins capturing the entire rendering commands for the view tree referenced by the given

     * view. The view passed may be any View in the tree as long as it is attached. That is,
@@ -913,18 +1001,7 @@ public class ViewDebug { 
        }

        final HardwareRenderer renderer = attachInfo.mThreadedRenderer;

        if (renderer != null) {

            return new PictureCallbackHandler(renderer, (picture -> {

                try {

                    OutputStream stream = callback.call();

                    if (stream != null) {

                        picture.writeToStream(stream);

                        return true;

                    }

                } catch (Exception ex) {

                    // fall through

                }

                return false;

            }), executor);

            return new StreamingPictureCallbackHandler(renderer, callback, executor);

        }

        return null;

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGuts.java

+5 −3
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ public class NotificationGuts extends FrameLayout { 
    }



    /** Listener for animations executed in {@link #animateClose(int, int, boolean)}. */

    private static class AnimateCloseListener extends AnimatorListenerAdapter {

    private class AnimateCloseListener extends AnimatorListenerAdapter {

        final View mView;

        private final GutsContent mGutsContent;
@@ -433,8 +433,10 @@ public class NotificationGuts extends FrameLayout { 
        @Override

        public void onAnimationEnd(Animator animation) {

            super.onAnimationEnd(animation);

            if (!isExposed()) {

                mView.setVisibility(View.GONE);

                mGutsContent.onFinishedClosing();

            }

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java

+5 −2
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx 
    protected String mKeyToRemoveOnGutsClosed;



    private StatusBar mStatusBar;

    private Runnable mOpenRunnable;



    @Inject

    public NotificationGutsManager(
@@ -343,6 +344,7 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx 
    public void closeAndSaveGuts(boolean removeLeavebehinds, boolean force, boolean removeControls,

            int x, int y, boolean resetMenu) {

        if (mNotificationGutsExposed != null) {

            mNotificationGutsExposed.removeCallbacks(mOpenRunnable);

            mNotificationGutsExposed.closeControls(removeLeavebehinds, removeControls, x, y, force);

        }

        if (resetMenu) {
@@ -445,7 +447,7 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx 
        // ensure that it's laid but not visible until actually laid out

        guts.setVisibility(View.INVISIBLE);

        // Post to ensure the the guts are properly laid out.

        guts.post(new Runnable() {

        mOpenRunnable = new Runnable() {

            @Override

            public void run() {

                if (row.getWindowToken() == null) {
@@ -470,7 +472,8 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx 
                mListContainer.onHeightChanged(row, true /* needsAnimation */);

                mGutsMenuItem = menuItem;

            }

        });

        };

        guts.post(mOpenRunnable);

        return true;

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ class KeyguardLiftController constructor( 
    }



    private fun updateListeningState() {

        if (pickupSensor == null) {

            return

        }

        val onKeyguard = keyguardUpdateMonitor.isKeyguardVisible &&

                !statusBarStateController.isDozing

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+16 −1
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ import com.android.systemui.statusbar.policy.KeyguardMonitorImpl; 
import java.io.PrintWriter;

import java.util.ArrayList;



import androidx.annotation.VisibleForTesting;



/**

 * Manages creating, showing, hiding and resetting the keyguard within the status bar. Calls back

 * via {@link ViewMediatorCallback} to poke the wake lock and report that the keyguard is done,
@@ -163,6 +165,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    private boolean mLastLockVisible;



    private OnDismissAction mAfterKeyguardGoneAction;

    private Runnable mKeyguardGoneCancelAction;

    private final ArrayList<Runnable> mAfterKeyguardGoneRunnables = new ArrayList<>();



    // Dismiss action to be launched when we stop dozing or the keyguard is gone.
@@ -350,10 +353,20 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        return false;

    }



    private void hideBouncer(boolean destroyView) {

    @VisibleForTesting

    void hideBouncer(boolean destroyView) {

        if (mBouncer == null) {

            return;

        }

        if (mShowing) {

            // If we were showing the bouncer and then aborting, we need to also clear out any

            // potential actions unless we actually unlocked.

            mAfterKeyguardGoneAction = null;

            if (mKeyguardGoneCancelAction != null) {

                mKeyguardGoneCancelAction.run();

                mKeyguardGoneCancelAction = null;

            }

        }

        mBouncer.hide(destroyView);

        cancelPendingWakeupAction();

    }
@@ -386,6 +399,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                mBouncer.showWithDismissAction(r, cancelAction);

            } else {

                mAfterKeyguardGoneAction = r;

                mKeyguardGoneCancelAction = cancelAction;

                mBouncer.show(false /* resetSecuritySelection */);

            }

        }
@@ -700,6 +714,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            mAfterKeyguardGoneAction.onDismiss();

            mAfterKeyguardGoneAction = null;

        }

        mKeyguardGoneCancelAction = null;

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

            mAfterKeyguardGoneRunnables.get(i).run();

        }