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

Commit 09381b12 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Jarjar to prevent conflict w system/framework.jar am: 66d0a562 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2510286



Change-Id: I4df9b122d49a732b64f06147f04a8f6c8babf169
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 138e835f 66d0a562

android/app/tests/unit/src/com/android/bluetooth/sap/SapRilReceiverHidlTest.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.eq; 
import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.verify;



import android.hardware.radio.V1_0.ISap;

import com.android.bluetooth.x.android.hardware.radio.V1_0.ISap;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Message;

framework/jarjar-rules.txt

+4 −0
Original line number Diff line number Diff line
@@ -5,3 +5,7 @@ rule com.android.modules.utils.** com.android.bluetooth.x.@0 
# Use our statically linked PlatformProperties library

rule android.sysprop.** com.android.bluetooth.x.@0



## used by /system/framework/framework.jar ##

rule android.hardware.radio.V1_0.** com.android.bluetooth.x.@0

rule com.google.android.mms.** com.android.bluetooth.x.@0

rule com.android.internal.util.** com.android.bluetooth.x.@0