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

Commit 7fee5aa9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4826885 from a76360dd to pi-release 

Change-Id: I38823c8a96dd5a25943a4218ae1c254a2f7feb46
parents e43aa62c a76360dd

Android.mk

+113 −0
Original line number Diff line number Diff line
@@ -257,6 +257,15 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \ 
		-federate AndroidX https://developer.android.com \

		-federationapi AndroidX prebuilts/sdk/current/androidx-api.txt



framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS := \

    --manifest ./frameworks/base/core/res/AndroidManifest.xml \

    --hide-package com.android.okhttp \

    --hide-package com.android.org.conscrypt --hide-package com.android.server \

    --hide RequiresPermission \

    --hide MissingPermission --hide BroadcastBehavior \

    --hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol \

    --hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo



# ====  Public API diff ===========================

include $(CLEAR_VARS)
@@ -351,6 +360,40 @@ $(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_API_FILE) \ 
                                          $(INTERNAL_PLATFORM_REMOVED_API_FILE)

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))



# ====  the metalava api stubs and current.xml ===========================

include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)



LOCAL_MODULE := metalava-api-stubs

LOCAL_DROIDDOC_USE_METALAVA := true



LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/src



INTERNAL_PLATFORM_METALAVA_PUBLIC_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava_public_api.txt

INTERNAL_PLATFORM_METALAVA_PUBLIC_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava_removed.txt



LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS) \

		--api $(INTERNAL_PLATFORM_METALAVA_PUBLIC_API_FILE) \

		--removed-api $(INTERNAL_PLATFORM_METALAVA_PUBLIC_REMOVED_API_FILE) \

		-nodocs



LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_DROIDDOC)



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

                                          $(INTERNAL_PLATFORM_METALAVA_PUBLIC_REMOVED_API_FILE)

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_METALAVA_PUBLIC_API_FILE))



# ====  the system api stubs ===================================

include $(CLEAR_VARS)
@@ -388,6 +431,41 @@ $(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \ 
                                          $(INTERNAL_PLATFORM_SYSTEM_EXACT_API_FILE)

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))



# ====  the metalava system api stubs ===================================

include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)



LOCAL_MODULE := metalava-system-api-stubs

LOCAL_DROIDDOC_USE_METALAVA := true



LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_system_stubs_current_intermediates/src



INTERNAL_PLATFORM_METALAVA_SYSTEM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava-system-api.txt

INTERNAL_PLATFORM_METALAVA_SYSTEM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava-system-removed.txt



LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS) \

		--show-annotation android.annotation.SystemApi \

		--api $(INTERNAL_PLATFORM_METALAVA_SYSTEM_API_FILE) \

		--removed-api $(INTERNAL_PLATFORM_METALAVA_SYSTEM_REMOVED_API_FILE) \

		-nodocs



LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_DROIDDOC)



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

                                          $(INTERNAL_PLATFORM_METALAVA_SYSTEM_REMOVED_API_FILE) \

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_METALAVA_SYSTEM_API_FILE))



# ====  the test api stubs ===================================

include $(CLEAR_VARS)
@@ -426,6 +504,41 @@ $(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_TEST_API_FILE) \ 
                                          $(INTERNAL_PLATFORM_TEST_EXACT_API_FILE)

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE))



# ====  the metalava test api stubs ===================================

include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)



LOCAL_MODULE := metalava-test-api-stubs

LOCAL_DROIDDOC_USE_METALAVA := true



LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_test_stubs_current_intermediates/src



INTERNAL_PLATFORM_METALAVA_TEST_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava-test-api.txt

INTERNAL_PLATFORM_METALAVA_TEST_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava-test-removed.txt



LOCAL_DROIDDOC_OPTIONS:=\

               $(framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS) \

               --show-annotation android.annotation.TestApi \

               --api $(INTERNAL_PLATFORM_METALAVA_TEST_API_FILE) \

               --removed-api $(INTERNAL_PLATFORM_METALAVA_TEST_REMOVED_API_FILE) \

               -nodocs



LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_DROIDDOC)



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

                                          $(INTERNAL_PLATFORM_METALAVA_TEST_REMOVED_API_FILE) \

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_METALAVA_TEST_API_FILE))



# ====  the complete hidden api list ===================================

include $(CLEAR_VARS)

config/hiddenapi-light-greylist.txt

+5 −0
Original line number Diff line number Diff line
@@ -3370,6 +3370,7 @@ Landroid/net/INetworkScoreService$Stub;->asInterface(Landroid/os/IBinder;)Landro 
Landroid/net/INetworkStatsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

Landroid/net/INetworkStatsService$Stub$Proxy;->getMobileIfaces()[Ljava/lang/String;

Landroid/net/INetworkStatsService;->forceUpdate()V

Landroid/net/INetworkStatsService;->getDataLayerSnapshotForUid(I)Landroid/net/NetworkStats;

Landroid/net/INetworkStatsService;->getMobileIfaces()[Ljava/lang/String;

Landroid/net/INetworkStatsService;->openSession()Landroid/net/INetworkStatsSession;

Landroid/net/INetworkStatsService;->openSessionForUsageStats(ILjava/lang/String;)Landroid/net/INetworkStatsSession;
@@ -3802,6 +3803,7 @@ Landroid/os/AsyncTask;->mTaskInvoked:Ljava/util/concurrent/atomic/AtomicBoolean; 
Landroid/os/AsyncTask;->mWorker:Landroid/os/AsyncTask$WorkerRunnable;

Landroid/os/AsyncTask;->sDefaultExecutor:Ljava/util/concurrent/Executor;

Landroid/os/AsyncTask;->setDefaultExecutor(Ljava/util/concurrent/Executor;)V

Landroid/os/BaseBundle;->isParcelled()Z

Landroid/os/BaseBundle;->mMap:Landroid/util/ArrayMap;

Landroid/os/BaseBundle;->mParcelledData:Landroid/os/Parcel;

Landroid/os/BaseBundle;->unparcel()V
@@ -5504,6 +5506,7 @@ Landroid/telephony/TelephonyManager$MultiSimVariants;->UNKNOWN:Landroid/telephon 
Landroid/telephony/TelephonyManager$MultiSimVariants;->values()[Landroid/telephony/TelephonyManager$MultiSimVariants;

Landroid/telephony/TelephonyManager;-><init>()V

Landroid/telephony/TelephonyManager;-><init>(Landroid/content/Context;)V

Landroid/telephony/TelephonyManager;-><init>(Landroid/content/Context;I)V

Landroid/telephony/TelephonyManager;->ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED:Ljava/lang/String;

Landroid/telephony/TelephonyManager;->from(Landroid/content/Context;)Landroid/telephony/TelephonyManager;

Landroid/telephony/TelephonyManager;->getCallState(I)I
@@ -6790,6 +6793,7 @@ Landroid/widget/AbsListView;->resurrectSelectionIfNeeded()Z 
Landroid/widget/AbsListView;->smoothScrollBy(IIZZ)V

Landroid/widget/AbsListView;->trackMotionScroll(II)Z

Landroid/widget/AbsListView;->updateSelectorState()V

Landroid/widget/AbsSeekBar;->drawThumb(Landroid/graphics/Canvas;)V

Landroid/widget/AbsSeekBar;->mDisabledAlpha:F

Landroid/widget/AbsSeekBar;->mIsDragging:Z

Landroid/widget/AbsSeekBar;->mIsUserSeekable:Z
@@ -8269,6 +8273,7 @@ Lcom/android/internal/telephony/ITelephony$Stub$Proxy;-><init>(Landroid/os/IBind 
Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->endCall()Z

Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->endCallForSubscriber(I)Z

Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->getDeviceId(Ljava/lang/String;)Ljava/lang/String;

Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->isRadioOn(Ljava/lang/String;)Z

Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->mRemote:Landroid/os/IBinder;

Lcom/android/internal/telephony/ITelephony$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephony;

Lcom/android/internal/telephony/ITelephony$Stub;->DESCRIPTOR:Ljava/lang/String;

config/preloaded-classes

+0 −1
Original line number Diff line number Diff line
@@ -6375,7 +6375,6 @@ sun.nio.fs.LinuxFileSystemProvider 
sun.nio.fs.NativeBuffer

sun.nio.fs.NativeBuffer$Deallocator

sun.nio.fs.NativeBuffers

sun.nio.fs.UnixChannelFactory

sun.nio.fs.UnixChannelFactory$Flags

sun.nio.fs.UnixConstants

sun.nio.fs.UnixException

config/preloaded-classes-blacklist

+1 −0
Original line number Diff line number Diff line 
android.net.ConnectivityThread$Singleton

android.os.FileObserver

android.widget.Magnifier

sun.nio.fs.UnixChannelFactory

core/java/android/app/Notification.java

+4 −18
Original line number Diff line number Diff line
@@ -2676,7 +2676,8 @@ public class Notification implements Parcelable 
                return true;

            }

            for (int i = 0; i < firstAs.length; i++) {

                if (!Objects.equals(firstAs[i].title, secondAs[i].title)) {

                if (!Objects.equals(String.valueOf(firstAs[i].title),

                        String.valueOf(secondAs[i].title))) {

                    return true;

                }

                RemoteInput[] firstRs = firstAs[i].getRemoteInputs();
@@ -2691,25 +2692,10 @@ public class Notification implements Parcelable 
                    return true;

                }

                for (int j = 0; j < firstRs.length; j++) {

                    if (!Objects.equals(firstRs[j].getLabel(), secondRs[j].getLabel())) {

                    if (!Objects.equals(String.valueOf(firstRs[j].getLabel()),

                            String.valueOf(secondRs[j].getLabel()))) {

                        return true;

                    }

                    CharSequence[] firstCs = firstRs[j].getChoices();

                    CharSequence[] secondCs = secondRs[j].getChoices();

                    if (firstCs == null) {

                        firstCs = new CharSequence[0];

                    }

                    if (secondCs == null) {

                        secondCs = new CharSequence[0];

                    }

                    if (firstCs.length != secondCs.length) {

                        return true;

                    }

                    for (int k = 0; k < firstCs.length; k++) {

                        if (!Objects.equals(firstCs[k], secondCs[k])) {

                            return true;

                        }

                    }

                }

            }

        }