commit e332db328e0b86ee72e86b319f5d35230fd40ea9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:14:04 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:14:04 2022 +0000
tree 4f1009e8f1e9afc27af5d94065bd4829fead132c
parent e670d1ea7822b9b38ac91bdb0d811411d754234e
parent 7a321c53da653c64808f012dd163535d8096012d

Snap for 8564071 from 7a321c53da653c64808f012dd163535d8096012d to mainline-adbd-release

Change-Id: I40f47db48552abe29cbda8d68c2b00e593d6704b

libril/ril_service.cpp

diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index 8009d47..1d64bb0 100755
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -2821,7 +2821,7 @@
     imsiEncryption.expirationTime = data.expirationTime;
     CALL_ONREQUEST(pRI->pCI->requestNumber, &imsiEncryption,
             sizeof(RIL_CarrierInfoForImsiEncryption), pRI, mSlotId);
-    delete(imsiEncryption.carrierKey);
+    delete[](imsiEncryption.carrierKey);
     return Void();
 }
 

librilutils/Android.bp

diff --git a/librilutils/Android.bp b/librilutils/Android.bp
index da50a87..00df7ce 100644
--- a/librilutils/Android.bp
+++ b/librilutils/Android.bp
@@ -43,4 +43,10 @@
     proto: {
         type: "micro",
     },
+    min_sdk_version: "30",
+    sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.bluetooth",
+    ],
 }