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

Commit 680d6df8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master

parents 38c07c31 ef7cd809

Android.bp

+18 −5
Original line number Diff line number Diff line
@@ -771,6 +771,24 @@ java_library { 
    dxflags: ["--core-library"],

}



// ====  java proto host library  ==============================

java_library_host {

    name: "platformprotos",

    srcs: [

        "cmds/am/proto/instrumentation_data.proto",

        "core/proto/**/*.proto",

        "libs/incident/proto/**/*.proto",

        "cmds/statsd/src/**/*.proto",

    ],

    proto: {

        include_dirs: ["external/protobuf/src"],

        type: "full",

    },

    errorprone: {

        javacflags: ["-Xep:MissingOverride:OFF"],  // b/72714520

    },

}



// ====  c++ proto device library  ==============================

cc_library {

    name: "libplatformprotos",
@@ -1229,11 +1247,6 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x 
doc_defaults {

    name: "metalava-framework-docs-default",

    srcs: [

        // test mock src files.

        "test-mock/src/android/test/mock/**/*.java",

        // test runner excluding mock src files.

        "test-runner/src/**/*.java",

        "test-base/src/**/*.java",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        ":openjdk_javadoc_files",

Android.mk

+0 −17
Original line number Diff line number Diff line
@@ -670,23 +670,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk 


include $(BUILD_DROIDDOC)



# ====  java proto host library  ==============================

include $(CLEAR_VARS)

LOCAL_MODULE := platformprotos

LOCAL_PROTOC_OPTIMIZE_TYPE := full

LOCAL_PROTOC_FLAGS := \

    -Iexternal/protobuf/src

LOCAL_SOURCE_FILES_ALL_GENERATED := true

LOCAL_SRC_FILES := \

    cmds/am/proto/instrumentation_data.proto \

    cmds/statsd/src/perfetto/perfetto_config.proto \

    $(call all-proto-files-under, core/proto) \

    $(call all-proto-files-under, libs/incident/proto) \

    $(call all-proto-files-under, cmds/statsd/src)

# b/72714520

LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF

include $(BUILD_HOST_JAVA_LIBRARY)



# ====  java proto device library (for test only)  ==============================

include $(CLEAR_VARS)

LOCAL_MODULE := platformprotosnano

config/hiddenapi-light-greylist.txt

+44 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/animation/IntEvaluator.java

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ public class IntEvaluator implements TypeEvaluator<Integer> { 
    /**

     * This function returns the result of linearly interpolating the start and end values, with

     * <code>fraction</code> representing the proportion between the start and end values. The

     * calculation is a simple parametric calculation: <code>result = x0 + t * (v1 - v0)</code>,

     * calculation is a simple parametric calculation: <code>result = x0 + t * (x1 - x0)</code>,

     * where <code>x0</code> is <code>startValue</code>, <code>x1</code> is <code>endValue</code>,

     * and <code>t</code> is <code>fraction</code>.

     *

core/java/android/app/ActivityManagerInternal.java

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.Nullable; 
import android.content.ComponentName;

import android.content.IIntentSender;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;

import android.os.Bundle;

import android.os.IBinder;
@@ -407,4 +408,9 @@ public abstract class ActivityManagerInternal { 
     * has {@code permission}.

     */

    public abstract void enforceCallerIsRecentsOrHasPermission(String permission, String func);



    /**

     * @return The intent used to launch the home activity.

     */

    public abstract Intent getHomeIntent();

}