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

Commit bc09f4b4 authored by Jigar Thakkar's avatar Jigar Thakkar
Browse files

Remove app cloning feature flags 

With this change, we are removing the building blocks feature flag from
platform codebase as we are ready for the U release.

Test: atest ContactsSharingTest/IntentRedirectionTest
Bug: 250961871
Change-Id: Iceebd9bf4d156c896fbd87c5751d888d4e465fba
parent e2ccf110

core/java/com/android/internal/config/appcloning/AppCloningDeviceConfigHelper.java

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

 * Copyright (C) 2023 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 com.android.internal.config.appcloning;



import android.content.Context;

import android.provider.DeviceConfig;



import com.android.internal.annotations.GuardedBy;



/**

 * Helper class that holds the flags related to the app_cloning namespace in {@link DeviceConfig}.

 *

 * @hide

 */

public class AppCloningDeviceConfigHelper {



    @GuardedBy("sLock")

    private static AppCloningDeviceConfigHelper sInstance;



    private static final Object sLock = new Object();



    private DeviceConfig.OnPropertiesChangedListener mDeviceConfigChangeListener;



    /**

     * This flag is defined inside {@link DeviceConfig#NAMESPACE_APP_CLONING}. Please check

     * {@link #mEnableAppCloningBuildingBlocks} for details.

     */

    public static final String ENABLE_APP_CLONING_BUILDING_BLOCKS =

            "enable_app_cloning_building_blocks";



    /**

     * Checks whether the support for app-cloning building blocks (like contacts

     * sharing/intent redirection), which are available starting from the U release, is turned on.

     * The default value is true to ensure the features are always enabled going forward.

     *

     * TODO:(b/253449368) Add information about the app-cloning config and mention that the devices

     * that do not support app-cloning should use the app-cloning config to disable all app-cloning

     * features.

     */

    private volatile boolean mEnableAppCloningBuildingBlocks = true;



    private AppCloningDeviceConfigHelper() {}



    /**

     * @hide

     */

    public static AppCloningDeviceConfigHelper getInstance(Context context) {

        synchronized (sLock) {

            if (sInstance == null) {

                sInstance = new AppCloningDeviceConfigHelper();

                sInstance.init(context);

            }

            return sInstance;

        }

    }



    private void init(Context context) {

        initializeDeviceConfigChangeListener();

        DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_APP_CLONING,

                context.getMainExecutor(),

                mDeviceConfigChangeListener);

    }



    private void initializeDeviceConfigChangeListener() {

        mDeviceConfigChangeListener = properties -> {

            if (!DeviceConfig.NAMESPACE_APP_CLONING.equals(properties.getNamespace())) {

                return;

            }

            for (String name : properties.getKeyset()) {

                if (name == null) {

                    return;

                }

                if (ENABLE_APP_CLONING_BUILDING_BLOCKS.equals(name)) {

                    updateEnableAppCloningBuildingBlocks();

                }

            }

        };

    }



    private void updateEnableAppCloningBuildingBlocks() {

        mEnableAppCloningBuildingBlocks = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_APP_CLONING, ENABLE_APP_CLONING_BUILDING_BLOCKS, true);

    }



    /**

     * Fetch the feature flag to check whether the support for the app-cloning building blocks

     * (like contacts sharing/intent redirection) is enabled on the device.

     * @hide

     */

    public boolean getEnableAppCloningBuildingBlocks() {

        return mEnableAppCloningBuildingBlocks;

    }

}

core/java/com/android/internal/config/appcloning/OWNERS

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# Bug component: 1207885

jigarthakkar@google.com

saumyap@google.com
 
 No newline at end of file

services/core/java/com/android/server/content/SyncManager.java

+1 −6
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ import com.android.internal.R; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.IBatteryStats;

import com.android.internal.config.appcloning.AppCloningDeviceConfigHelper;

import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;

import com.android.internal.notification.SystemNotificationChannels;

import com.android.internal.os.BackgroundThread;
@@ -257,8 +256,6 @@ public class SyncManager { 


    private final SyncLogger mLogger;



    private final AppCloningDeviceConfigHelper mAppCloningDeviceConfigHelper;



    private boolean isJobIdInUseLockedH(int jobId, List<JobInfo> pendingJobs) {

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

            JobInfo job = pendingJobs.get(i);
@@ -684,7 +681,6 @@ public class SyncManager { 
        }, mSyncHandler);



        mConstants = new SyncManagerConstants(context);

        mAppCloningDeviceConfigHelper = AppCloningDeviceConfigHelper.getInstance(context);



        IntentFilter intentFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);

        context.registerReceiver(mConnectivityIntentReceiver, intentFilter);
@@ -892,8 +888,7 @@ public class SyncManager { 
     * @return true/false if contact sharing is enabled/disabled

     */

    protected boolean isContactSharingAllowedForCloneProfile() {

        return mContext.getResources().getBoolean(R.bool.config_enableAppCloningBuildingBlocks)

                && mAppCloningDeviceConfigHelper.getEnableAppCloningBuildingBlocks();

        return mContext.getResources().getBoolean(R.bool.config_enableAppCloningBuildingBlocks);

    }



    /**

services/core/java/com/android/server/pm/CrossProfileIntentResolverEngine.java

+1 −9
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.util.Pair; 
import android.util.Slog;

import android.util.SparseArray;



import com.android.internal.config.appcloning.AppCloningDeviceConfigHelper;

import com.android.server.LocalServices;

import com.android.server.pm.pkg.PackageStateInternal;

import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
@@ -62,8 +61,6 @@ public class CrossProfileIntentResolverEngine { 
    private final Context mContext;

    private final UserManagerInternal mUserManagerInternal;



    private AppCloningDeviceConfigHelper mAppCloningDeviceConfigHelper;



    public CrossProfileIntentResolverEngine(UserManagerService userManager,

            DomainVerificationManagerInternal domainVerificationManager,

            DefaultAppProvider defaultAppProvider, Context context) {
@@ -253,12 +250,7 @@ public class CrossProfileIntentResolverEngine { 
         * We would return NoFilteringResolver only if it is allowed(feature flag is set).

         */

        if (shouldUseNoFilteringResolver(sourceUserId, targetUserId)) {

            if (mAppCloningDeviceConfigHelper == null) {

                //lazy initialization of helper till required, to improve performance.

                mAppCloningDeviceConfigHelper = AppCloningDeviceConfigHelper.getInstance(mContext);

            }

            if (NoFilteringResolver.isIntentRedirectionAllowed(mContext,

                    mAppCloningDeviceConfigHelper, resolveForStart, flags)) {

            if (NoFilteringResolver.isIntentRedirectionAllowed(mContext, resolveForStart, flags)) {

                return new NoFilteringResolver(computer.getComponentResolver(),

                        mUserManager);

            } else {

services/core/java/com/android/server/pm/NoFilteringResolver.java

+5 −9
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.pm.ResolveInfo; 
import android.os.Binder;



import com.android.internal.R;

import com.android.internal.config.appcloning.AppCloningDeviceConfigHelper;

import com.android.server.pm.pkg.PackageStateInternal;

import com.android.server.pm.resolution.ComponentResolverApi;

import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
@@ -57,10 +56,9 @@ public class NoFilteringResolver extends CrossProfileResolver { 
     * (PackageManager.MATCH_CLONE_PROFILE) bit set.

     * @return true if resolver would be used for cross profile resolution.

     */

    public static boolean isIntentRedirectionAllowed(Context context,

            AppCloningDeviceConfigHelper appCloningDeviceConfigHelper, boolean resolveForStart,

    public static boolean isIntentRedirectionAllowed(Context context, boolean resolveForStart,

            long flags) {

        return isAppCloningBuildingBlocksEnabled(context, appCloningDeviceConfigHelper)

        return isAppCloningBuildingBlocksEnabled(context)

                    && (resolveForStart || (((flags & PackageManager.MATCH_CLONE_PROFILE) != 0)

                    && hasPermission(context, Manifest.permission.QUERY_CLONED_APPS)));

    }
@@ -142,14 +140,12 @@ public class NoFilteringResolver extends CrossProfileResolver { 
    }



    /**

     * Checks if the AppCloningBuildingBlocks flag is enabled.

     * Checks if the AppCloningBuildingBlocks config is enabled.

     */

    private static boolean isAppCloningBuildingBlocksEnabled(Context context,

            AppCloningDeviceConfigHelper appCloningDeviceConfigHelper) {

    private static boolean isAppCloningBuildingBlocksEnabled(Context context) {

        final long token = Binder.clearCallingIdentity();

        try {

            return context.getResources().getBoolean(R.bool.config_enableAppCloningBuildingBlocks)

                    && appCloningDeviceConfigHelper.getEnableAppCloningBuildingBlocks();

            return context.getResources().getBoolean(R.bool.config_enableAppCloningBuildingBlocks);

        } finally {

            Binder.restoreCallingIdentity(token);

        }