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

Commit 812ad5cb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4683893 from f0edf03e to pi-release 

Change-Id: I8a450a70da831c3964896b1ba09467cf62f9c138
parents ac1cd44d f0edf03e

Android.mk

+18 −2
Original line number Diff line number Diff line
@@ -869,11 +869,27 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 
$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-blacklist.txt,\

                            $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)))



# Automatically add all methods which match the following signatures.

# These need to be greylisted in order to allow applications to write their

# own serializers.

$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): REGEX_SERIALIZATION := \

    "readObject\(Ljava/io/ObjectInputStream;\)V" \

    "readObjectNoData\(\)V" \

    "readResolve\(\)Ljava/lang/Object;" \

    "serialVersionUID:J" \

    "serialPersistentFields:\[Ljava/io/ObjectStreamField;" \

    "writeObject\(Ljava/io/ObjectOutputStream;\)V" \

    "writeReplace\(\)Ljava/lang/Object;"

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

# Temporarily merge light greylist from two files. Vendor list will become dark

# grey once we remove the UI toast.

$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): frameworks/base/config/hiddenapi-light-greylist.txt \

                                               frameworks/base/config/hiddenapi-vendor-list.txt

	sort $^ > $@

                                               frameworks/base/config/hiddenapi-vendor-list.txt \

                                               $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)

	sort frameworks/base/config/hiddenapi-light-greylist.txt \

	     frameworks/base/config/hiddenapi-vendor-list.txt \

	     <(grep -E "\->("$(subst $(space),"|",$(REGEX_SERIALIZATION))")$$" $(PRIVATE_API)) \

	> $@



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

api/current.txt

+47 −36

File changed.

Preview size limit exceeded, changes collapsed.

api/removed.txt

+29 −0
Original line number Diff line number Diff line
@@ -54,6 +54,24 @@ package android.app.admin { 


}



package android.app.job {



  public class JobInfo implements android.os.Parcelable {

    method public deprecated long getEstimatedNetworkBytes();

  }



  public static final class JobInfo.Builder {

    method public deprecated android.app.job.JobInfo.Builder setEstimatedNetworkBytes(long);

    method public deprecated android.app.job.JobInfo.Builder setIsPrefetch(boolean);

  }



  public final class JobWorkItem implements android.os.Parcelable {

    ctor public deprecated JobWorkItem(android.content.Intent, long);

    method public deprecated long getEstimatedNetworkBytes();

  }



}



package android.app.usage {



  public final class StorageStats implements android.os.Parcelable {
@@ -150,6 +168,17 @@ package android.graphics { 
  public class Canvas {

    method public deprecated boolean clipRegion(android.graphics.Region, android.graphics.Region.Op);

    method public deprecated boolean clipRegion(android.graphics.Region);

    method public deprecated int save(int);

    method public deprecated int saveLayer(android.graphics.RectF, android.graphics.Paint, int);

    method public deprecated int saveLayer(float, float, float, float, android.graphics.Paint, int);

    method public deprecated int saveLayerAlpha(android.graphics.RectF, int, int);

    method public deprecated int saveLayerAlpha(float, float, float, float, int, int);

    field public static final int ALL_SAVE_FLAG = 31; // 0x1f

    field public static final deprecated int CLIP_SAVE_FLAG = 2; // 0x2

    field public static final deprecated int CLIP_TO_LAYER_SAVE_FLAG = 16; // 0x10

    field public static final deprecated int FULL_COLOR_LAYER_SAVE_FLAG = 8; // 0x8

    field public static final deprecated int HAS_ALPHA_LAYER_SAVE_FLAG = 4; // 0x4

    field public static final deprecated int MATRIX_SAVE_FLAG = 1; // 0x1

  }



  public final class ImageDecoder implements java.lang.AutoCloseable {

api/system-current.txt

+0 −3

File changed.

Preview size limit exceeded, changes collapsed.

cmds/statsd/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -206,7 +206,9 @@ LOCAL_SRC_FILES := \ 
    tests/e2e/GaugeMetric_e2e_push_test.cpp \

    tests/e2e/DimensionInCondition_e2e_combination_AND_cond_test.cpp \

    tests/e2e/DimensionInCondition_e2e_combination_OR_cond_test.cpp \

    tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp

    tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp \

    tests/e2e/Anomaly_count_e2e_test.cpp \

    tests/e2e/Anomaly_duration_sum_e2e_test.cpp



LOCAL_STATIC_LIBRARIES := \

    $(statsd_common_static_libraries) \