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

Commit 8a146e5c authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes from topic "uwb_apex" 

* changes:
  UwbService: Move to packages/modules/Uwb
  UwbManager: Change initialization mechanism for uwb service
  Move existing UWB API classes to UWB apex
parents cb44dc06 c463a36a

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ java_library { 
        "framework-sdkextensions.stubs.module_lib",

        "framework-statsd.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

        "framework-uwb.stubs.module_lib",

        "framework-wifi.stubs.module_lib",

    ],

    sdk_version: "module_current",
@@ -178,6 +179,7 @@ java_library { 
        "framework-sdkextensions.impl",

        "framework-statsd.impl",

        "framework-tethering.impl",

        "framework-uwb.impl",

        "framework-wifi.impl",

        "updatable-media",

    ],

StubLibraries.bp

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ modules_public_stubs = [ 
    "framework-sdkextensions.stubs",

    "framework-statsd.stubs",

    "framework-tethering.stubs",

    "framework-uwb.stubs",

    "framework-wifi.stubs",

    "i18n.module.public.api.stubs",

]
@@ -269,6 +270,7 @@ modules_system_stubs = [ 
    "framework-sdkextensions.stubs.system",

    "framework-statsd.stubs.system",

    "framework-tethering.stubs.system",

    "framework-uwb.stubs.system",

    "framework-wifi.stubs.system",

    "i18n.module.public.api.stubs", // Only has public stubs

]

api/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ genrule { 
        ":framework-sdkextensions{.public.api.txt}",

        ":framework-statsd{.public.api.txt}",

        ":framework-tethering{.public.api.txt}",

        ":framework-uwb{.public.api.txt}",

        ":framework-wifi{.public.api.txt}",

        ":i18n.module.public.api{.public.api.txt}",

        ":non-updatable-current.txt",
@@ -149,6 +150,7 @@ genrule { 
        ":framework-sdkextensions{.public.stubs.source}",

        ":framework-statsd{.public.stubs.source}",

        ":framework-tethering{.public.stubs.source}",

        ":framework-uwb{.public.stubs.source}",

        ":framework-wifi{.public.stubs.source}",

        ":i18n.module.public.api{.public.stubs.source}",

    ],
@@ -175,6 +177,7 @@ genrule { 
        ":framework-sdkextensions{.public.removed-api.txt}",

        ":framework-statsd{.public.removed-api.txt}",

        ":framework-tethering{.public.removed-api.txt}",

        ":framework-uwb{.public.removed-api.txt}",

        ":framework-wifi{.public.removed-api.txt}",

        ":i18n.module.public.api{.public.removed-api.txt}",

        ":non-updatable-removed.txt",
@@ -215,6 +218,7 @@ genrule { 
        ":framework-sdkextensions{.system.api.txt}",

        ":framework-statsd{.system.api.txt}",

        ":framework-tethering{.system.api.txt}",

        ":framework-uwb{.system.api.txt}",

        ":framework-wifi{.system.api.txt}",

        ":non-updatable-system-current.txt",

    ],
@@ -273,6 +277,7 @@ genrule { 
        ":framework-sdkextensions{.system.removed-api.txt}",

        ":framework-statsd{.system.removed-api.txt}",

        ":framework-tethering{.system.removed-api.txt}",

        ":framework-uwb{.system.removed-api.txt}",

        ":framework-wifi{.system.removed-api.txt}",

        ":non-updatable-system-removed.txt",

    ],
@@ -313,6 +318,7 @@ genrule { 
        ":framework-sdkextensions{.module-lib.api.txt}",

        ":framework-statsd{.module-lib.api.txt}",

        ":framework-tethering{.module-lib.api.txt}",

        ":framework-uwb{.module-lib.api.txt}",

        ":framework-wifi{.module-lib.api.txt}",

        ":non-updatable-module-lib-current.txt",

    ],
@@ -373,6 +379,7 @@ genrule { 
        ":framework-sdkextensions{.module-lib.removed-api.txt}",

        ":framework-statsd{.module-lib.removed-api.txt}",

        ":framework-tethering{.module-lib.removed-api.txt}",

        ":framework-uwb{.module-lib.removed-api.txt}",

        ":framework-wifi{.module-lib.removed-api.txt}",

        ":non-updatable-module-lib-removed.txt",

    ],
@@ -491,6 +498,7 @@ genrule { 
        ":framework-sdkextensions.stubs{.jar}",

        ":framework-statsd.stubs{.jar}",

        ":framework-tethering.stubs{.jar}",

        ":framework-uwb.stubs{.jar}",

        ":framework-wifi.stubs{.jar}",

        ":i18n.module.public.api.stubs{.jar}",

    ],

boot/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -99,6 +99,10 @@ platform_bootclasspath { 
            apex: "com.android.tethering",

            module: "com.android.tethering-bootclasspath-fragment",

        },

        {

            apex: "com.android.uwb",

            module: "com.android.uwb-bootclasspath-fragment",

        },

        {

            apex: "com.android.wifi",

            module: "com.android.wifi-bootclasspath-fragment",

core/api/system-current.txt

+1 −142
Original line number Diff line number Diff line
@@ -2354,6 +2354,7 @@ package android.content { 
    field public static final String TETHERING_SERVICE = "tethering";

    field public static final String TRANSLATION_MANAGER_SERVICE = "translation";

    field public static final String UI_TRANSLATION_SERVICE = "ui_translation";

    field public static final String UWB_SERVICE = "uwb";

    field public static final String VR_SERVICE = "vrmanager";

    field public static final String WIFI_NL80211_SERVICE = "wifinl80211";

    field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager";
@@ -14264,148 +14265,6 @@ package android.util { 














}



























package android.uwb {

























  public final class AngleMeasurement implements android.os.Parcelable {













    ctor public AngleMeasurement(@FloatRange(from=-3.141592653589793, to=3.141592653589793) double, @FloatRange(from=0.0, to=3.141592653589793) double, @FloatRange(from=0.0, to=1.0) double);













    method public int describeContents();













    method @FloatRange(from=0.0, to=1.0) public double getConfidenceLevel();













    method @FloatRange(from=0.0, to=3.141592653589793) public double getErrorRadians();













    method @FloatRange(from=-3.141592653589793, to=3.141592653589793) public double getRadians();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.uwb.AngleMeasurement> CREATOR;













  }

























  public final class AngleOfArrivalMeasurement implements android.os.Parcelable {













    method public int describeContents();













    method @Nullable public android.uwb.AngleMeasurement getAltitude();













    method @NonNull public android.uwb.AngleMeasurement getAzimuth();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.uwb.AngleOfArrivalMeasurement> CREATOR;













  }

























  public static final class AngleOfArrivalMeasurement.Builder {













    ctor public AngleOfArrivalMeasurement.Builder(@NonNull android.uwb.AngleMeasurement);













    method @NonNull public android.uwb.AngleOfArrivalMeasurement build();













    method @NonNull public android.uwb.AngleOfArrivalMeasurement.Builder setAltitude(@NonNull android.uwb.AngleMeasurement);













  }

























  public final class DistanceMeasurement implements android.os.Parcelable {













    method public int describeContents();













    method @FloatRange(from=0.0, to=1.0) public double getConfidenceLevel();













    method @FloatRange(from=0.0) public double getErrorMeters();













    method public double getMeters();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.uwb.DistanceMeasurement> CREATOR;













  }

























  public static final class DistanceMeasurement.Builder {













    ctor public DistanceMeasurement.Builder();













    method @NonNull public android.uwb.DistanceMeasurement build();













    method @NonNull public android.uwb.DistanceMeasurement.Builder setConfidenceLevel(@FloatRange(from=0.0, to=1.0) double);













    method @NonNull public android.uwb.DistanceMeasurement.Builder setErrorMeters(@FloatRange(from=0.0) double);













    method @NonNull public android.uwb.DistanceMeasurement.Builder setMeters(double);













  }

























  public final class RangingMeasurement implements android.os.Parcelable {













    method public int describeContents();













    method @Nullable public android.uwb.AngleOfArrivalMeasurement getAngleOfArrivalMeasurement();













    method @Nullable public android.uwb.DistanceMeasurement getDistanceMeasurement();













    method public long getElapsedRealtimeNanos();













    method @NonNull public android.uwb.UwbAddress getRemoteDeviceAddress();













    method public int getStatus();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.uwb.RangingMeasurement> CREATOR;













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













    field public static final int RANGING_STATUS_FAILURE_UNKNOWN_ERROR = -1; // 0xffffffff













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













  }

























  public static final class RangingMeasurement.Builder {













    ctor public RangingMeasurement.Builder();













    method @NonNull public android.uwb.RangingMeasurement build();













    method @NonNull public android.uwb.RangingMeasurement.Builder setAngleOfArrivalMeasurement(@NonNull android.uwb.AngleOfArrivalMeasurement);













    method @NonNull public android.uwb.RangingMeasurement.Builder setDistanceMeasurement(@NonNull android.uwb.DistanceMeasurement);













    method @NonNull public android.uwb.RangingMeasurement.Builder setElapsedRealtimeNanos(long);













    method @NonNull public android.uwb.RangingMeasurement.Builder setRemoteDeviceAddress(@NonNull android.uwb.UwbAddress);













    method @NonNull public android.uwb.RangingMeasurement.Builder setStatus(int);













  }

























  public final class RangingReport implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.List<android.uwb.RangingMeasurement> getMeasurements();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.uwb.RangingReport> CREATOR;













  }

























  public static final class RangingReport.Builder {













    ctor public RangingReport.Builder();













    method @NonNull public android.uwb.RangingReport.Builder addMeasurement(@NonNull android.uwb.RangingMeasurement);













    method @NonNull public android.uwb.RangingReport.Builder addMeasurements(@NonNull java.util.List<android.uwb.RangingMeasurement>);













    method @NonNull public android.uwb.RangingReport build();













  }

























  public final class RangingSession implements java.lang.AutoCloseable {













    method @RequiresPermission(android.Manifest.permission.UWB_PRIVILEGED) public void close();













    method @RequiresPermission(android.Manifest.permission.UWB_PRIVILEGED) public void reconfigure(@NonNull android.os.PersistableBundle);













    method @RequiresPermission(android.Manifest.permission.UWB_PRIVILEGED) public void start(@NonNull android.os.PersistableBundle);













    method @RequiresPermission(android.Manifest.permission.UWB_PRIVILEGED) public void stop();













  }

























  public static interface RangingSession.Callback {













    method public void onClosed(int, @NonNull android.os.PersistableBundle);













    method public void onOpenFailed(int, @NonNull android.os.PersistableBundle);













    method public void onOpened(@NonNull android.uwb.RangingSession);













    method public void onReconfigureFailed(int, @NonNull android.os.PersistableBundle);













    method public void onReconfigured(@NonNull android.os.PersistableBundle);













    method public void onReportReceived(@NonNull android.uwb.RangingReport);













    method public void onStartFailed(int, @NonNull android.os.PersistableBundle);













    method public void onStarted(@NonNull android.os.PersistableBundle);













    method public void onStopFailed(int, @NonNull android.os.PersistableBundle);













    method public void onStopped(int, @NonNull android.os.PersistableBundle);













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













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













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













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













    field public static final int REASON_PROTOCOL_SPECIFIC_ERROR = 7; // 0x7













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













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













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













  }

























  public final class UwbAddress implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public static android.uwb.UwbAddress fromBytes(@NonNull byte[]);













    method public int size();













    method @NonNull public byte[] toBytes();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.uwb.UwbAddress> CREATOR;













    field public static final int EXTENDED_ADDRESS_BYTE_LENGTH = 8; // 0x8













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













  }

























  public final class UwbManager {













    method @RequiresPermission(android.Manifest.permission.UWB_PRIVILEGED) public long elapsedRealtimeResolutionNanos();













    method @NonNull @RequiresPermission(android.Manifest.permission.UWB_PRIVILEGED) public android.os.PersistableBundle getSpecificationInfo();













    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.UWB_PRIVILEGED, android.Manifest.permission.UWB_RANGING}) public android.os.CancellationSignal openRangingSession(@NonNull android.os.PersistableBundle, @NonNull java.util.concurrent.Executor, @NonNull android.uwb.RangingSession.Callback);













    method @RequiresPermission(android.Manifest.permission.UWB_PRIVILEGED) public void registerAdapterStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.uwb.UwbManager.AdapterStateCallback);













    method @RequiresPermission(android.Manifest.permission.UWB_PRIVILEGED) public void unregisterAdapterStateCallback(@NonNull android.uwb.UwbManager.AdapterStateCallback);













  }

























  public static interface UwbManager.AdapterStateCallback {













    method public void onStateChanged(int, int);













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













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













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













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













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













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













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













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













  }

























}



























package android.view {





























  public abstract class Window {