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

Commit 15bcfcf7 authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

Skip ef9f2740 in proposed pi-dev-plus-aosp-without-vendor merge. 

am: f700e7fe

Change-Id: I1a6504799a83d2736881b149a5181e78bc212193
parents a3a202e9 f700e7fe

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,6 @@ droiddoc { 
        "core/java/overview.html",

        ":current-support-api",

    ],

    dex_api_filename: "public-dex.txt",

    private_dex_api_filename: "private-dex.txt",

    removed_dex_api_filename: "removed-dex.txt",

    args: framework_docs_args +

Android.mk

+1 −4
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ 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)
@@ -737,7 +736,6 @@ 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)
@@ -810,8 +808,7 @@ $(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)) \

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

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

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

	               while read PKG_NAME; do \

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

	               done | sort | uniq) \

core/java/android/app/PendingIntent.java

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ public final class PendingIntent implements Parcelable { 
     */

    public interface OnFinished {

        /**

         * Called when a send operation has completed.

         * Called when a send operation as completed.

         *

         * @param pendingIntent The PendingIntent this operation was sent through.

         * @param intent The original Intent that was sent.