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

Commit 28a9a1a6 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b am:... 

Merge "Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b am: 2fb02a25 am: 526719a1" into oc-dev-plus-aosp
parents 97cb726b c4434b34

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/bluetooth/IBluetoothGatt.aidl \

	core/java/android/bluetooth/IBluetoothGattCallback.aidl \

	core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \

	core/java/android/bluetooth/le/IAdvertiserCallback.aidl \

	core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl \

	core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl \

	core/java/android/bluetooth/le/IScannerCallback.aidl \

core/java/android/bluetooth/IBluetoothGatt.aidl

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.os.WorkSource; 


import android.bluetooth.IBluetoothGattCallback;

import android.bluetooth.IBluetoothGattServerCallback;

import android.bluetooth.le.IAdvertiserCallback;

import android.bluetooth.le.IAdvertisingSetCallback;

import android.bluetooth.le.IPeriodicAdvertisingCallback;

import android.bluetooth.le.IScannerCallback;

core/java/android/bluetooth/le/BluetoothLeAdvertiser.java

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.bluetooth.BluetoothGatt; 
import android.bluetooth.BluetoothUuid;

import android.bluetooth.IBluetoothGatt;

import android.bluetooth.IBluetoothManager;

import android.bluetooth.le.IAdvertiserCallback;

import android.os.Handler;

import android.os.Looper;

import android.os.ParcelUuid;

core/java/android/bluetooth/le/IAdvertiserCallback.aidl

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.bluetooth.le;



import android.bluetooth.le.AdvertiseSettings;



/**

 * Callback definitions for interacting with Advertiser

 * @hide

 */

oneway interface IAdvertiserCallback {

    void onAdvertiserRegistered(in int status, in int advertiserId);



    void onMultiAdvertiseCallback(in int status, boolean isStart,

                                  in AdvertiseSettings advertiseSettings);

}