commit 8dabe2ef8869d11185b187639e00894f43cba987
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:48:17 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:48:17 2022 +0000
tree 56d559459897140672b01ece5e2b2384267e9065
parent 67de62d3a3b7d0cbb159bd273b6c07bce2026dba
parent 4c30b7013210d1dcd48d648aaa633328cb2e5777

Snap for 8730993 from 4c30b7013210d1dcd48d648aaa633328cb2e5777 to mainline-tzdata3-release

Change-Id: Idfe47d7e8a1c7a508fc3be93c3e9644ad70203dc

libril/ril_service.cpp

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();
 }
 

librilutils/Android.bp

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",
-    ],
 }