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

Unverified Commit 98e4f199 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

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

Android security 10.0.0 release 64

* tag 'android-security-10.0.0_r64':
  Check group channels for FGSes
  Prevent a crash when constructing NSSL.
  Persist destroyed staged sessions until they are cleaned up
  Don't abandon child sessions (1/n)

Change-Id: I69471cafa5d34426bcd926025a15070da24142a0
parents a28bc8b9 e1ee1d96

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

+3 −0
Original line number Diff line number Diff line
@@ -694,6 +694,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
    @VisibleForTesting

    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    public void updateFooter() {

        if (mFooterView == null) {

            return;

        }

        boolean showDismissView = mClearAllEnabled && hasActiveClearableNotifications(ROWS_ALL);

        boolean showFooterView = (showDismissView ||

                mEntryManager.getNotificationData().getActiveNotifications().size() != 0)

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -2087,7 +2087,7 @@ public class NotificationManagerService extends SystemService { 
        }

    }



    private void createNotificationChannelGroup(String pkg, int uid, NotificationChannelGroup group,

    void createNotificationChannelGroup(String pkg, int uid, NotificationChannelGroup group,

            boolean fromApp, boolean fromListener) {

        Preconditions.checkNotNull(group);

        Preconditions.checkNotNull(pkg);
@@ -2881,7 +2881,8 @@ public class NotificationManagerService extends SystemService { 


            final int callingUid = Binder.getCallingUid();

            NotificationChannelGroup groupToDelete =

                    mPreferencesHelper.getNotificationChannelGroup(groupId, pkg, callingUid);

                    mPreferencesHelper.getNotificationChannelGroupWithChannels(

                            pkg, callingUid, groupId, false);

            if (groupToDelete != null) {

                // Preflight for allowability

                final int userId = UserHandle.getUserId(callingUid);

services/core/java/com/android/server/pm/PackageInstallerService.java

+11 −4
Original line number Diff line number Diff line
@@ -337,7 +337,13 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
                if (age >= MAX_SESSION_AGE_ON_LOW_STORAGE_MILLIS) {

                    // Aggressively close old sessions because we are running low on storage

                    // Their staging dirs will be removed too

                    session.abandon();

                    PackageInstallerSession root = !session.hasParentSessionId()

                            ? session : mSessions.get(session.getParentSessionId());

                    if (!root.isDestroyed() && 

                            (!root.isStaged() || (root.isStaged() && root.isStagedSessionReady()))) 

                    {

                        root.abandon();

                    }

                } else {

                    // Session is new enough, so it deserves to be kept even on low storage

                    unclaimedStagingDirsOnVolume.remove(session.stageDir);
@@ -660,7 +666,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        session = new PackageInstallerSession(mInternalCallback, mContext, mPm, this,

                mInstallThread.getLooper(), mStagingManager, sessionId, userId,

                installerPackageName, callingUid, params, createdMillis, stageDir, stageCid, false,

                false, false, null, SessionInfo.INVALID_ID, false, false, false,

                false, false, false, null, SessionInfo.INVALID_ID, false, false, false,

                SessionInfo.STAGED_SESSION_NO_ERROR, "");



        synchronized (mSessions) {
@@ -810,7 +816,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        synchronized (mSessions) {

            final PackageInstallerSession session = mSessions.get(sessionId);



            return session != null

            return (session != null && !(session.isStaged() && session.isDestroyed()))

                    ? session.generateInfoForCaller(true /*withIcon*/, Binder.getCallingUid())

                    : null;

        }
@@ -831,7 +837,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        synchronized (mSessions) {

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

                final PackageInstallerSession session = mSessions.valueAt(i);

                if (session.userId == userId && !session.hasParentSessionId()) {

                if (session.userId == userId && !session.hasParentSessionId()

                        && !(session.isStaged() && session.isDestroyed())) {

                    result.add(session.generateInfoForCaller(false, callingUid));

                }

            }

services/core/java/com/android/server/pm/PackageInstallerSession.java

+16 −5
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    private static final String ATTR_SESSION_STAGE_CID = "sessionStageCid";

    private static final String ATTR_PREPARED = "prepared";

    private static final String ATTR_COMMITTED = "committed";

    private static final String ATTR_DESTROYED = "destroyed";

    private static final String ATTR_SEALED = "sealed";

    private static final String ATTR_MULTI_PACKAGE = "multiPackage";

    private static final String ATTR_PARENT_SESSION_ID = "parentSessionId";
@@ -413,8 +414,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            PackageSessionProvider sessionProvider, Looper looper, StagingManager stagingManager,

            int sessionId, int userId,

            String installerPackageName, int installerUid, SessionParams params, long createdMillis,

            File stageDir, String stageCid, boolean prepared, boolean committed, boolean sealed,

            @Nullable int[] childSessionIds, int parentSessionId, boolean isReady,

            File stageDir, String stageCid, boolean prepared, boolean committed, boolean destroyed,

            boolean sealed, @Nullable int[] childSessionIds, int parentSessionId, boolean isReady,

            boolean isFailed, boolean isApplied, int stagedSessionErrorCode,

            String stagedSessionErrorMessage) {

        mCallback = callback;
@@ -449,6 +450,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 


        mPrepared = prepared;

        mCommitted = committed;

        mDestroyed = destroyed;

        mStagedSessionReady = isReady;

        mStagedSessionFailed = isFailed;

        mStagedSessionApplied = isApplied;
@@ -559,6 +561,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        }

    }



    /** {@hide} */

    boolean isDestroyed() {

        synchronized (mLock) {

            return mDestroyed;

        }

    }



    /** Returns true if a staged session has reached a final state and can be forgotten about  */

    public boolean isStagedAndInTerminalState() {

        synchronized (mLock) {
@@ -2423,7 +2432,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
     */

    void write(@NonNull XmlSerializer out, @NonNull File sessionsDir) throws IOException {

        synchronized (mLock) {

            if (mDestroyed) {

            if (mDestroyed && !params.isStaged) {

                return;

            }
@@ -2445,6 +2454,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            }

            writeBooleanAttribute(out, ATTR_PREPARED, isPrepared());

            writeBooleanAttribute(out, ATTR_COMMITTED, isCommitted());

            writeBooleanAttribute(out, ATTR_DESTROYED, isDestroyed());

            writeBooleanAttribute(out, ATTR_SEALED, isSealed());



            writeBooleanAttribute(out, ATTR_MULTI_PACKAGE, params.isMultiPackage);
@@ -2546,6 +2556,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        final String stageCid = readStringAttribute(in, ATTR_SESSION_STAGE_CID);

        final boolean prepared = readBooleanAttribute(in, ATTR_PREPARED, true);

        final boolean committed = readBooleanAttribute(in, ATTR_COMMITTED);

        final boolean destroyed = readBooleanAttribute(in, ATTR_DESTROYED);

        final boolean sealed = readBooleanAttribute(in, ATTR_SEALED);

        final int parentSessionId = readIntAttribute(in, ATTR_PARENT_SESSION_ID,

                SessionInfo.INVALID_ID);
@@ -2633,8 +2644,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        return new PackageInstallerSession(callback, context, pm, sessionProvider,

                installerThread, stagingManager, sessionId, userId, installerPackageName,

                installerUid, params, createdMillis, stageDir, stageCid, prepared, committed,

                sealed, childSessionIdsArray, parentSessionId, isReady, isFailed, isApplied,

                stagedSessionErrorCode, stagedSessionErrorMessage);

                destroyed, sealed, childSessionIdsArray, parentSessionId, isReady, isFailed,

                isApplied, stagedSessionErrorCode, stagedSessionErrorMessage);

    }



    /**

services/core/java/com/android/server/pm/StagingManager.java

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,9 @@ public class StagingManager { 
        synchronized (mStagedSessions) {

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

                final PackageInstallerSession stagedSession = mStagedSessions.valueAt(i);

                if (stagedSession.isDestroyed()) {

                    continue;

                }

                result.add(stagedSession.generateInfoForCaller(false /*icon*/, callingUid));

            }

        }