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

Commit 6de3e381 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4818534 from c4f520dd to pi-release 

Change-Id: I286d282fb4bd7c960cff7a58a6372817d9cebb82
parents d7f3b8dc c4f520dd

Android.mk

+7 −2
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-showUnannotated \

		-showAnnotation android.annotation.SystemApi \

		-showAnnotation android.annotation.TestApi \

		-dexApi $(INTERNAL_PLATFORM_DEX_API_FILE) \

		-privateDexApi $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \

		-removedDexApi $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) \

		-nodocs
@@ -457,7 +458,8 @@ LOCAL_UNINSTALLABLE_MODULE := true 


include $(BUILD_DROIDDOC)



$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \

$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_DEX_API_FILE) \

                                          $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \

                                          $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)



# ====  check javadoc comments but don't generate docs ========
@@ -878,6 +880,7 @@ LOCAL_BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) 
LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt

LOCAL_SRC_VENDOR_LIST := frameworks/base/config/hiddenapi-vendor-list.txt

LOCAL_SRC_FORCE_BLACKLIST := frameworks/base/config/hiddenapi-force-blacklist.txt

LOCAL_SRC_PUBLIC_API := $(INTERNAL_PLATFORM_DEX_API_FILE)

LOCAL_SRC_PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)

LOCAL_SRC_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)
@@ -885,6 +888,7 @@ LOCAL_SRC_ALL := \ 
	$(LOCAL_SRC_GREYLIST) \

	$(LOCAL_SRC_VENDOR_LIST) \

	$(LOCAL_SRC_FORCE_BLACKLIST) \

	$(LOCAL_SRC_PUBLIC_API) \

	$(LOCAL_SRC_PRIVATE_API) \

	$(LOCAL_SRC_REMOVED_API)
@@ -957,7 +961,8 @@ $(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL) 
#   (4) subtract entries shared with LOCAL_LIGHT_GREYLIST

$(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST)

	comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_SRC_FORCE_BLACKLIST)) \

	         <(sed 's/\->.*//' $(LOCAL_LIGHT_GREYLIST) | sed 's/\(.*\/\).*/\1/' | sort | uniq | \

	         <(cat $(LOCAL_SRC_PUBLIC_API) $(LOCAL_LIGHT_GREYLIST) | \

	               sed 's/\->.*//' | sed 's/\(.*\/\).*/\1/' | sort | uniq | \

	               while read PKG_NAME; do \

	                   grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \

	               done | sort | uniq) \

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -248,6 +248,8 @@ package android.content.pm { 
  public abstract class PackageManager {

    method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int);

    method public abstract int getInstallReason(java.lang.String, android.os.UserHandle);

    method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);

    method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int);

    method public abstract java.lang.String[] getNamesForUids(int[]);

    method public abstract java.lang.String getPermissionControllerPackageName();

    method public abstract java.lang.String getServicesSystemSharedLibraryPackageName();
@@ -256,6 +258,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage";

    field public static final java.lang.String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption";

    field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000

    field public static final int MATCH_KNOWN_PACKAGES = 4202496; // 0x402000

  }



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

config/boot-image-profile.txt

+12357 −2230

File changed.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-light-greylist.txt

+42 −0

File changed.

Preview size limit exceeded, changes collapsed.

config/preloaded-classes

+676 −1

File changed.

Preview size limit exceeded, changes collapsed.