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

Commit 459791a3 authored by Guojing Yuan's avatar Guojing Yuan
Browse files

[CDM] Fix BAL hardening issues 

Fix: 317347566

Test: CTS
Change-Id: I363ae18a65cede0f1bfefd5eea0aa3fa36251543
parent 3bef74d0

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

+6 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.UserIdInt;

import android.app.ActivityOptions;

import android.app.PendingIntent;

import android.companion.AssociatedDevice;

import android.companion.AssociationInfo;
@@ -398,7 +399,11 @@ class AssociationRequestsProcessor { 
            pendingIntent = PendingIntent.getActivityAsUser(

                    mContext, /*requestCode */ packageUid, intent,

                    FLAG_ONE_SHOT | FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE,

                    /* options= */ null, UserHandle.CURRENT);

                    ActivityOptions.makeBasic()

                            .setPendingIntentCreatorBackgroundActivityStartMode(

                                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)

                            .toBundle(),

                    UserHandle.CURRENT);

        } finally {

            Binder.restoreCallingIdentity(token);

        }

services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java

+6 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static com.android.server.companion.Utils.prepareForIpc; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.app.ActivityOptions;

import android.app.PendingIntent;

import android.companion.AssociationInfo;

import android.companion.DeviceNotAssociatedException;
@@ -186,7 +187,11 @@ public class SystemDataTransferProcessor { 
        final long token = Binder.clearCallingIdentity();

        try {

            return PendingIntent.getActivityAsUser(mContext, /*requestCode */ associationId, intent,

                    FLAG_ONE_SHOT | FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE, /* options= */ null,

                    FLAG_ONE_SHOT | FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE,

                    ActivityOptions.makeBasic()

                            .setPendingIntentCreatorBackgroundActivityStartMode(

                                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)

                            .toBundle(),

                    UserHandle.CURRENT);

        } finally {

            Binder.restoreCallingIdentity(token);