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

Commit de34f1c3 authored by Kangping Dong's avatar Kangping Dong Committed by Automerger Merge Worker
Browse files

Merge "[Thread] flagging the FEATURE_THREAD_NETWORK API" into main am: e4c42b34 

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



Change-Id: If1a050b63f8dec97d9c5485a5fe2bcf638fc0400
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b80ebcd e4c42b34

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12737,7 +12737,7 @@ package android.content.pm { 
    field public static final String FEATURE_TELEPHONY_RADIO_ACCESS = "android.hardware.telephony.radio.access";

    field public static final String FEATURE_TELEPHONY_SUBSCRIPTION = "android.hardware.telephony.subscription";

    field @Deprecated public static final String FEATURE_TELEVISION = "android.hardware.type.television";

    field public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";

    field @FlaggedApi("com.android.net.thread.flags.thread_enabled") public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";

    field public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";

    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";

    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";

core/java/android/content/pm/PackageManager.java

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.Manifest; 
import android.annotation.CallbackExecutor;

import android.annotation.CheckResult;

import android.annotation.DrawableRes;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.LongDef;
@@ -3651,6 +3652,7 @@ public abstract class PackageManager { 
     * The device is capable of communicating with other devices via

     * <a href="https://www.threadgroup.org">Thread</a> networking protocol.

     */

    @FlaggedApi("com.android.net.thread.flags.thread_enabled")

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";