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

Commit 5ac0ee82 authored by Samiul Islam's avatar Samiul Islam
Browse files

Hook the new APIs in StagingManager to PackageManagerNative service 

Also note, if a StagedApexObserver is observing through binder, they
might not be able to send the original observing object for
unregistration. As such, for binder observer we clean them up when they
die.

Bug: 187444679
Test: atest StagingManagerTest
Test: atest StagedInstallInternalTest
Change-Id: Ie2e01b01690a5882574282f3158e454a9b6056e7
parent 9e7de2a0

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

+4 −0
Original line number Diff line number Diff line
@@ -261,6 +261,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
                new Lifecycle(context, this));

    }



    StagingManager getStagingManager() {

        return mStagingManager;

    }



    boolean okToSendBroadcasts()  {

        return mOkToSendBroadcasts;

    }

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

+25 −2
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ import android.content.pm.IPackageManager; 
import android.content.pm.IPackageManagerNative;

import android.content.pm.IPackageMoveObserver;

import android.content.pm.IPackageStatsObserver;

import android.content.pm.IStagedApexObserver;

import android.content.pm.IncrementalStatesInfo;

import android.content.pm.InstallSourceInfo;

import android.content.pm.InstantAppInfo;
@@ -202,6 +203,7 @@ import android.content.pm.Signature; 
import android.content.pm.SigningDetails;

import android.content.pm.SigningDetails.SignatureSchemeVersion;

import android.content.pm.SigningInfo;

import android.content.pm.StagedApexInfo;

import android.content.pm.SuspendDialogInfo;

import android.content.pm.TestUtilityService;

import android.content.pm.UserInfo;
@@ -22996,6 +22998,29 @@ public class PackageManagerService extends IPackageManager.Stub 
        public boolean hasSystemFeature(String featureName, int version) {

            return PackageManagerService.this.hasSystemFeature(featureName, version);

        }













        @Override













        public void registerStagedApexObserver(IStagedApexObserver observer) {













            mInstallerService.getStagingManager().registerStagedApexObserver(observer);













        }

























        @Override













        public void unregisterStagedApexObserver(IStagedApexObserver observer) {













            mInstallerService.getStagingManager().unregisterStagedApexObserver(observer);













        }

























        @Override













        public String[] getStagedApexModuleNames() {













            return mInstallerService.getStagingManager()













                    .getStagedApexModuleNames().toArray(new String[0]);













        }

























        @Override













        @Nullable













        public StagedApexInfo getStagedApexInfo(String moduleName) {













            return mInstallerService.getStagingManager().getStagedApexInfo(moduleName);













        }



























    }





























    private AndroidPackage getPackage(String packageName) {










@@ -24964,5 +24989,3 @@ public class PackageManagerService extends IPackageManager.Stub













        }















    }















}

















































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



+27
−4




























Original line number
Diff line number
Diff line








@@ -39,6 +39,7 @@ import android.content.pm.PackageManager;













import android.content.pm.PackageManagerInternal;















import android.content.pm.SigningDetails;















import android.content.pm.SigningDetails.SignatureSchemeVersion;













import android.content.pm.StagedApexInfo;















import android.content.pm.parsing.PackageInfoWithoutStateUtils;















import android.content.pm.parsing.result.ParseResult;















import android.content.pm.parsing.result.ParseTypeImpl;










@@ -215,6 +216,23 @@ public class StagingManager {













    }































    void registerStagedApexObserver(IStagedApexObserver observer) {













        if (observer == null) {













            return;













        }













        if  (observer.asBinder() != null) {













            try {













                observer.asBinder().linkToDeath(new IBinder.DeathRecipient() {













                    @Override













                    public void binderDied() {













                        synchronized (mStagedApexObservers) {













                            mStagedApexObservers.remove(observer);













                        }













                    }













                }, 0);













            } catch (RemoteException re) {













                Slog.w(TAG, re.getMessage());













            }













        }















        synchronized (mStagedApexObservers) {















            mStagedApexObservers.add(observer);















        }










@@ -1181,7 +1199,7 @@ public class StagingManager {













     * Returns ApexInfo of the {@code moduleInfo} provided if it is staged, otherwise returns null.















     */















    @Nullable













    ApexInfo getStagedApexInfo(String moduleName) {













    StagedApexInfo getStagedApexInfo(String moduleName) {















        synchronized (mStagedSessions) {















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















                final StagedSession session = mStagedSessions.valueAt(i);









@@ -1189,9 +1207,14 @@ public class StagingManager {













                        || session.hasParentSessionId() || !session.containsApexSession()) {















                    continue;















                }













                ApexInfo result = getStagedApexInfos(session).get(moduleName);













                if (result != null) {













                    return result;













                ApexInfo ai = getStagedApexInfos(session).get(moduleName);













                if (ai != null) {













                    StagedApexInfo info = new StagedApexInfo();













                    info.moduleName = ai.moduleName;













                    info.diskImagePath = ai.modulePath;













                    info.versionCode = ai.versionCode;













                    info.versionName = ai.versionName;













                    return info;















                }















            }















        }

































services/tests/mockingservicestests/src/com/android/server/pm/StagingManagerTest.java



+6
−2




























Original line number
Diff line number
Diff line








@@ -42,6 +42,7 @@ import android.content.pm.IStagedApexObserver;













import android.content.pm.PackageInstaller;















import android.content.pm.PackageInstaller.SessionInfo;















import android.content.pm.PackageInstaller.SessionInfo.StagedSessionErrorCode;













import android.content.pm.StagedApexInfo;















import android.os.Message;















import android.os.SystemProperties;















import android.os.storage.IStorageManager;










@@ -701,12 +702,15 @@ public class StagingManagerTest {













        when(mApexManager.getStagedApexInfos(any())).thenReturn(fakeApexInfos);































        // Verify null is returned if module name is not found













        ApexInfo result = mStagingManager.getStagedApexInfo("not found");













        StagedApexInfo result = mStagingManager.getStagedApexInfo("not found");















        assertThat(result).isNull();















        verify(mApexManager, times(1)).getStagedApexInfos(any());















        // Otherwise, the correct object is returned















        result = mStagingManager.getStagedApexInfo("module1");













        assertThat(result).isEqualTo(fakeApexInfos[0]);













        assertThat(result.moduleName).isEqualTo(fakeApexInfos[0].moduleName);













        assertThat(result.diskImagePath).isEqualTo(fakeApexInfos[0].modulePath);













        assertThat(result.versionCode).isEqualTo(fakeApexInfos[0].versionCode);













        assertThat(result.versionName).isEqualTo(fakeApexInfos[0].versionName);















        verify(mApexManager, times(2)).getStagedApexInfos(any());















    }

















































tests/StagedInstallTest/Android.bp



+1
−0




























Original line number
Diff line number
Diff line








@@ -37,6 +37,7 @@ android_test_helper_app {













        ":test.rebootless_apex_v1",















        ":test.rebootless_apex_v2",















    ],













    platform_apis: true,















}































java_test_host {