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

Commit 88c2d891 authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

Merge "Remove PackageDataSnapshot and forAllPackageStates from API"

parents 516f5731 3957f97a

services/api/current.txt

+0 −8
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ package com.android.server.pm { 


  public static interface PackageManagerLocal.FilteredSnapshot extends java.lang.AutoCloseable {

    method public void close();

    method public void forAllPackageStates(@NonNull java.util.function.Consumer<com.android.server.pm.pkg.PackageState>);

    method @Nullable public com.android.server.pm.pkg.PackageState getPackageState(@NonNull String);

    method @NonNull public java.util.Map<java.lang.String,com.android.server.pm.pkg.PackageState> getPackageStates();

  }
@@ -130,13 +129,6 @@ package com.android.server.pm.pkg { 


}



package com.android.server.pm.snapshot {



  public interface PackageDataSnapshot {

  }



}



package com.android.server.role {



  public interface RoleServicePlatformHelper {

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

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.RetentionPolicy;

import java.util.List;

import java.util.Map;

import java.util.function.Consumer;



/**

 * In-process API for server side PackageManager related infrastructure.
@@ -177,8 +176,6 @@ public interface PackageManagerLocal { 
        @NonNull

        Map<String, PackageState> getPackageStates();



        void forAllPackageStates(@NonNull Consumer<PackageState> consumer);



        @Override

        void close();

    }

services/core/java/com/android/server/pm/local/PackageManagerLocalImpl.java

+0 −14
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import java.io.IOException; 
import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.function.Consumer;



/** @hide */

public class PackageManagerLocalImpl implements PackageManagerLocal {
@@ -198,18 +197,5 @@ public class PackageManagerLocalImpl implements PackageManagerLocal { 


            return mFilteredPackageStates;

        }



        @Override

        public void forAllPackageStates(@NonNull Consumer<PackageState> consumer) {

            checkClosed();



            var packageStates = mSnapshot.getPackageStates();

            for (int index = 0, size = packageStates.size(); index < size; index++) {

                var packageState = packageStates.valueAt(index);

                if (!mSnapshot.shouldFilterApplication(packageState, mCallingUid, mUserId)) {

                    consumer.accept(packageState);

                }

            }

        }

    }

}

services/core/java/com/android/server/pm/snapshot/PackageDataSnapshot.java

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.server.pm.snapshot;



import android.annotation.SystemApi;

import android.content.pm.PackageManagerInternal;



import com.android.server.pm.Computer;
@@ -32,6 +31,5 @@ import com.android.server.pm.PackageManagerService; 
 *

 * @hide

 */

@SystemApi(client = SystemApi.Client.SYSTEM_SERVER)

public interface PackageDataSnapshot {

}