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

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

Snap for 6287519 from 0d05f04c to mainline-release 

Change-Id: I28837b03129f217108ad5dc9dd36a4fcc6412965
parents d6ff806c 0d05f04c

Android.bp

+29 −24
Original line number Diff line number Diff line
@@ -281,17 +281,33 @@ filegroup { 
filegroup {

    name: "framework-updatable-sources",

    srcs: [

        ":framework-mediaprovider-sources",

        ":framework-permission-sources",

        ":framework-sdkextensions-sources",

        ":framework-statsd-sources",

        ":framework-telephony-sources",

        ":framework-tethering-srcs",

        ":updatable-media-srcs",

        ":framework-mediaprovider-sources",

        ":framework-permission-sources",

        ":framework-wifi-updatable-sources",

        ":framework-telephony-sources",

        ":updatable-media-srcs",

    ]

}



java_library {

    name: "framework-updatable-stubs-module_libs_api",

    static_libs: [

        "framework-media-stubs-module_libs_api",

        "framework-mediaprovider-stubs-module_libs_api",

        "framework-permission-stubs-module_libs_api",

        "framework-sdkextensions-stubs-module_libs_api",

        "framework-statsd-stubs-module_libs_api",

        "framework-telephony-stubs", // TODO: Update to module_libs_api when there is one.

        "framework-tethering-stubs-module_libs_api",

        "framework-wifi-stubs-module_libs_api",

    ],

    sdk_version: "module_current",

    visibility: [":__pkg__"],

}



filegroup {

    name: "framework-all-sources",

    srcs: [
@@ -307,7 +323,6 @@ java_defaults { 
    name: "framework-aidl-export-defaults",

    aidl: {

        export_include_dirs: [

            "apex/media/framework/java",

            "core/java",

            "drm/java",

            "graphics/java",
@@ -324,6 +339,12 @@ java_defaults { 
            "rs/java",

            "sax/java",

            "telecomm/java",



            // TODO(b/148660295): remove this

            "apex/media/framework/java",



            // TODO(b/147699819): remove this

            "telephony/java",

        ],

    },

}
@@ -397,9 +418,7 @@ java_defaults { 
        "app-compat-annotations",

        "ext",

        "unsupportedappusage",

        "framework-media-stubs-systemapi",

        "framework-mediaprovider-stubs-systemapi",

        "framework-telephony-stubs",

        "framework-updatable-stubs-module_libs_api",

    ],



    jarjar_rules: ":framework-jarjar-rules",
@@ -465,13 +484,6 @@ java_library { 
    name: "framework-minus-apex",

    defaults: ["framework-defaults"],

    srcs: [":framework-non-updatable-sources"],

    libs: [

        "framework-sdkextensions-stubs-systemapi",

        "framework-statsd-stubs-module_libs_api",

        "framework-permission-stubs-systemapi",

        "framework-wifi-stubs-systemapi",

        "framework-tethering-stubs-module_libs_api",

    ],

    installable: true,

    javac_shard_size: 150,

    required: [
@@ -512,16 +524,9 @@ java_library { 
    installable: false, // this lib is a build-only library

    static_libs: [

        "framework-minus-apex",

        "framework-media-stubs-systemapi",

        "framework-mediaprovider-stubs-systemapi",

        "framework-permission-stubs-systemapi",

        "framework-sdkextensions-stubs-systemapi",

        "framework-statsd-stubs-module_libs_api",

        "framework-wifi-stubs-systemapi",

        "framework-tethering-stubs-module_libs_api",

        // TODO (b/147688669) should be framework-telephony-stubs

        // TODO (b/147688669) should be removed

        "framework-telephony",

        // TODO(jiyong): add stubs for APEXes here

        "framework-updatable-stubs-module_libs_api",

    ],

    sdk_version: "core_platform",

    apex_available: ["//apex_available:platform"],

api/current.txt

+10 −6
Original line number Diff line number Diff line
@@ -10806,6 +10806,7 @@ package android.content { 
    field public static final String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

    field public static final String EXTRA_TEXT = "android.intent.extra.TEXT";

    field public static final String EXTRA_TIME = "android.intent.extra.TIME";

    field public static final String EXTRA_TIMEZONE = "time-zone";

    field public static final String EXTRA_TITLE = "android.intent.extra.TITLE";

    field public static final String EXTRA_UID = "android.intent.extra.UID";

    field public static final String EXTRA_USER = "android.intent.extra.USER";
@@ -45973,9 +45974,6 @@ package android.telecom { 
    field public static final int MISSED = 5; // 0x5

    field public static final int OTHER = 9; // 0x9

    field public static final String REASON_EMERGENCY_CALL_PLACED = "REASON_EMERGENCY_CALL_PLACED";

    field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";

    field public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED";

    field public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF";

    field public static final int REJECTED = 6; // 0x6

    field public static final int REMOTE = 3; // 0x3

    field public static final int RESTRICTED = 8; // 0x8
@@ -46302,7 +46300,6 @@ package android.telecom { 
    field public static final int DURATION_SHORT = 1; // 0x1

    field public static final int DURATION_VERY_SHORT = 0; // 0x0

    field public static final String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";

    field public static final String EXTRA_CALL_CREATED_TIME_MILLIS = "android.telecom.extra.CALL_CREATED_TIME_MILLIS";

    field public static final String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";

    field public static final String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";

    field public static final String EXTRA_CALL_DURATION = "android.telecom.extra.CALL_DURATION";
@@ -48044,13 +48041,13 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.os.ParcelUuid createSubscriptionGroup(@NonNull java.util.List<java.lang.Integer>);

    method @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context);

    method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList();

    method @Nullable public java.util.List<android.telephony.SubscriptionInfo> getActiveAndHiddenSubscriptionInfoList();

    method public static int getActiveDataSubscriptionId();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount();

    method public int getActiveSubscriptionInfoCountMax();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();

    method @NonNull public java.util.List<android.telephony.SubscriptionInfo> getCompleteActiveSubscriptionInfoList();

    method public static int getDefaultDataSubscriptionId();

    method public static int getDefaultSmsSubscriptionId();

    method public static int getDefaultSubscriptionId();
@@ -48213,6 +48210,7 @@ package android.telephony { 
    method public boolean isEmergencyNumber(@NonNull String);

    method public boolean isHearingAidCompatibilitySupported();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isManualNetworkSelectionAllowed();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isModemEnabledForSlot(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int isMultiSimSupported();

    method public boolean isNetworkRoaming();

    method public boolean isRttSupported();
@@ -48326,7 +48324,6 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0

    field public static final int PHONE_TYPE_CDMA = 2; // 0x2

    field public static final int PHONE_TYPE_GSM = 1; // 0x1

    field public static final int PHONE_TYPE_IMS = 5; // 0x5

    field public static final int PHONE_TYPE_NONE = 0; // 0x0

    field public static final int PHONE_TYPE_SIP = 3; // 0x3

    field public static final int SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION = 2; // 0x2
@@ -55582,10 +55579,12 @@ package android.view { 
  }















  public interface WindowInsetsController {













    method public void addOnControllableInsetsChangedListener(@NonNull android.view.WindowInsetsController.OnControllableInsetsChangedListener);















    method @NonNull public android.os.CancellationSignal controlWindowInsetsAnimation(int, long, @Nullable android.view.animation.Interpolator, @NonNull android.view.WindowInsetsAnimationControlListener);















    method public int getSystemBarsAppearance();















    method public int getSystemBarsBehavior();















    method public void hide(int);













    method public void removeOnControllableInsetsChangedListener(@NonNull android.view.WindowInsetsController.OnControllableInsetsChangedListener);















    method public void setSystemBarsAppearance(int, int);















    method public void setSystemBarsBehavior(int);















    method public void show(int);









@@ -55596,6 +55595,10 @@ package android.view {













    field public static final int BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE = 2; // 0x2















  }



























  public static interface WindowInsetsController.OnControllableInsetsChangedListener {













    method public void onControllableInsetsChanged(@NonNull android.view.WindowInsetsController, int);













  }



























  public interface WindowManager extends android.view.ViewManager {















    method @NonNull public default android.view.WindowMetrics getCurrentWindowMetrics();















    method @Deprecated public android.view.Display getDefaultDisplay();










@@ -82227,3 +82230,4 @@ package org.xmlpull.v1.sax2 {













  }





























}





































api/system-current.txt



+2
−19






























Original line number
Diff line number
Diff line








@@ -79,6 +79,7 @@ package android {













    field public static final String DEVICE_POWER = "android.permission.DEVICE_POWER";















    field public static final String DISPATCH_PROVISIONING_MESSAGE = "android.permission.DISPATCH_PROVISIONING_MESSAGE";















    field public static final String ENTER_CAR_MODE_PRIORITIZED = "android.permission.ENTER_CAR_MODE_PRIORITIZED";













    field public static final String EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS = "android.permission.EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS";















    field public static final String FORCE_BACK = "android.permission.FORCE_BACK";















    field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";















    field public static final String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS";










@@ -7241,7 +7242,6 @@ package android.net.wifi {













    field @Deprecated public int numScorerOverride;















    field @Deprecated public int numScorerOverrideAndSwitchedNetwork;















    field @Deprecated public boolean requirePmf;













    field @Deprecated @Nullable public String saePasswordId;















    field @Deprecated public boolean shared;















    field @Deprecated public boolean useExternalScores;















  }










@@ -9969,7 +9969,7 @@ package android.service.dataloader {













  }





























  public static final class DataLoaderService.FileSystemConnector {













    method public void writeData(@NonNull String, long, long, @NonNull android.os.ParcelFileDescriptor) throws java.io.IOException;













    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void writeData(@NonNull String, long, long, @NonNull android.os.ParcelFileDescriptor) throws java.io.IOException;















  }





























}










@@ -10647,14 +10647,7 @@ package android.telecom {













  }





























  public final class PhoneAccount implements android.os.Parcelable {













    field public static final int CAPABILITY_EMERGENCY_CALLS_ONLY = 128; // 0x80













    field public static final int CAPABILITY_EMERGENCY_PREFERRED = 8192; // 0x2000













    field public static final int CAPABILITY_EMERGENCY_VIDEO_CALLING = 512; // 0x200















    field public static final int CAPABILITY_MULTI_USER = 32; // 0x20













    field public static final String EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE = "android.telecom.extra.ALWAYS_USE_VOIP_AUDIO_MODE";













    field public static final String EXTRA_PLAY_CALL_RECORDING_TONE = "android.telecom.extra.PLAY_CALL_RECORDING_TONE";













    field public static final String EXTRA_SORT_ORDER = "android.telecom.extra.SORT_ORDER";













    field public static final String EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK = "android.telecom.extra.SUPPORTS_VIDEO_CALLING_FALLBACK";















  }





























  public static class PhoneAccount.Builder {










@@ -10740,20 +10733,13 @@ package android.telecom {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();















    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle);













    field public static final String ACTION_CURRENT_TTY_MODE_CHANGED = "android.telecom.action.CURRENT_TTY_MODE_CHANGED";













    field public static final String ACTION_TTY_PREFERRED_MODE_CHANGED = "android.telecom.action.TTY_PREFERRED_MODE_CHANGED";















    field public static final int CALL_SOURCE_EMERGENCY_DIALPAD = 1; // 0x1















    field public static final int CALL_SOURCE_EMERGENCY_SHORTCUT = 2; // 0x2















    field public static final int CALL_SOURCE_UNSPECIFIED = 0; // 0x0















    field public static final String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT";













    field public static final String EXTRA_CALL_SOURCE = "android.telecom.extra.CALL_SOURCE";













    field public static final String EXTRA_CALL_TECHNOLOGY_TYPE = "android.telecom.extra.CALL_TECHNOLOGY_TYPE";















    field public static final String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT";















    field public static final String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";













    field public static final String EXTRA_CURRENT_TTY_MODE = "android.telecom.extra.CURRENT_TTY_MODE";















    field public static final String EXTRA_IS_USER_INTENT_EMERGENCY_CALL = "android.telecom.extra.IS_USER_INTENT_EMERGENCY_CALL";













    field public static final String EXTRA_TTY_PREFERRED_MODE = "android.telecom.extra.TTY_PREFERRED_MODE";













    field public static final String EXTRA_UNKNOWN_CALL_HANDLE = "android.telecom.extra.UNKNOWN_CALL_HANDLE";















    field public static final int TTY_MODE_FULL = 1; // 0x1















    field public static final int TTY_MODE_HCO = 2; // 0x2















    field public static final int TTY_MODE_OFF = 0; // 0x0










@@ -11598,7 +11584,6 @@ package android.telephony {













    method @Deprecated public boolean getDataEnabled();















    method @Deprecated public boolean getDataEnabled(int);















    method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);













    method @NonNull public static String getDefaultSimCountryIso();















    method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);















    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int);















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();










@@ -11640,7 +11625,6 @@ package android.telephony {













    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled();













    method public boolean isModemEnabledForSlot(int);















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);










@@ -11787,7 +11771,6 @@ package android.telephony {













    field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L















    field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L















    field public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L; // 0x0L













    field public static final int PHONE_TYPE_THIRD_PARTY = 4; // 0x4















    field public static final int RADIO_POWER_OFF = 0; // 0x0















    field public static final int RADIO_POWER_ON = 1; // 0x1















    field public static final int RADIO_POWER_UNAVAILABLE = 2; // 0x2

























api/test-current.txt



+2
−0






























Original line number
Diff line number
Diff line








@@ -428,6 +428,7 @@ package android.app {













    method public boolean isBlockableSystem();















    method public boolean isImportanceLockedByCriticalDeviceFunction();















    method public boolean isImportanceLockedByOEM();













    method public void lockFields(int);















    method public void setBlockableSystem(boolean);















    method public void setDeleted(boolean);















    method public void setFgServiceShown(boolean);









@@ -435,6 +436,7 @@ package android.app {













    method public void setImportanceLockedByOEM(boolean);















    method public void setImportantConversation(boolean);















    method public void setOriginalImportance(int);













    field public static final int USER_LOCKED_SOUND = 32; // 0x20















  }































  public final class NotificationChannelGroup implements android.os.Parcelable {

































cmds/statsd/tests/statsd_test_util.h



+2
−2






























Original line number
Diff line number
Diff line








@@ -217,8 +217,8 @@ std::unique_ptr<LogEvent> CreateReleaseWakelockEvent(uint64_t timestampNs, const













                                                     const string& wakelockName);































// Create log event for releasing wakelock.













std::unique_ptr<LogEvent> CreateIsolatedUidChangedEvent(uint64_t timestampNs, int isolatedUid,













                                                        int hostUid, bool is_create);













std::unique_ptr<LogEvent> CreateIsolatedUidChangedEvent(uint64_t timestampNs, int hostUid,













                                                        int isolatedUid, bool is_create);































// Create log event for uid process state change.















std::unique_ptr<LogEvent> CreateUidProcessStateChangedEvent(