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

Commit 06f673e5 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypick-final-32-khu88k0v6u" 

* changes:
  Update @RequiresApi declarations for T to be 33.
  Update AAPT for S V2.
parents e2ecc3c2 bd5bf210

packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipSetCoordinatorProfile.java

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class CsipSetCoordinatorProfile implements LocalBluetoothProfile { 


    // These callbacks run on the main thread.

    private final class CoordinatedSetServiceListener implements BluetoothProfile.ServiceListener {

        @RequiresApi(32)

        @RequiresApi(33)

        public void onServiceConnected(int profile, BluetoothProfile proxy) {

            if (VDBG) {

                Log.d(TAG, "Bluetooth service connected");
@@ -233,7 +233,7 @@ public class CsipSetCoordinatorProfile implements LocalBluetoothProfile { 
        return NAME;

    }



    @RequiresApi(32)

    @RequiresApi(33)

    protected void finalize() {

        if (VDBG) {

            Log.d(TAG, "finalize()");

tools/aapt/SdkConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ enum { 
    SDK_Q = 29,

    SDK_R = 30,

    SDK_S = 31,

    SDK_S_V2 = 32,

    SDK_CUR_DEVELOPMENT = 10000,

};

tools/aapt2/SdkConstants.cpp

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { 
    {0x0606, SDK_Q},

    {0x0616, SDK_R},

    {0x064b, SDK_S},

    {0x064c, SDK_S_V2},

};



static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) {

tools/aapt2/SdkConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ enum : ApiVersion { 
  SDK_Q = 29,

  SDK_R = 30,

  SDK_S = 31,

  SDK_S_V2 = 32,

  SDK_CUR_DEVELOPMENT = 10000,

};