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

Commit abee94db authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Remove hardcoded references to "com.android.bluetooth.services" am: 32a8940a am: 7c03c34a 

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



Change-Id: I2d2058904e885ff98d1b139be2534e5f4df786d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcfcb97a 7c03c34a

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+0 −4
Original line number Diff line number Diff line
@@ -210,10 +210,6 @@ public class AdapterService extends Service { 


    private static final int CONTROLLER_ENERGY_UPDATE_TIMEOUT_MILLIS = 30;



    private static final ComponentName BLUETOOTH_INCALLSERVICE_COMPONENT =

            new ComponentName("com.android.bluetooth.services",

                    BluetoothInCallService.class.getCanonicalName());



    public static final String ACTIVITY_ATTRIBUTION_NO_ACTIVE_DEVICE_ADDRESS =

            "no_active_device_address";

android/app/src/com/android/bluetooth/btservice/MetricsLogger.java

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ public class MetricsLogger { 


    private PendingIntent getDrainIntent() {

        Intent counterMetricsIntent = new Intent(BLUETOOTH_COUNTER_METRICS_ACTION);

        counterMetricsIntent.setPackage("com.android.bluetooth.services");

        counterMetricsIntent.setPackage(mContext.getPackageName());

        return PendingIntent.getBroadcast(

                mContext, 0, counterMetricsIntent, PendingIntent.FLAG_IMMUTABLE);

    }

android/app/src/com/android/bluetooth/btservice/ProfileService.java

+1 −3
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ public abstract class ProfileService extends Service { 
    public static final String BLUETOOTH_PRIVILEGED =

            android.Manifest.permission.BLUETOOTH_PRIVILEGED;



    static final String BLUETOOTH_PACKAGE_NAME = "com.android.bluetooth.services";



    public interface IProfileServiceBinder extends IBinder {

        /**

         * Called in {@link #onDestroy()}
@@ -232,7 +230,7 @@ public abstract class ProfileService extends Service { 
        if (className == null) {

            return;

        }

        ComponentName component = new ComponentName(BLUETOOTH_PACKAGE_NAME, className);

        ComponentName component = new ComponentName(getPackageName(), className);

        setComponentAvailable(component, enable);

    }

android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java

+1 −2
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
            }



            // Only the bluetooth app is allowed to create generic media control service

            boolean isGenericMcs = appToken.equals(THIS_PACKAGE_NAME);

            boolean isGenericMcs = appToken.equals(mContext.getPackageName());



            MediaControlGattService svc = new MediaControlGattService(mMcpService, this, ccid);

            svc.init(isGenericMcs ? BluetoothUuid.GENERIC_MEDIA_CONTROL.getUuid()
@@ -751,7 +751,6 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 




    private final Map<String, MediaControlGattServiceInterface> mServiceMap;

    static final String THIS_PACKAGE_NAME = "com.android.bluetooth.services";



    public void unregisterServiceInstance(String appToken) {

        Log.d(TAG, "unregisterServiceInstance");

android/app/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ public class BluetoothOppLauncherActivity extends Activity { 
            }



            Intent intent1 = new Intent(Constants.ACTION_OPEN);

            intent1.setClassName(Constants.THIS_PACKAGE_NAME, BluetoothOppReceiver.class.getName());

            intent1.setClassName(this, BluetoothOppReceiver.class.getName());

            intent1.setDataAndNormalize(uri);

            this.sendBroadcast(intent1);

            finish();
@@ -229,7 +229,7 @@ public class BluetoothOppLauncherActivity extends Activity { 
            in1.putExtra(BluetoothDevicePicker.EXTRA_NEED_AUTH, false);

            in1.putExtra(BluetoothDevicePicker.EXTRA_FILTER_TYPE,

                    BluetoothDevicePicker.FILTER_TYPE_TRANSFER);

            in1.putExtra(BluetoothDevicePicker.EXTRA_LAUNCH_PACKAGE, Constants.THIS_PACKAGE_NAME);

            in1.putExtra(BluetoothDevicePicker.EXTRA_LAUNCH_PACKAGE, getPackageName());

            in1.putExtra(BluetoothDevicePicker.EXTRA_LAUNCH_CLASS,

                    BluetoothOppReceiver.class.getName());

            if (V) {