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

Commit 06bd1322 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by Android (Google) Code Review
Browse files

Merge "Flag new SharedConnectivity APIs added post-U." into main

parents 69e7afcb 5c65ca5c

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9538,7 +9538,7 @@ package android.net.wifi.sharedconnectivity.app { 
    method public int getDeviceType();

    method @NonNull public android.os.Bundle getExtras();

    method @NonNull public String getModelName();

    method public boolean isBatteryCharging();

    method @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") public boolean isBatteryCharging();

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

    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.NetworkProviderInfo> CREATOR;

    field public static final int DEVICE_TYPE_AUTO = 5; // 0x5
@@ -9552,7 +9552,7 @@ package android.net.wifi.sharedconnectivity.app { 
  public static final class NetworkProviderInfo.Builder {

    ctor public NetworkProviderInfo.Builder(@NonNull String, @NonNull String);

    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo build();

    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryCharging(boolean);

    method @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryCharging(boolean);

    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryPercentage(@IntRange(from=0, to=100) int);

    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setConnectionStrength(@IntRange(from=0, to=4) int);

    method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setDeviceName(@NonNull String);

core/api/system-lint-baseline.txt

+0 −4
Original line number Diff line number Diff line
@@ -251,10 +251,6 @@ UnflaggedApi: android.media.audiopolicy.AudioMixingRule#writeToParcel(android.os 
    New API must be flagged with @FlaggedApi: method android.media.audiopolicy.AudioMixingRule.writeToParcel(android.os.Parcel,int)

UnflaggedApi: android.media.audiopolicy.AudioPolicy#updateMixingRules(java.util.List<android.util.Pair<android.media.audiopolicy.AudioMix,android.media.audiopolicy.AudioMixingRule>>):

    New API must be flagged with @FlaggedApi: method android.media.audiopolicy.AudioPolicy.updateMixingRules(java.util.List<android.util.Pair<android.media.audiopolicy.AudioMix,android.media.audiopolicy.AudioMixingRule>>)

UnflaggedApi: android.net.wifi.sharedconnectivity.app.NetworkProviderInfo#isBatteryCharging():

    New API must be flagged with @FlaggedApi: method android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.isBatteryCharging()

UnflaggedApi: android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder#setBatteryCharging(boolean):

    New API must be flagged with @FlaggedApi: method android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder.setBatteryCharging(boolean)

UnflaggedApi: android.nfc.cardemulation.AidGroup#CONTENTS_FILE_DESCRIPTOR:

    New API must be flagged with @FlaggedApi: field android.nfc.cardemulation.AidGroup.CONTENTS_FILE_DESCRIPTOR

UnflaggedApi: android.nfc.cardemulation.AidGroup#PARCELABLE_WRITE_RETURN_VALUE:

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2117,7 +2117,7 @@ package android.net.wifi.sharedconnectivity.app { 


  public class SharedConnectivityManager {

    method @Nullable public static android.net.wifi.sharedconnectivity.app.SharedConnectivityManager create(@NonNull android.content.Context, @NonNull String, @NonNull String);

    method @NonNull public android.content.BroadcastReceiver getBroadcastReceiver();

    method @FlaggedApi("com.android.wifi.flags.shared_connectivity_broadcast_receiver_test_api") @NonNull public android.content.BroadcastReceiver getBroadcastReceiver();

    method @Nullable public android.content.ServiceConnection getServiceConnection();

    method public void setService(@Nullable android.os.IInterface);

  }

core/api/test-lint-baseline.txt

+0 −2
Original line number Diff line number Diff line
@@ -257,8 +257,6 @@ UnflaggedApi: android.media.soundtrigger.SoundTriggerManager#loadSoundModel(andr 
    New API must be flagged with @FlaggedApi: method android.media.soundtrigger.SoundTriggerManager.loadSoundModel(android.hardware.soundtrigger.SoundTrigger.SoundModel)

UnflaggedApi: android.media.soundtrigger.SoundTriggerManager.Model#getSoundModel():

    New API must be flagged with @FlaggedApi: method android.media.soundtrigger.SoundTriggerManager.Model.getSoundModel()

UnflaggedApi: android.net.wifi.sharedconnectivity.app.SharedConnectivityManager#getBroadcastReceiver():

    New API must be flagged with @FlaggedApi: method android.net.wifi.sharedconnectivity.app.SharedConnectivityManager.getBroadcastReceiver()

UnflaggedApi: android.os.BatteryManager#BATTERY_PLUGGED_ANY:

    New API must be flagged with @FlaggedApi: field android.os.BatteryManager.BATTERY_PLUGGED_ANY

UnflaggedApi: android.os.BugreportParams#BUGREPORT_MODE_MAX_VALUE:

wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.net.wifi.sharedconnectivity.app;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;
@@ -169,6 +170,7 @@ public final class NetworkProviderInfo implements Parcelable { 
         * @return Returns the Builder object.

         */

        @NonNull

        @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status")

        public Builder setBatteryCharging(boolean isBatteryCharging) {

            mIsBatteryCharging = isBatteryCharging;

            return this;
@@ -283,6 +285,7 @@ public final class NetworkProviderInfo implements Parcelable { 
     *

     * @return Returns true if the battery of the remote device is charging.

     */

    @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status")

    public boolean isBatteryCharging() {

        return mIsBatteryCharging;

    }