commit 027650fb9f4a54a1848f062e9944cd845651208d
author Priyanka Advani <padvani@google.com> Thu Dec 28 00:07:56 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 28 00:08:01 2023 +0000
tree c8e90c6cccedb66906511f8a8db637a057ea25e3
parent 85a8ae132ee2d4da024a69a7c1bcfa8e33e5357f

Revert "Guard new APIs with __builtin_available"

Revert submission 25624362-persistable-bundle-hack

Reason for revert: Likely culprit for b/317912559

Reverted changes: /q/submissionid:25624362-persistable-bundle-hack

Change-Id: Ifa4d8c849b4f1a7a8ade6592c073dc6c81d0a85c

libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h

diff --git a/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h b/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h
index 8d2944a..f178027 100644
--- a/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h
+++ b/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h
@@ -31,11 +31,7 @@
  */
 class PersistableBundle {
    public:
-    PersistableBundle() noexcept {
-        if (__builtin_available(android __ANDROID_API_V__, *)) {
-            mPBundle = APersistableBundle_new();
-        }
-    }
+    PersistableBundle() noexcept : mPBundle(APersistableBundle_new()) {}
     // takes ownership of the APersistableBundle*
     PersistableBundle(APersistableBundle* _Nonnull bundle) noexcept : mPBundle(bundle) {}
     // takes ownership of the APersistableBundle*
@@ -331,32 +327,20 @@
     }
 
     bool getBooleanVector(const std::string& key, std::vector<bool>* _Nonnull vec) {
-        if (__builtin_available(android __ANDROID_API_V__, *)) {
-            return getVecInternal<bool>(&APersistableBundle_getBooleanVector, mPBundle, key.c_str(),
-                                        vec);
-        }
-        return false;
+        return getVecInternal<bool>(&APersistableBundle_getBooleanVector, mPBundle, key.c_str(),
+                                    vec);
     }
     bool getIntVector(const std::string& key, std::vector<int32_t>* _Nonnull vec) {
-        if (__builtin_available(android __ANDROID_API_V__, *)) {
-            return getVecInternal<int32_t>(&APersistableBundle_getIntVector, mPBundle, key.c_str(),
+        return getVecInternal<int32_t>(&APersistableBundle_getIntVector, mPBundle, key.c_str(),
                                        vec);
-        }
-        return false;
     }
     bool getLongVector(const std::string& key, std::vector<int64_t>* _Nonnull vec) {
-        if (__builtin_available(android __ANDROID_API_V__, *)) {
-            return getVecInternal<int64_t>(&APersistableBundle_getLongVector, mPBundle, key.c_str(),
+        return getVecInternal<int64_t>(&APersistableBundle_getLongVector, mPBundle, key.c_str(),
                                        vec);
-        }
-        return false;
     }
     bool getDoubleVector(const std::string& key, std::vector<double>* _Nonnull vec) {
-        if (__builtin_available(android __ANDROID_API_V__, *)) {
-            return getVecInternal<double>(&APersistableBundle_getDoubleVector, mPBundle, key.c_str(),
+        return getVecInternal<double>(&APersistableBundle_getDoubleVector, mPBundle, key.c_str(),
                                       vec);
-        }
-        return false;
     }
 
     // Takes ownership of and frees the char** and its elements.
@@ -377,17 +361,15 @@
     }
 
     bool getStringVector(const std::string& key, std::vector<std::string>* _Nonnull vec) {
-        if (__builtin_available(android __ANDROID_API_V__, *)) {
-            int32_t bytes = APersistableBundle_getStringVector(mPBundle, key.c_str(), nullptr, 0,
-                                                            &stringAllocator, nullptr);
-            if (bytes > 0) {
-                char** strings = (char**)malloc(bytes);
-                if (strings) {
-                    bytes = APersistableBundle_getStringVector(mPBundle, key.c_str(), strings, bytes,
-                                                            &stringAllocator, nullptr);
-                    *vec = moveStringsInternal<std::vector<std::string>>(strings, bytes);
-                    return true;
-                }
+        int32_t bytes = APersistableBundle_getStringVector(mPBundle, key.c_str(), nullptr, 0,
+                                                           &stringAllocator, nullptr);
+        if (bytes > 0) {
+            char** strings = (char**)malloc(bytes);
+            if (strings) {
+                bytes = APersistableBundle_getStringVector(mPBundle, key.c_str(), strings, bytes,
+                                                           &stringAllocator, nullptr);
+                *vec = moveStringsInternal<std::vector<std::string>>(strings, bytes);
+                return true;
             }
         }
         return false;