Snap for 8730993 from 4c30b7013210d1dcd48d648aaa633328cb2e5777 to mainline-tzdata3-release
Change-Id: Idfe47d7e8a1c7a508fc3be93c3e9644ad70203dc
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index 1d64bb0..8009d47 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();
}
diff --git a/librilutils/Android.bp b/librilutils/Android.bp
index 00df7ce..da50a87 100644
--- a/librilutils/Android.bp
+++ b/librilutils/Android.bp
@@ -43,10 +43,4 @@
proto: {
type: "micro",
},
- min_sdk_version: "30",
- sdk_version: "current",
- apex_available: [
- "//apex_available:platform",
- "com.android.bluetooth",
- ],
}