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

Commit c2e06412 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "pm set-home-activity waits until completion" into qt-dev 

am: ec41ca2a

Change-Id: I1b1ea6b9cdfdc7db542903debee4fc60cd26d425
parents 3caecda5 ec41ca2a

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

+35 −9
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATIO 
import android.accounts.IAccountManager;

import android.accounts.IAccountManager;

import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.ActivityManagerInternal;

import android.app.role.IRoleManager;

import android.app.role.RoleManager;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;

import android.content.IIntentReceiver;

import android.content.IIntentReceiver;
@@ -75,6 +77,7 @@ import android.os.ParcelFileDescriptor; 
import android.os.ParcelFileDescriptor.AutoCloseInputStream;

import android.os.ParcelFileDescriptor.AutoCloseInputStream;

import android.os.PersistableBundle;

import android.os.PersistableBundle;

import android.os.Process;

import android.os.Process;

import android.os.RemoteCallback;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.os.ShellCommand;

import android.os.ShellCommand;
@@ -115,6 +118,7 @@ import java.util.List; 
import java.util.Map;

import java.util.Map;

import java.util.Objects;

import java.util.Objects;

import java.util.WeakHashMap;

import java.util.WeakHashMap;

import java.util.concurrent.CompletableFuture;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.LinkedBlockingQueue;

import java.util.concurrent.LinkedBlockingQueue;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeUnit;
@@ -2460,19 +2464,37 @@ class PackageManagerShellCommand extends ShellCommand { 
            }

            }

        }

        }





        String pkgName;

        String component = getNextArg();

        String component = getNextArg();

        if (component.indexOf('/') < 0) {

            // No component specified, so assume it's just a package name.

            pkgName = component;

        } else {

            ComponentName componentName =

            ComponentName componentName =

                    component != null ? ComponentName.unflattenFromString(component) : null;

                    component != null ? ComponentName.unflattenFromString(component) : null;



            if (componentName == null) {

            if (componentName == null) {

            pw.println("Error: component name not specified or invalid");

                pw.println("Error: invalid component name");

                return 1;

                return 1;

            }

            }

            pkgName = componentName.getPackageName();

        }







        final CompletableFuture<Boolean> future = new CompletableFuture<>();

        final RemoteCallback callback = new RemoteCallback(res -> future.complete(res != null));

        try {

        try {

            mInterface.setHomeActivity(componentName, userId);

            IRoleManager roleManager = android.app.role.IRoleManager.Stub.asInterface(

                    ServiceManager.getServiceOrThrow(Context.ROLE_SERVICE));

            roleManager.addRoleHolderAsUser(RoleManager.ROLE_HOME, pkgName,

                    0, userId, callback);

            boolean success = future.get();

            if (success) {

                pw.println("Success");

                pw.println("Success");

                return 0;

                return 0;

            } else {

                pw.println("Error: Failed to set default home.");

                return 1;

            }

        } catch (Exception e) {

        } catch (Exception e) {

            pw.println(e.toString());

            pw.println(e.toString());

            return 1;

            return 1;
@@ -3161,6 +3183,10 @@ class PackageManagerShellCommand extends ShellCommand { 
        pw.println("");

        pw.println("");

        pw.println("  set-home-activity [--user USER_ID] TARGET-COMPONENT");

        pw.println("  set-home-activity [--user USER_ID] TARGET-COMPONENT");

        pw.println("    Set the default home activity (aka launcher).");

        pw.println("    Set the default home activity (aka launcher).");

        pw.println("    TARGET-COMPONENT can be a package name (com.package.my) or a full");

        pw.println("    component (com.package.my/component.name). However, only the package name");

        pw.println("    matters: the actual component used will be determined automatically from");

        pw.println("    the package.");

        pw.println("");

        pw.println("");

        pw.println("  set-installer PACKAGE INSTALLER");

        pw.println("  set-installer PACKAGE INSTALLER");

        pw.println("    Set installer package name");

        pw.println("    Set installer package name");