commit 392833b0d2571a2f38c6bc2a368ef2bdd9462721
author Jorge E. Moreira <jemoreira@google.com> Tue Dec 03 16:53:29 2019 -0800
committer Jorge E. Moreira <jemoreira@google.com> Mon Jan 06 14:05:22 2020 -0800
tree 7ae0c31abf47812a1f13f40f8e4f04c3a2ee4786
parent 19bfe078787c76a79f99467b791e5fe3a655bcba

Use std::shared_ptr instead of android::sp

Bug: 141887532
Test: locally
Change-Id: I61dbe978b69dfdc83967a79cc76fae5a373ee638

host/frontend/gcastv2/libandroid/JSONObject.cpp

diff --git a/host/frontend/gcastv2/libandroid/JSONObject.cpp b/host/frontend/gcastv2/libandroid/JSONObject.cpp
index db658ed..0ece325 100644
--- a/host/frontend/gcastv2/libandroid/JSONObject.cpp
+++ b/host/frontend/gcastv2/libandroid/JSONObject.cpp
@@ -26,6 +26,9 @@
 #include <media/stagefright/MediaErrors.h>
 
 namespace android {
+namespace {
+    const char kIndent[] = "                                        ";
+}
 
 // static
 ssize_t JSONValue::Parse(const char *data, size_t size, JSONValue *out) {
@@ -39,7 +42,7 @@
     }
 
     if (data[offset] == '[') {
-        sp<JSONArray> array = new JSONArray;
+        std::shared_ptr<JSONArray> array(new JSONArray);
         ++offset;
 
         for (;;) {
@@ -86,7 +89,7 @@
 
         return offset;
     } else if (data[offset] == '{') {
-        sp<JSONObject> obj = new JSONObject;
+        std::shared_ptr<JSONObject> obj(new JSONObject);
         ++offset;
 
         for (;;) {
@@ -330,6 +333,7 @@
         unset();
         mType = other.mType;
         mValue = other.mValue;
+        mObjectOrArray = other.mObjectOrArray;
 
         switch (mType) {
             case TYPE_STRING:
@@ -337,9 +341,6 @@
                 break;
             case TYPE_OBJECT:
             case TYPE_ARRAY:
-                mValue.mObjectOrArray->incStrong(this);
-                break;
-
             default:
                 break;
         }
@@ -383,21 +384,21 @@
     return true;
 }
 
-bool JSONValue::getObject(sp<JSONObject> *value) const {
+bool JSONValue::getObject(std::shared_ptr<JSONObject> *value) const {
     if (mType != TYPE_OBJECT) {
         return false;
     }
 
-    *value = static_cast<JSONObject *>(mValue.mObjectOrArray);
+    *value = std::static_pointer_cast<JSONObject>(mObjectOrArray);
     return true;
 }
 
-bool JSONValue::getArray(sp<JSONArray> *value) const {
+bool JSONValue::getArray(std::shared_ptr<JSONArray> *value) const {
     if (mType != TYPE_ARRAY) {
         return false;
     }
 
-    *value = static_cast<JSONArray *>(mValue.mObjectOrArray);
+    *value = std::static_pointer_cast<JSONArray>(mObjectOrArray);
     return true;
 }
 
@@ -422,20 +423,18 @@
     mType = TYPE_BOOLEAN;
 }
 
-void JSONValue::setObject(const sp<JSONObject> &obj) {
+void JSONValue::setObject(std::shared_ptr<JSONObject> obj) {
     unset();
 
-    mValue.mObjectOrArray = obj.get();
-    mValue.mObjectOrArray->incStrong(this);
+    mObjectOrArray = obj;
 
     mType = TYPE_OBJECT;
 }
 
-void JSONValue::setArray(const sp<JSONArray> &array) {
+void JSONValue::setArray(std::shared_ptr<JSONArray> array) {
     unset();
 
-    mValue.mObjectOrArray = array.get();
-    mValue.mObjectOrArray->incStrong(this);
+    mObjectOrArray = array;
 
     mType = TYPE_ARRAY;
 }
@@ -447,7 +446,7 @@
             break;
         case TYPE_OBJECT:
         case TYPE_ARRAY:
-            mValue.mObjectOrArray->decStrong(this);
+            mObjectOrArray.reset();
             break;
 
         default:
@@ -496,7 +495,6 @@
 }
 
 std::string JSONValue::toString(size_t depth, bool indentFirstLine) const {
-    static const char kIndent[] = "                                        ";
 
     std::string out;
 
@@ -535,7 +533,7 @@
         case TYPE_ARRAY:
         {
             out = (mType == TYPE_OBJECT) ? "{\n" : "[\n";
-            out.append(mValue.mObjectOrArray->internalToString(depth + 1, true));
+            out.append(mObjectOrArray->internalToString(depth + 1, true));
             out.append("\n");
             out.append(kIndent, 2 * depth);
             out.append(mType == TYPE_OBJECT ? "}" : "]");
@@ -556,7 +554,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // static
-sp<JSONCompound> JSONCompound::Parse(const char *data, size_t size) {
+std::shared_ptr<JSONCompound> JSONCompound::Parse(const char *data, size_t size) {
     JSONValue value;
     ssize_t result = JSONValue::Parse(data, size, &value);
 
@@ -564,12 +562,12 @@
         return NULL;
     }
 
-    sp<JSONObject> obj;
+    std::shared_ptr<JSONObject> obj;
     if (value.getObject(&obj)) {
         return obj;
     }
 
-    sp<JSONArray> array;
+    std::shared_ptr<JSONArray> array;
     if (value.getArray(&array)) {
         return array;
     }
@@ -578,14 +576,19 @@
 }
 
 std::string JSONCompound::toString(size_t depth, bool indentFirstLine) const {
-    JSONValue val;
-    if (isObject()) {
-        val.setObject((JSONObject *)this);
-    } else {
-        val.setArray((JSONArray *)this);
-    }
+    std::string out;
 
-    return val.toString(depth, indentFirstLine);
+    if (indentFirstLine) {
+        out.insert(0, kIndent, 2 * depth);
+    }
+    
+    out = isObject() ? "{\n" : "[\n";
+    out.append(internalToString(depth + 1, true));
+    out.append("\n");
+    out.append(kIndent, 2 * depth);
+    out.append(isObject() ? "}" : "]");
+
+    return out;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -619,8 +622,6 @@
 
 std::string JSONObject::internalToString(
         size_t depth, bool /* indentFirstLine */) const {
-    static const char kIndent[] = "                                        ";
-
     std::string out;
     for (auto it = mValues.begin(); it != mValues.end();) {
         const std::string &key = it->first;