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

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

Merge "resolve merge conflicts of 15658662 to stage-aosp-master am:... 

Merge "resolve merge conflicts of 15658662 to stage-aosp-master am: 3b38eaa3 am: 208a84ec" into oc-dr1-dev-plus-aosp
parents 6795c947 fa983ab2

Android.mk

+38 −37
Original line number Diff line number Diff line
@@ -119,35 +119,35 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/usage/ICacheQuotaService.aidl \

	core/java/android/app/usage/IStorageStatsManager.aidl \

	core/java/android/app/usage/IUsageStatsManager.aidl \

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	../../system/bt/binder/android/bluetooth/IBluetooth.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothA2dp.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothA2dpSink.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothAvrcpController.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothCallback.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothProfileServiceConnection.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothHeadset.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothHealth.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothHealthCallback.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothInputDevice.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothPan.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothManager.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothManagerCallback.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothMap.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothMapClient.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothPbap.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothPbapClient.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothSap.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothStateChangeCallback.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothHeadsetClient.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothInputHost.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothHidDeviceCallback.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothGatt.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothGattCallback.aidl \

	../../system/bt/binder/android/bluetooth/IBluetoothGattServerCallback.aidl \

	../../system/bt/binder/android/bluetooth/le/IAdvertisingSetCallback.aidl \

	../../system/bt/binder/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl \

	../../system/bt/binder/android/bluetooth/le/IScannerCallback.aidl \

	core/java/android/content/IClipboard.aidl \

	core/java/android/content/IContentService.aidl \

	core/java/android/content/IIntentReceiver.aidl \
@@ -589,7 +589,8 @@ LOCAL_AIDL_INCLUDES += \ 
	frameworks/av/camera/aidl \

	frameworks/av/drm/libmediadrm/aidl \

	frameworks/native/aidl/gui \

	system/netd/server/binder

	system/netd/server/binder \

	system/bt/binder



LOCAL_INTERMEDIATE_SOURCES := \

			$(framework_res_source_path)/android/R.java \
@@ -866,16 +867,16 @@ aidl_files := \ 
	frameworks/base/core/java/android/nfc/Tag.aidl \

	frameworks/base/core/java/android/nfc/NdefRecord.aidl \

	frameworks/base/core/java/android/nfc/NdefMessage.aidl \

	frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \

	frameworks/base/core/java/android/bluetooth/le/AdvertiseSettings.aidl \

	frameworks/base/core/java/android/bluetooth/le/ScanSettings.aidl \

	frameworks/base/core/java/android/bluetooth/le/AdvertiseData.aidl \

	frameworks/base/core/java/android/bluetooth/le/ScanFilter.aidl \

	frameworks/base/core/java/android/bluetooth/le/ScanResult.aidl \

	frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \

	frameworks/base/core/java/android/database/CursorWindow.aidl \

	frameworks/base/core/java/android/service/quicksettings/Tile.aidl \

	frameworks/native/aidl/binder/android/os/PersistableBundle.aidl \

	system/bt/binder/android/bluetooth/BluetoothHealthAppConfiguration.aidl \

	system/bt/binder/android/bluetooth/le/AdvertiseSettings.aidl \

	system/bt/binder/android/bluetooth/le/ScanSettings.aidl \

	system/bt/binder/android/bluetooth/le/AdvertiseData.aidl \

	system/bt/binder/android/bluetooth/le/ScanFilter.aidl \

	system/bt/binder/android/bluetooth/le/ScanResult.aidl \

	system/bt/binder/android/bluetooth/BluetoothDevice.aidl \

	system/netd/server/binder/android/net/UidRange.aidl \

	frameworks/base/telephony/java/android/telephony/PcoData.aidl \

core/java/android/bluetooth/BluetoothActivityEnergyInfo.aidl

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

 * Copyright (C) 2014 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;



parcelable BluetoothActivityEnergyInfo;

core/java/android/bluetooth/BluetoothAudioConfig.aidl

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

 * Copyright (C) 2009 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;



parcelable BluetoothAudioConfig;

core/java/android/bluetooth/BluetoothAvrcpPlayerSettings.aidl

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

 * Copyright (C) 2015 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;



parcelable BluetoothAvrcpPlayerSettings;

core/java/android/bluetooth/BluetoothCodecConfig.aidl

deleted100644 → 0
+0 −19
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;



parcelable BluetoothCodecConfig;