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

Commit 519d3bb8 authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Expose Handler APIs as @TestApi" into main am: af343234 am: 181d41ec 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3404741



Change-Id: Ib9d1b2fb16b4f73d4f30eae94bb9c43963e9c773
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d42e0982 181d41ec

core/api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -2431,6 +2431,12 @@ package android.os { 
    method @NonNull public static byte[] digest(@NonNull java.io.InputStream, @NonNull String) throws java.io.IOException, java.security.NoSuchAlgorithmException;

  }



  public class Handler {

    method @FlaggedApi("android.os.mainline_vcn_platform_api") public final boolean hasMessagesOrCallbacks();

    method @FlaggedApi("android.os.mainline_vcn_platform_api") public final void removeCallbacksAndEqualMessages(@Nullable Object);

    method @FlaggedApi("android.os.mainline_vcn_platform_api") public final void removeEqualMessages(int, @Nullable Object);

  }



  public class IpcDataCache<Query, Result> extends android.app.PropertyInvalidatedCache<Query,Result> {

    ctor public IpcDataCache(int, @NonNull String, @NonNull String, @NonNull String, @NonNull android.os.IpcDataCache.QueryHandler<Query,Result>);

    method public static void disableForCurrentProcess(@NonNull String);

core/java/android/os/Handler.java

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.FlaggedApi; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.util.Log;

import android.util.Printer;
@@ -839,6 +840,7 @@ public class Handler { 
     *@hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    @FlaggedApi(android.os.Flags.FLAG_MAINLINE_VCN_PLATFORM_API)

    public final void removeEqualMessages(int what, @Nullable Object object) {

        mQueue.removeEqualMessages(this, what, disallowNullArgumentIfShared(object));
@@ -872,6 +874,7 @@ public class Handler { 
     *@hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    @FlaggedApi(android.os.Flags.FLAG_MAINLINE_VCN_PLATFORM_API)

    public final void removeCallbacksAndEqualMessages(@Nullable Object token) {

        mQueue.removeCallbacksAndEqualMessages(this, disallowNullArgumentIfShared(token));
@@ -889,6 +892,7 @@ public class Handler { 
     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    @FlaggedApi(android.os.Flags.FLAG_MAINLINE_VCN_PLATFORM_API)

    public final boolean hasMessagesOrCallbacks() {

        return mQueue.hasMessages(this);