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

Commit d8a0707a authored by Rahul Arya's avatar Rahul Arya Committed by Automerger Merge Worker
Browse files

Merge "Fix admin enable/disable of Bluetooth file sharing" into tm-dev am:... 

Merge "Fix admin enable/disable of Bluetooth file sharing" into tm-dev am: c001bc5f am: 7ebc0164

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19219300



Change-Id: Ie2297358369ed15323e10b8d5ed975e0c57d12e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3447b869 7ebc0164

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+49 −16
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.ServiceConnection;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.database.ContentObserver;
@@ -2922,9 +2923,7 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
     */

    private void updateOppLauncherComponentState(UserHandle userHandle,

            boolean bluetoothSharingDisallowed) {

        final ComponentName oppLauncherComponent = new ComponentName(

                mContext.getPackageManager().getPackagesForUid(Process.BLUETOOTH_UID)[0],

                "com.android.bluetooth.opp.BluetoothOppLauncherActivity");

        try {

            int newState;

            if (bluetoothSharingDisallowed) {

                newState = PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
@@ -2933,13 +2932,47 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
            } else {

                newState = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;

            }



            String launcherActivity = "com.android.bluetooth.opp.BluetoothOppLauncherActivity";



            PackageManager packageManager = mContext.createContextAsUser(userHandle, 0)

                                                        .getPackageManager();

            var allPackages = packageManager.getPackagesForUid(Process.BLUETOOTH_UID);

            for (String candidatePackage : allPackages) {

                PackageInfo packageInfo;

                try {

            mContext.createContextAsUser(userHandle, 0)

                .getPackageManager()

                .setComponentEnabledSetting(oppLauncherComponent, newState,

                        PackageManager.DONT_KILL_APP);

                    // note: we need the package manager for the SYSTEM user, not our userHandle

                    packageInfo = mContext.getPackageManager().getPackageInfo(

                        candidatePackage,

                        PackageManager.PackageInfoFlags.of(PackageManager.GET_ACTIVITIES));

                } catch (PackageManager.NameNotFoundException e) {

                    // ignore, try next package

                    Log.e(TAG, "Could not find package " + candidatePackage);

                    continue;

                } catch (Exception e) {

                    Log.e(TAG, "Error while loading package" + e);

                    continue;

                }

                if (packageInfo.activities == null) {

                    continue;

                }

                for (var activity : packageInfo.activities) {

                    if (launcherActivity.equals(activity.name)) {

                        final ComponentName oppLauncherComponent = new ComponentName(

                                candidatePackage, launcherActivity

                        );

                        packageManager.setComponentEnabledSetting(

                                oppLauncherComponent, newState, PackageManager.DONT_KILL_APP

                        );

                        return;

                    }

                }

            }



            Log.e(TAG,

                    "Cannot toggle BluetoothOppLauncherActivity, could not find it in any package");

        } catch (Exception e) {

            // The component was not found, do nothing.

            Log.e(TAG, "updateOppLauncherComponentState failed: " + e);

        }

    }