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

Commit 130d552d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [10745155, 10743283, 10746098, 10735615, 10743284,... 

Merge cherrypicks of [10745155, 10743283, 10746098, 10735615, 10743284, 10745369, 10745156, 10745157, 10746136, 10746137, 10745215, 10746138, 10745216, 10745217, 10746139, 10745218, 10743285, 10746118, 10746119, 10745827, 10745158, 10745159, 10743224, 10743225, 10745492] into qt-qpr2-release

Change-Id: I901200f4c0b61dd3550ef5bd156bac0bbc79c4f0
parents 13758c1c 2a81aed6

core/java/android/app/IActivityManager.aidl

+2 −1
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ interface IActivityManager { 
    void handleApplicationStrictModeViolation(in IBinder app, int penaltyMask,

            in StrictMode.ViolationInfo crashInfo);

    boolean isTopActivityImmersive();

    void crashApplication(int uid, int initialPid, in String packageName, int userId, in String message);

    void crashApplication(int uid, int initialPid, in String packageName, int userId,

            in String message, boolean force);

    @UnsupportedAppUsage

    String getProviderMimeType(in Uri uri, int userId);

    // Cause the specified process to dump the specified heap.

core/java/android/app/Presentation.java

+9 −7
Original line number Diff line number Diff line
@@ -26,18 +26,18 @@ import android.content.res.Resources; 
import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager.DisplayListener;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;

import android.os.Message;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;

import android.view.ContextThemeWrapper;

import android.view.Display;

import android.view.Gravity;

import android.view.Window;

import android.view.WindowManager;

import android.view.WindowManagerImpl;

import android.os.Handler;

import android.os.Message;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;



/**

 * Base class for presentations.
@@ -116,7 +116,9 @@ import android.util.TypedValue; 
 * The display manager keeps track of all displays in the system.  However, not all

 * displays are appropriate for showing presentations.  For example, if an activity

 * attempted to show a presentation on the main display it might obscure its own content

 * (it's like opening a dialog on top of your activity).

 * (it's like opening a dialog on top of your activity).  Creating a presentation on the main

 * display will result in {@link android.view.WindowManager.InvalidDisplayException} being thrown

 * when invoking {@link #show()}.

 * </p><p>

 * Here's how to identify suitable displays for showing presentations using

 * {@link DisplayManager#getDisplays(String)} and the
@@ -243,7 +245,7 @@ public class Presentation extends Dialog { 
    /**

     * Inherited from {@link Dialog#show}. Will throw

     * {@link android.view.WindowManager.InvalidDisplayException} if the specified secondary

     * {@link Display} can't be found.

     * {@link Display} can't be found or if it does not have {@link Display#FLAG_PRESENTATION} set.

     */

    @Override

    public void show() {

keystore/java/android/security/KeyStore.java

+11 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,17 @@ public class KeyStore { 
        return onUserPasswordChanged(UserHandle.getUserId(Process.myUid()), newPassword);

    }



    /**

     * Notify keystore about the latest user locked state. This is to support keyguard-bound key.

     */

    public void onUserLockedStateChanged(int userHandle, boolean locked) {

        try {

            mBinder.onKeyguardVisibilityChanged(locked, userHandle);

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to update user locked state " + userHandle, e);

        }

    }



    private class KeyAttestationCallbackResult {

        private KeystoreResponse keystoreResponse;

        private KeymasterCertificateChain certificateChain;

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+5 −2
Original line number Diff line number Diff line
@@ -566,6 +566,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        mRoundnessManager.setAnimatedChildren(mChildrenToAddAnimated);

        mRoundnessManager.setOnRoundingChangedCallback(this::invalidate);

        addOnExpandedHeightChangedListener(mRoundnessManager::setExpanded);

        mLockscreenUserManager.addUserChangedListener(userId ->

                updateSensitiveness(false /* animated */));

        setOutlineProvider(mOutlineProvider);



        // Blocking helper manager wants to know the expanded state, update as well.
@@ -4602,7 +4604,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
    }



    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    private void setHideSensitive(boolean hideSensitive, boolean animate) {

    private void updateSensitiveness(boolean animate) {

        boolean hideSensitive = mLockscreenUserManager.isAnyProfilePublicMode();

        if (hideSensitive != mAmbientState.isHideSensitive()) {

            int childCount = getChildCount();

            for (int i = 0; i < childCount; i++) {
@@ -5306,7 +5309,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 


        SysuiStatusBarStateController state = (SysuiStatusBarStateController)

                Dependency.get(StatusBarStateController.class);

        setHideSensitive(publicMode, state.goingToFullShade() /* animate */);

        updateSensitiveness(state.goingToFullShade() /* animate */);

        setDimmed(onKeyguard, state.fromShadeLocked() /* animate */);

        setExpandingEnabled(!onKeyguard);

        ActivatableNotificationView activatedChild = getActivatedChild();

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java

+17 −1
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ import com.android.systemui.classifier.FalsingManagerFake; 
import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.EmptyShadeView;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManager.UserChangedListener;

import com.android.systemui.statusbar.NotificationPresenter;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShelf;
@@ -119,6 +121,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Mock private MetricsLogger mMetricsLogger;

    @Mock private NotificationRoundnessManager mNotificationRoundnessManager;

    @Mock private KeyguardBypassController mKeyguardBypassController;

    @Mock private NotificationLockscreenUserManager mLockscreenUserManager;

    private UserChangedListener mUserChangedListener;

    private TestableNotificationEntryManager mEntryManager;

    private int mOriginalInterruptionModelSetting;
@@ -137,7 +141,9 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        mDependency.injectTestDependency(

                NotificationBlockingHelperManager.class,

                mBlockingHelperManager);

        mDependency.injectTestDependency(SysuiStatusBarStateController.class, mBarState);

        mDependency.injectTestDependency(NotificationLockscreenUserManager.class,

                mLockscreenUserManager);

        mDependency.injectTestDependency(StatusBarStateController.class, mBarState);

        mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);

        mDependency.injectTestDependency(NotificationRemoteInputManager.class,

                mRemoteInputManager);
@@ -152,6 +158,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 




        NotificationShelf notificationShelf = mock(NotificationShelf.class);

        ArgumentCaptor<UserChangedListener> userChangedCaptor = ArgumentCaptor

                .forClass(UserChangedListener.class);



        // The actual class under test.  You may need to work with this class directly when

        // testing anonymous class members of mStackScroller, like mMenuEventListener,
@@ -174,6 +182,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        mStackScroller.setGroupManager(mGroupManager);

        mStackScroller.setEmptyShadeView(mEmptyShadeView);

        mStackScroller.setIconAreaController(mNotificationIconAreaController);

        verify(mLockscreenUserManager).addUserChangedListener(userChangedCaptor.capture());

        mUserChangedListener = userChangedCaptor.getValue();



        // Stub out functionality that isn't necessary to test.

        doNothing().when(mBar)
@@ -246,6 +256,12 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        verify(mBlockingHelperManager).setNotificationShadeExpanded(100f);

    }



    @Test

    public void testOnStatePostChange_verifyIfProfileIsPublic() {

        mUserChangedListener.onUserChanged(0);

        verify(mLockscreenUserManager).isAnyProfilePublicMode();

    }



    @Test

    public void manageNotifications_visible() {

        FooterView view = mock(FooterView.class);