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

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

Fix admin enable/disable of Bluetooth file sharing, part 2 am: 2b77cce5 

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



Change-Id: I60ff4601cfef4e1d021d2ca5a21d3b31c3e4ffc4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5c5df70 2b77cce5

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

+12 −6
Original line number Diff line number Diff line
@@ -2935,16 +2935,21 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 


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



            PackageManager packageManager = mContext.createContextAsUser(userHandle, 0)

            PackageManager systemPackageManager = mContext.getPackageManager();

            PackageManager userPackageManager = mContext.createContextAsUser(userHandle, 0)

                                                        .getPackageManager();

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

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

            for (String candidatePackage : allPackages) {

                Log.v(TAG, "Searching package " + candidatePackage);

                PackageInfo packageInfo;

                try {

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

                    packageInfo = mContext.getPackageManager().getPackageInfo(

                    packageInfo = systemPackageManager.getPackageInfo(

                        candidatePackage,

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

                        PackageManager.PackageInfoFlags.of(

                            PackageManager.GET_ACTIVITIES

                            | PackageManager.MATCH_ANY_USER

                            | PackageManager.MATCH_UNINSTALLED_PACKAGES

                            | PackageManager.MATCH_DISABLED_COMPONENTS));

                } catch (PackageManager.NameNotFoundException e) {

                    // ignore, try next package

                    Log.e(TAG, "Could not find package " + candidatePackage);
@@ -2957,11 +2962,12 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
                    continue;

                }

                for (var activity : packageInfo.activities) {

                    Log.v(TAG, "Checking activity " + activity.name);

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

                        final ComponentName oppLauncherComponent = new ComponentName(

                                candidatePackage, launcherActivity

                        );

                        packageManager.setComponentEnabledSetting(

                        userPackageManager.setComponentEnabledSetting(

                                oppLauncherComponent, newState, PackageManager.DONT_KILL_APP

                        );

                        return;