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

Commit 2a7a5771 authored by Eugene Susla's avatar Eugene Susla
Browse files

Propagate callingPackage explicitly within CDM 

Activity.getCallingPackage seems to be returning null in come cases

Fixes: 170461416
Test: manual
Change-Id: I507b9434e792f79e7905f1983879a062d1a6fec7
parent 7e56edb8

core/java/android/companion/AssociationRequest.java

+22 −7
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ public final class AssociationRequest implements Parcelable { 




    private final boolean mSingleDevice;

    private final boolean mSingleDevice;

    private final List<DeviceFilter<?>> mDeviceFilters;

    private final List<DeviceFilter<?>> mDeviceFilters;

    private String mCallingPackage;





    private AssociationRequest(

    private AssociationRequest(

            boolean singleDevice, @Nullable List<DeviceFilter<?>> deviceFilters) {

            boolean singleDevice, @Nullable List<DeviceFilter<?>> deviceFilters) {
@@ -57,6 +58,7 @@ public final class AssociationRequest implements Parcelable { 
        this(

        this(

            in.readByte() != 0,

            in.readByte() != 0,

            in.readParcelableList(new ArrayList<>(), AssociationRequest.class.getClassLoader()));

            in.readParcelableList(new ArrayList<>(), AssociationRequest.class.getClassLoader()));

        setCallingPackage(in.readString());

    }

    }





    /** @hide */

    /** @hide */
@@ -72,32 +74,45 @@ public final class AssociationRequest implements Parcelable { 
        return mDeviceFilters;

        return mDeviceFilters;

    }

    }





    /** @hide */

    public String getCallingPackage() {

        return mCallingPackage;

    }



    /** @hide */

    public void setCallingPackage(String pkg) {

        mCallingPackage = pkg;

    }



    @Override

    @Override

    public boolean equals(@Nullable Object o) {

    public boolean equals(@Nullable Object o) {

        if (this == o) return true;

        if (this == o) return true;

        if (o == null || getClass() != o.getClass()) return false;

        if (o == null || getClass() != o.getClass()) return false;

        AssociationRequest that = (AssociationRequest) o;

        AssociationRequest that = (AssociationRequest) o;

        return mSingleDevice == that.mSingleDevice &&

        return mSingleDevice == that.mSingleDevice

                Objects.equals(mDeviceFilters, that.mDeviceFilters);

                && Objects.equals(mDeviceFilters, that.mDeviceFilters)

                && Objects.equals(mCallingPackage, that.mCallingPackage);

    }

    }





    @Override

    @Override

    public int hashCode() {

    public int hashCode() {

        return Objects.hash(mSingleDevice, mDeviceFilters);

        return Objects.hash(mSingleDevice, mDeviceFilters, mCallingPackage);

    }

    }





    @Override

    @Override

    public String toString() {

    public String toString() {

        return "AssociationRequest{" +

        return "AssociationRequest{"

                "mSingleDevice=" + mSingleDevice +

                + "mSingleDevice=" + mSingleDevice

                ", mDeviceFilters=" + mDeviceFilters +

                + ", mDeviceFilters=" + mDeviceFilters

                '}';

                + ", mCallingPackage=" + mCallingPackage

                + '}';

    }

    }





    @Override

    @Override

    public void writeToParcel(Parcel dest, int flags) {

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeByte((byte) (mSingleDevice ? 1 : 0));

        dest.writeByte((byte) (mSingleDevice ? 1 : 0));

        dest.writeParcelableList(mDeviceFilters, flags);

        dest.writeParcelableList(mDeviceFilters, flags);

        dest.writeString(mCallingPackage);

    }

    }





    @Override

    @Override

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.companiondevicemanager; 




import static android.companion.BluetoothDeviceFilterUtils.getDeviceMacAddress;

import static android.companion.BluetoothDeviceFilterUtils.getDeviceMacAddress;





import static java.util.Objects.requireNonNull;



import android.app.Activity;

import android.app.Activity;

import android.companion.CompanionDeviceManager;

import android.companion.CompanionDeviceManager;

import android.content.Intent;

import android.content.Intent;
@@ -125,6 +127,11 @@ public class DeviceChooserActivity extends Activity { 
        }

        }

    }

    }





    @Override

    public String getCallingPackage() {

        return requireNonNull(getService().mRequest.getCallingPackage());

    }



    @Override

    @Override

    public void setTitle(CharSequence title) {

    public void setTitle(CharSequence title) {

        final TextView titleView = findViewById(R.id.title);

        final TextView titleView = findViewById(R.id.title);

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -309,6 +309,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
            mFindDeviceCallback = callback;

            mFindDeviceCallback = callback;

            mRequest = request;

            mRequest = request;

            mCallingPackage = callingPackage;

            mCallingPackage = callingPackage;

            request.setCallingPackage(callingPackage);

            callback.asBinder().linkToDeath(CompanionDeviceManagerService.this /* recipient */, 0);

            callback.asBinder().linkToDeath(CompanionDeviceManagerService.this /* recipient */, 0);





            final long callingIdentity = Binder.clearCallingIdentity();

            final long callingIdentity = Binder.clearCallingIdentity();