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

Commit f0cda31e authored by Arthur Ishiguro's avatar Arthur Ishiguro Committed by Android (Google) Code Review
Browse files

Merge "Mark location classes as Parcelable appropriately"

parents c6245e58 f3ab9cdc

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ package android.hardware.location { 
    method public abstract void onMessageReceipt(int, int, android.hardware.location.ContextHubMessage);

  }



  public deprecated class ContextHubMessage {

  public deprecated class ContextHubMessage implements android.os.Parcelable {

    ctor public ContextHubMessage(int, int, byte[]);

    method public int describeContents();

    method public byte[] getData();
@@ -1723,7 +1723,7 @@ package android.hardware.location { 
    field public static final android.os.Parcelable.Creator<android.hardware.location.MemoryRegion> CREATOR;

  }



  public deprecated class NanoApp {

  public deprecated class NanoApp implements android.os.Parcelable {

    ctor public NanoApp();

    ctor public deprecated NanoApp(int, byte[]);

    ctor public NanoApp(long, byte[]);
@@ -1771,7 +1771,7 @@ package android.hardware.location { 
    field public static final android.os.Parcelable.Creator<android.hardware.location.NanoAppBinary> CREATOR;

  }



  public deprecated class NanoAppFilter {

  public deprecated class NanoAppFilter implements android.os.Parcelable {

    ctor public NanoAppFilter(long, int, int, long);

    method public int describeContents();

    method public boolean testMatch(android.hardware.location.NanoAppInstanceInfo);
@@ -1786,7 +1786,7 @@ package android.hardware.location { 
    field public static final int VENDOR_ANY = -1; // 0xffffffff

  }



  public deprecated class NanoAppInstanceInfo {

  public deprecated class NanoAppInstanceInfo implements android.os.Parcelable {

    ctor public NanoAppInstanceInfo();

    method public int describeContents();

    method public long getAppId();

core/java/android/hardware/location/ContextHubMessage.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import java.util.Arrays; 
 */

@SystemApi

@Deprecated

public class ContextHubMessage {

public class ContextHubMessage implements Parcelable {

    private static final int DEBUG_LOG_NUM_BYTES = 16;

    private int mType;

    private int mVersion;

core/java/android/hardware/location/NanoApp.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import android.util.Log; 
 */

@SystemApi

@Deprecated

public class NanoApp {

public class NanoApp implements Parcelable {

    private final String TAG = "NanoApp";



    private final String UNKNOWN = "Unknown";

core/java/android/hardware/location/NanoAppFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.os.Parcelable; 
 */

@SystemApi

@Deprecated

public class NanoAppFilter {

public class NanoAppFilter implements Parcelable {



    private static final String TAG = "NanoAppFilter";

core/java/android/hardware/location/NanoAppInstanceInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import libcore.util.EmptyArray; 
 */

@SystemApi

@Deprecated

public class NanoAppInstanceInfo {

public class NanoAppInstanceInfo implements Parcelable {

    private String mPublisher = "Unknown";

    private String mName = "Unknown";