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

Commit 027650fb authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

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
parent 85a8ae13

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

+15 −33
Original line number Diff line number Diff line
@@ -31,11 +31,7 @@ namespace aidl::android::os { 
 */

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,33 +327,21 @@ class PersistableBundle { 
    }



    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;

    }

    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(),

                                       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(),

                                       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(),

                                      vec);

    }

        return false;

    }



    // Takes ownership of and frees the char** and its elements.

    // Creates a new set or vector based on the array of char*.
@@ -377,7 +361,6 @@ class PersistableBundle { 
    }



    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) {
@@ -389,7 +372,6 @@ class PersistableBundle { 
                return true;

            }

        }

        }

        return false;

    }