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

Commit 8b869af3 authored by Gavin Corkery's avatar Gavin Corkery Committed by Android (Google) Code Review
Browse files

Merge "Expose SharedLibrary APIs for use by SupplementalProcess module"

parents 8e59ca9a 954bd464

core/api/module-lib-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -139,9 +139,14 @@ package android.content { 


package android.content.pm {



  public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    method @NonNull public java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraryInfos();

  }



  public abstract class PackageManager {

    method @NonNull public String getPermissionControllerPackageName();

    method @NonNull public String getSupplementalProcessPackageName();

    field public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 67108864; // 0x4000000

  }



}

core/java/android/content/pm/ApplicationInfo.java

+52 −32
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.content.pm; 
import static android.os.Build.VERSION_CODES.DONUT;



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;
@@ -48,6 +49,7 @@ import java.lang.annotation.RetentionPolicy; 
import java.text.Collator;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.Comparator;

import java.util.List;

import java.util.Objects;
@@ -2655,4 +2657,22 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    public int getLocaleConfigRes() {

        return localeConfigRes;

    }





    /**

     *  List of all shared libraries this application is linked against. This

     *  list will only be set if the {@link PackageManager#GET_SHARED_LIBRARY_FILES

     *  PackageManager.GET_SHARED_LIBRARY_FILES} flag was used when retrieving the structure.

     *

     * @hide

     */

    @NonNull

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public List<SharedLibraryInfo> getSharedLibraryInfos() {

        if (sharedLibraryInfos == null) {

            return Collections.EMPTY_LIST;

        }

        return sharedLibraryInfos;

    }



}

core/java/android/content/pm/PackageManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ public abstract class PackageManager { 
     * via this flag.

     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 0x04000000;



    /**