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

Commit 8943bbe9 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31 

Android 10.0.0 release 31

* tag 'android-10.0.0_r31': (327 commits)
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fixes NPE when preparing app data during init
  Use KNOWN_PACKAGES when shared lib consumers
  DO NOT MERGE: Add another exception to the nearby-sharing chip code.
  Handles null outInfo in deleteSystemPackageLI
  docs: Add documentation for equals() method
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  docs: Fix typo in IMPORTANCE_SERVICE description
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  [WIFI] Protect broadcasts used by the Wi-Fi framework
  [WIFI] Protect broadcasts used by the Wi-Fi framework
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...

Change-Id: I6dbf311c60dc195dd722633b6f7b4628d5a807ee
parents c7a2370c 2327d933

Android.bp

+3 −5
Original line number Diff line number Diff line
@@ -321,7 +321,6 @@ java_defaults { 
        "core/java/android/service/vr/IVrManager.aidl",

        "core/java/android/service/vr/IVrStateCallbacks.aidl",

        "core/java/android/service/watchdog/IExplicitHealthCheckService.aidl",

        "core/java/android/service/watchdog/PackageConfig.aidl",

        "core/java/android/print/ILayoutResultCallback.aidl",

        "core/java/android/print/IPrinterDiscoveryObserver.aidl",

        "core/java/android/print/IPrintDocumentAdapter.aidl",
@@ -421,6 +420,7 @@ java_defaults { 
        "core/java/com/android/internal/appwidget/IAppWidgetHost.aidl",

        "core/java/com/android/internal/backup/IBackupTransport.aidl",

        "core/java/com/android/internal/backup/IObbBackupService.aidl",

        "core/java/com/android/internal/car/ICarStatsService.aidl",

        "core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl",

        "core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl",

        "core/java/com/android/internal/inputmethod/IMultiClientInputMethod.aidl",
@@ -439,7 +439,6 @@ java_defaults { 
        "core/java/com/android/internal/os/IShellCallback.aidl",

        "core/java/com/android/internal/statusbar/IStatusBar.aidl",

        "core/java/com/android/internal/statusbar/IStatusBarService.aidl",

        "core/java/com/android/internal/statusbar/RegisterStatusBarResult.aidl",

        "core/java/com/android/internal/textservice/ISpellCheckerService.aidl",

        "core/java/com/android/internal/textservice/ISpellCheckerServiceCallback.aidl",

        "core/java/com/android/internal/textservice/ISpellCheckerSession.aidl",
@@ -1403,6 +1402,7 @@ droidstubs { 
        "core/res/AndroidManifest.xml",

    ],

    args: metalava_framework_docs_args,

    write_sdk_values: true,

}



droidstubs {
@@ -1412,6 +1412,7 @@ droidstubs { 
        "core/res/AndroidManifest.xml",

    ],

    args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi ",

    write_sdk_values: true,

}



droiddoc {
@@ -1435,7 +1436,6 @@ droiddoc { 
    ],

    proofread_file: "offline-sdk-docs-proofrerad.txt",

    args: framework_docs_only_args + " -offlinemode -title \"Android SDK\"",

    write_sdk_values: true,

    static_doc_index_redirect: "docs/docs-preview-index.html",

}
@@ -1453,7 +1453,6 @@ droiddoc { 
    ],

    proofread_file: "offline-sdk-referenceonly-docs-proofrerad.txt",

    args: framework_docs_only_args + " -offlinemode -title \"Android SDK\" -referenceonly",

    write_sdk_values: true,

    static_doc_index_redirect: "docs/docs-documentation-redirect.html",

    static_doc_properties: "docs/source.properties",

}
@@ -1473,7 +1472,6 @@ droiddoc { 
    proofread_file: "offline-system-sdk-referenceonly-docs-proofrerad.txt",

    args: framework_docs_only_args  + " -hide 101 -hide 104 -hide 108" +

        " -offlinemode -title \"Android System SDK\" -referenceonly",

    write_sdk_values: true,

    static_doc_index_redirect: "docs/docs-documentation-redirect.html",

    static_doc_properties: "docs/source.properties",

}

Android.mk

+18 −0
Original line number Diff line number Diff line
@@ -54,6 +54,24 @@ $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip 
.PHONY: docs offline-sdk-docs

docs offline-sdk-docs: $(OUT_DOCS)/offline-sdk-timestamp



SDK_METADATA_DIR :=$= $(call intermediates-dir-for,PACKAGING,framework-doc-stubs-metadata,,COMMON)

SDK_METADATA_FILES :=$= $(addprefix $(SDK_METADATA_DIR)/,\

    activity_actions.txt \

    broadcast_actions.txt \

    categories.txt \

    features.txt \

    service_actions.txt \

    widgets.txt)

SDK_METADATA :=$= $(firstword $(SDK_METADATA_FILES))

$(SDK_METADATA): .KATI_IMPLICIT_OUTPUTS := $(filter-out $(SDK_METADATA),$(SDK_METADATA_FILES))

$(SDK_METADATA): $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs-metadata.zip

	rm -rf $(SDK_METADATA_DIR)

	mkdir -p $(SDK_METADATA_DIR)

	unzip -qo $< -d $(SDK_METADATA_DIR)



.PHONY: framework-doc-stubs

framework-doc-stubs: $(SDK_METADATA)



# Run this for checkbuild

checkbuild: doc-comment-check-docs

cmds/statsd/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ cc_defaults { 


    srcs: [

        ":statsd_aidl",

        ":ICarStatsService.aidl",

        "src/active_config_list.proto",

        "src/statsd_config.proto",

        "src/uid_data.proto",
@@ -69,6 +70,7 @@ cc_defaults { 
        "src/config/ConfigKey.cpp",

        "src/config/ConfigListener.cpp",

        "src/config/ConfigManager.cpp",

        "src/external/CarStatsPuller.cpp",

        "src/external/GpuStatsPuller.cpp",

        "src/external/Perfetto.cpp",

        "src/external/Perfprofd.cpp",

cmds/statsd/src/StatsService.cpp

+18 −5
Original line number Diff line number Diff line
@@ -266,7 +266,9 @@ status_t StatsService::onTransact(uint32_t code, const Parcel& data, Parcel* rep 
                    IResultReceiver::asInterface(data.readStrongBinder());



            err = command(in, out, err, args, resultReceiver);

            if (resultReceiver != nullptr) {

                resultReceiver->send(err);

            }

            return NO_ERROR;

        }

        default: { return BnStatsManager::onTransact(code, data, reply, flags); }
@@ -411,13 +413,20 @@ status_t StatsService::command(int in, int out, int err, Vector<String8>& args, 
            return cmd_trigger_active_config_broadcast(out, args);

        }

        if (!args[0].compare(String8("data-subscribe"))) {

            {

                std::lock_guard<std::mutex> lock(mShellSubscriberMutex);

                if (mShellSubscriber == nullptr) {

                    mShellSubscriber = new ShellSubscriber(mUidMap, mPullerManager);

                }

            }

            int timeoutSec = -1;

            if (argCount >= 2) {

                timeoutSec = atoi(args[1].c_str());

            }

            if (resultReceiver == nullptr) {

                ALOGI("Null resultReceiver given, no subscription will be started");

                return UNEXPECTED_NULL;

            }

            mShellSubscriber->startNewSubscription(in, out, resultReceiver, timeoutSec);

            return NO_ERROR;

        }
@@ -1385,7 +1394,10 @@ Status StatsService::sendBinaryPushStateChangedAtom(const android::String16& tra 


Status StatsService::sendWatchdogRollbackOccurredAtom(const int32_t rollbackTypeIn,

                                                      const android::String16& packageNameIn,

                                                      const int64_t packageVersionCodeIn) {

                                                      const int64_t packageVersionCodeIn,

                                                      const int32_t rollbackReasonIn,

                                                      const android::String16&

                                                       failingPackageNameIn) {

    // Note: We skip the usage stats op check here since we do not have a package name.

    // This is ok since we are overloading the usage_stats permission.

    // This method only sends data, it does not receive it.
@@ -1407,7 +1419,8 @@ Status StatsService::sendWatchdogRollbackOccurredAtom(const int32_t rollbackType 
    }



    android::util::stats_write(android::util::WATCHDOG_ROLLBACK_OCCURRED,

            rollbackTypeIn, String8(packageNameIn).string(), packageVersionCodeIn);

            rollbackTypeIn, String8(packageNameIn).string(), packageVersionCodeIn,

            rollbackReasonIn, String8(failingPackageNameIn).string());



    // Fast return to save disk read.

    if (rollbackTypeIn != android::util::WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS

cmds/statsd/src/StatsService.h

+7 −1
Original line number Diff line number Diff line
@@ -200,7 +200,9 @@ public: 
    virtual Status sendWatchdogRollbackOccurredAtom(

            const int32_t rollbackTypeIn,

            const android::String16& packageNameIn,

            const int64_t packageVersionCodeIn) override;

            const int64_t packageVersionCodeIn,

            const int32_t rollbackReasonIn,

            const android::String16& failingPackageNameIn) override;



    /**

     * Binder call to get registered experiment IDs.
@@ -432,6 +434,10 @@ private: 


    sp<ShellSubscriber> mShellSubscriber;



    /**

     * Mutex for setting the shell subscriber

     */

    mutable mutex mShellSubscriberMutex;

    std::shared_ptr<LogEventQueue> mEventQueue;



    FRIEND_TEST(StatsLogProcessorTest, TestActivationsPersistAcrossSystemServerRestart);