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

Commit 9bc1bc3c authored by Himanshu Gupta's avatar Himanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "Do not move to ALL_APPS when default Launcher is not system." into main

parents 5ae060ac 63da8c35
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.privatespace;

import android.app.Activity;
import android.app.ActivityManager;
import android.app.role.RoleManager;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -103,12 +104,19 @@ public class SetupSuccessFragment extends InstrumentedFragment {
                                        PackageManager.MATCH_SYSTEM_ONLY,
                                        activity.getUserId());
                if (resolveInfo != null) {
                    RoleManager mRoleManager = getContext().getSystemService(RoleManager.class);
                    final List<String> packageNames = mRoleManager
                            .getRoleHolders(RoleManager.ROLE_HOME);
                    if (packageNames.contains(resolveInfo.activityInfo.packageName)) {
                        allAppsIntent.setPackage(resolveInfo.activityInfo.packageName);
                        allAppsIntent.setComponent(resolveInfo.activityInfo.getComponentName());
                    }
                }
                activity.setTheme(R.style.Theme_SubSettings);
                if (allAppsIntent.getPackage() != null) {
                    accessPrivateSpaceToast();
                    startActivity(allAppsIntent);
                }
                Log.i(TAG, "Private space setup complete");
                deleteAllTaskAndFinish(activity);
            }