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

Commit 321044da authored by Guojing Yuan's avatar Guojing Yuan
Browse files

[CDM] Update binding flag for self-managed apps 

From BIND_IMPORTANT to BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE

Fix: 230897753

Test: m & cts tests
Change-Id: Ic25f5a438d6679ab08f725832cee3cce74ac611c
parent 374ea642

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

+3 −3
Original line number Diff line number Diff line
@@ -107,10 +107,10 @@ public class CompanionApplicationController { 
     * CDM binds to the companion app.

     */

    public void bindCompanionApplication(@UserIdInt int userId, @NonNull String packageName,

            boolean bindImportant) {

            boolean isSelfManaged) {

        if (DEBUG) {

            Log.i(TAG, "bind() u" + userId + "/" + packageName

                    + " important=" + bindImportant);

                    + " isSelfManaged=" + isSelfManaged);

        }



        final List<ComponentName> companionServices =
@@ -133,7 +133,7 @@ public class CompanionApplicationController { 


            serviceConnectors = CollectionUtils.map(companionServices, componentName ->

                            CompanionDeviceServiceConnector.newInstance(mContext, userId,

                                    componentName, bindImportant));

                                    componentName, isSelfManaged));

            mBoundCompanionApplications.setValueForPackage(userId, packageName, serviceConnectors);

        }

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

+8 −7
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.companion;



import static android.content.Context.BIND_ALMOST_PERCEPTIBLE;

import static android.content.Context.BIND_IMPORTANT;

import static android.content.Context.BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE;

import static android.os.Process.THREAD_PRIORITY_DEFAULT;



import android.annotation.NonNull;
@@ -61,21 +61,22 @@ class CompanionDeviceServiceConnector extends ServiceConnector.Impl<ICompanionDe 
    /**

     * Create a CompanionDeviceServiceConnector instance.

     *

     * When bindImportant is false, the binding flag will be BIND_ALMOST_PERCEPTIBLE

     * For self-managed apps, the binding flag will be BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE

     * (oom_score_adj = VISIBLE_APP_ADJ = 100).

     *

     * For non self-managed apps, the binding flag will be BIND_ALMOST_PERCEPTIBLE

     * (oom_score_adj = PERCEPTIBLE_MEDIUM_APP = 225). The target service will be treated

     * as important as a perceptible app (IMPORTANCE_VISIBLE = 200), and will be unbound when

     * the app is removed from task manager.

     * When bindImportant is true, the binding flag will be BIND_IMPORTANT

     * (oom_score_adj = PERCEPTIBLE_MEDIUM_APP = -700). The target service will

     * have the highest priority to avoid being killed (IMPORTANCE_FOREGROUND = 100).

     *

     * One time permission's importance level to keep session alive is

     * IMPORTANCE_FOREGROUND_SERVICE = 125. In order to kill the one time permission session, the

     * service importance level should be higher than 125.

     */

    static CompanionDeviceServiceConnector newInstance(@NonNull Context context,

            @UserIdInt int userId, @NonNull ComponentName componentName, boolean bindImportant) {

        final int bindingFlags = bindImportant ? BIND_IMPORTANT : BIND_ALMOST_PERCEPTIBLE;

            @UserIdInt int userId, @NonNull ComponentName componentName, boolean isSelfManaged) {

        final int bindingFlags = isSelfManaged ? BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE

                : BIND_ALMOST_PERCEPTIBLE;

        return new CompanionDeviceServiceConnector(context, userId, componentName, bindingFlags);

    }