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

Commit b4950bde authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Copy attributable to Bluetooth"

parents 3f735706 63432668

core/java/android/bluetooth/Attributable.java

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

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



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.AttributionSource;



import java.util.List;



/**

 * Marker interface for a class which can have an {@link AttributionSource}

 * assigned to it; these are typically {@link android.os.Parcelable} classes

 * which need to be updated after crossing Binder transaction boundaries.

 *

 * @hide

 */

public interface Attributable {

    void setAttributionSource(@NonNull AttributionSource attributionSource);



    static @Nullable <T extends Attributable> T setAttributionSource(

            @Nullable T attributable,

            @NonNull AttributionSource attributionSource) {

        if (attributable != null) {

            attributable.setAttributionSource(attributionSource);

        }

        return attributable;

    }



    static @Nullable <T extends Attributable> List<T> setAttributionSource(

            @Nullable List<T> attributableList,

            @NonNull AttributionSource attributionSource) {

        if (attributableList != null) {

            final int size = attributableList.size();

            for (int i = 0; i < size; i++) {

                setAttributionSource(attributableList.get(i), attributionSource);

            }

        }

        return attributableList;

    }

}

core/java/android/bluetooth/BluetoothA2dp.java

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.bluetooth;



import android.Manifest;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -29,7 +28,6 @@ import android.bluetooth.annotations.RequiresBluetoothConnectPermission; 
import android.bluetooth.annotations.RequiresLegacyBluetoothAdminPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Attributable;

import android.content.AttributionSource;

import android.content.Context;

import android.os.Binder;

core/java/android/bluetooth/BluetoothA2dpSink.java

+1 −2
Original line number Diff line number Diff line
@@ -20,14 +20,13 @@ import android.Manifest; 
import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SdkConstant.SdkConstantType;

import android.bluetooth.annotations.RequiresBluetoothConnectPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothAdminPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Attributable;

import android.content.AttributionSource;

import android.content.Context;

import android.os.Binder;

core/java/android/bluetooth/BluetoothAdapter.java

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import android.bluetooth.le.ScanRecord; 
import android.bluetooth.le.ScanResult;

import android.bluetooth.le.ScanSettings;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Attributable;

import android.content.AttributionSource;

import android.content.Context;

import android.os.Binder;

core/java/android/bluetooth/BluetoothAvrcpController.java

+0 −2
Original line number Diff line number Diff line
@@ -18,11 +18,9 @@ package android.bluetooth; 


import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SuppressLint;

import android.annotation.SdkConstant.SdkConstantType;

import android.bluetooth.annotations.RequiresBluetoothConnectPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;

import android.content.Attributable;

import android.content.AttributionSource;

import android.content.Context;

import android.os.Binder;