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

Commit 7d69d3a8 authored by David Brazdil's avatar David Brazdil Committed by Android (Google) Code Review
Browse files

Merge "Droidfood only: Move private APIs to dark greylist by default"

parents 3d67f4a0 b43351f8

Android.mk

+17 −17
Original line number Diff line number Diff line
@@ -827,35 +827,35 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 


# ==== hiddenapi lists =======================================



# Copy blacklist and dark greylist over into the build folder.

# Copy blacklist and light greylist over into the build folder.

# This is for ART buildbots which need to mock these lists and have alternative

# rules for building them. Other rules in the build system should depend on the

# files in the build folder.



$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-blacklist.txt,\

                            $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)))

$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-dark-greylist.txt,\

                            $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)))

$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-light-greylist.txt,\

                            $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)))



# Generate light greylist as private API minus (blacklist plus dark greylist).

# Generate dark greylist as private API minus (blacklist plus light greylist).



$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)

$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \

                                              $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) \

                                               $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)

	if [ ! -z "`comm -12 <(sort $(BLACKLIST)) <(sort $(DARK_GREYLIST))`" ]; then \

		echo "There should be no overlap between $(BLACKLIST) and $(DARK_GREYLIST)" 1>&2; \

                                              $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)

	if [ ! -z "`comm -12 <(sort $(BLACKLIST)) <(sort $(LIGHT_GREYLIST))`" ]; then \

		echo "There should be no overlap between $(BLACKLIST) and $(LIGHT_GREYLIST)" 1>&2; \

		exit 1; \

	elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST))`" ]; then \

		echo "$(BLACKLIST) must be a subset of $(PRIVATE_API)" 1>&2; \

		exit 2; \

	elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(DARK_GREYLIST))`" ]; then \

		echo "$(DARK_GREYLIST) must be a subset of $(PRIVATE_API)" 1>&2; \

	elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST))`" ]; then \

		echo "$(LIGHT_GREYLIST) must be a subset of $(PRIVATE_API)" 1>&2; \

		exit 3; \

	fi

	comm -23 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST) $(DARK_GREYLIST)) > $@

	comm -23 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST) $(LIGHT_GREYLIST)) > $@



# Include subdirectory makefiles

# ============================================================

config/hiddenapi-light-greylist.txt

0 → 100644
+1105 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -1601,7 +1601,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * @hide

     */

    public boolean isAllowedToUseHiddenApi() {

        return isSystemApp();

        return false;

    }



    /**