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

Commit e1aceb50 authored by satayev's avatar satayev Committed by Automerger Merge Worker
Browse files

Merge "Expose SharedLibraryInfo#getAllCodePaths as @TestApi." am: 3f955dda... 

Merge "Expose SharedLibraryInfo#getAllCodePaths as @TestApi." am: 3f955dda am: db47bd0c am: c792a3d9 am: 7e314579

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703011

Change-Id: I2ef6832748880d399bd0230fdc4200b66731b0ec
parents d6d7135e 7e314579

core/api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -865,6 +865,10 @@ package android.content.pm { 
    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.ProviderInfoList> CREATOR;

  }



  public final class SharedLibraryInfo implements android.os.Parcelable {

    method @NonNull public java.util.List<java.lang.String> getAllCodePaths();

  }



  public final class ShortcutInfo implements android.os.Parcelable {

    method public boolean isVisibleToPublisher();

  }

core/java/android/content/pm/SharedLibraryInfo.java

+5 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.IntDef; 
import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -29,6 +30,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.Collections;

import java.util.List;

import java.util.Objects;



/**

 * This class provides information for a shared library. There are
@@ -190,7 +192,8 @@ public final class SharedLibraryInfo implements Parcelable { 
     *

     * @hide

     */

    public List<String> getAllCodePaths() {

    @TestApi

    public @NonNull List<String> getAllCodePaths() {

        if (getPath() != null) {

            // Builtin library.

            ArrayList<String> list = new ArrayList<>();
@@ -198,7 +201,7 @@ public final class SharedLibraryInfo implements Parcelable { 
            return list;

        } else {

            // Static or dynamic library.

            return mCodePaths;

            return Objects.requireNonNull(mCodePaths);

        }

    }