From f3ab9cdc413fd921ec4f386a4ae55f01ae5510f7 Mon Sep 17 00:00:00 2001
From: Arthur Ishiguro <arthuri@google.com>
Date: Wed, 28 Feb 2018 11:27:50 -0800
Subject: [PATCH] Mark location classes as Parcelable appropriately

Doesn't add the "final" qualifier,
since make will throw errors due to compatibility issues.

Bug: 69622177
Test: Run CHQTS from master and oc-mr1-dev, verify pass
Change-Id: If02203d7862e77ca4fda7b95a39bbfa3d9f6d87d
---
 api/system-current.txt                                       | 8 ++++----
 core/java/android/hardware/location/ContextHubMessage.java   | 2 +-
 core/java/android/hardware/location/NanoApp.java             | 2 +-
 core/java/android/hardware/location/NanoAppFilter.java       | 2 +-
 core/java/android/hardware/location/NanoAppInstanceInfo.java | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 930224dc2ce2..78ed570ddb98 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1582,7 +1582,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();
@@ -1713,7 +1713,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[]);
@@ -1761,7 +1761,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);
@@ -1776,7 +1776,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();
diff --git a/core/java/android/hardware/location/ContextHubMessage.java b/core/java/android/hardware/location/ContextHubMessage.java
index f85ce3eed82e..e1c69d717a8d 100644
--- a/core/java/android/hardware/location/ContextHubMessage.java
+++ b/core/java/android/hardware/location/ContextHubMessage.java
@@ -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;
diff --git a/core/java/android/hardware/location/NanoApp.java b/core/java/android/hardware/location/NanoApp.java
index b5c01ec214eb..ded1bb8c4c44 100644
--- a/core/java/android/hardware/location/NanoApp.java
+++ b/core/java/android/hardware/location/NanoApp.java
@@ -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";
diff --git a/core/java/android/hardware/location/NanoAppFilter.java b/core/java/android/hardware/location/NanoAppFilter.java
index 75a96ee8c802..4d8e7344cd75 100644
--- a/core/java/android/hardware/location/NanoAppFilter.java
+++ b/core/java/android/hardware/location/NanoAppFilter.java
@@ -28,7 +28,7 @@ import android.os.Parcelable;
  */
 @SystemApi
 @Deprecated
-public class NanoAppFilter {
+public class NanoAppFilter implements Parcelable {
 
     private static final String TAG = "NanoAppFilter";
 
diff --git a/core/java/android/hardware/location/NanoAppInstanceInfo.java b/core/java/android/hardware/location/NanoAppInstanceInfo.java
index f1926eaa2195..75fb915708de 100644
--- a/core/java/android/hardware/location/NanoAppInstanceInfo.java
+++ b/core/java/android/hardware/location/NanoAppInstanceInfo.java
@@ -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";
 
-- 
2.11.0