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

Commit 12905e49 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[pm] use bitset to store boolean data in ps" into main

parents cf2a575e 6dd71222

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

+68 −50

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/pkg/PackageState.java

+0 −5
Original line number Diff line number Diff line
@@ -59,11 +59,6 @@ import java.util.Set; 
public interface PackageState {



    /*

     * Until immutability or read-only caching is enabled, {@link PackageSetting} cannot be

     * returned directly, so {@link PackageStateImpl} is used to temporarily copy the data.

     * This is a relatively expensive operation since it has to create an object for every package,

     * but it's much lighter than the alternative of generating {@link PackageInfo} objects.

     * <p>

     * TODO: Documentation

     * TODO: Currently missing, should be exposed as API?

     *   - keySetData

services/core/java/com/android/server/pm/pkg/PackageStateImpl.java

deleted100644 → 0
+0 −770

File deleted.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/pkg/PackageUserStateImpl.java

+88 −63

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/pkg/PackageStateTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.server.pm.PackageSettingBuilder 
import com.android.server.pm.parsing.pkg.PackageImpl

import com.android.server.pm.pkg.AndroidPackage

import com.android.server.pm.pkg.PackageState

import com.android.server.pm.pkg.PackageStateImpl

import com.android.server.pm.pkg.PackageUserState

import com.android.server.pm.pkg.PackageUserStateImpl

import com.android.server.pm.pkg.component.ParsedActivity
@@ -125,7 +124,7 @@ class PackageStateTest { 


        fillMissingData(packageState, pkg as PackageImpl)



        visitType(seenTypes, emptyList(), PackageStateImpl.copy(packageState),

        visitType(seenTypes, emptyList(), PackageSetting(packageState, true),

            PackageState::class.starProjectedType)

        visitType(seenTypes, emptyList(), pkg, AndroidPackage::class.starProjectedType)

        visitType(seenTypes, emptyList(), packageState.getUserStateOrDefault(0),