commit 526f259478fcdc6461dd2517ef73ceca560ecd65
author Alexander Martinz <amartinz@shiftphones.com> Fri Aug 16 09:56:42 2024 +0200
committer Alexander Martinz <amartinz@shiftphones.com> Fri Aug 16 09:59:11 2024 +0200
tree d3d222a4599b0d3b63342529d98aa9adc8e307af
parent 8faa68bca758a7a3a8147744a8ff9d01d2f4d70f

Revert "bluetooth: abandon app local certificate"

-----

Revert "fixup! bluetooth: abandon app local certificate"

This reverts commit 8faa68bca758a7a3a8147744a8ff9d01d2f4d70f.

Revert "fixup! bluetooth: abandon app local certificate"

This reverts commit 4ced7fa2e1b9dbcbb6a8ad71cc507611ba08f428.

Revert "fixup! bluetooth: abandon app local certificate"

This reverts commit 5d2632ad83e4566064f3d3fbd6af5b60fa00b71c.

Change-Id: I830ced10f2a954a3fb46737957fa18f24704b0e5

Revert "bluetooth: abandon app local certificate"

This reverts commit 00cecba4b5d276c555cd26dfc5394a9fbfd33b6e.

Change-Id: I78565c429760fa0d1d234c82a2a8e033ae3e1928

-----

Change-Id: Ide9328420d53dfb63eea39432d247d679360ed9d
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 87eedb2..2527a73 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -23,7 +23,7 @@
     systemserverclasspath_fragments: ["com.android.btservices-systemserverclasspath-fragment"],
     compat_configs: ["bluetooth-compat-config"],
     key: "com.android.btservices.key",
-    certificate: "bluetooth",
+    certificate: ":com.android.btservices.certificate",
     updatable: false,
     compressible: false,
 }
@@ -58,7 +58,7 @@
         "privapp_allowlist_com.android.bluetooth.xml",
     ],
     key: "com.android.btservices.key",
-    certificate: "bluetooth",
+    certificate: ":com.android.btservices.certificate",
     updatable: false,
     compressible: false,
 }
@@ -69,6 +69,11 @@
     private_key: "com.android.btservices.pem",
 }
 
+android_app_certificate {
+    name: "com.android.btservices.certificate",
+    certificate: "com.android.btservices",
+}
+
 sdk {
     name: "btservices-module-sdk",
     bootclasspath_fragments: ["com.android.btservices-bootclasspath-fragment"],