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

Commit ea5c6480 authored by Ricky Wai's avatar Ricky Wai Committed by Android (Google) Code Review
Browse files

Merge "Change get/setAppDetailsActivityEnabled to get/setSyntheticAppDetailsActivityEnabled"

parents c052fa20 a52e4262

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1603,7 +1603,6 @@ package android.content.pm { 
    method @RequiresPermission("android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS") public abstract void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);

    method public abstract boolean arePermissionsIndividuallyControlled();

    method public abstract java.util.List<android.content.IntentFilter> getAllIntentFilters(String);

    method public boolean getAppDetailsActivityEnabled(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.pm.ApplicationInfo getApplicationInfoAsUser(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException;

    method @NonNull public android.content.pm.dex.ArtManager getArtManager();

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract String getDefaultBrowserPackageNameAsUser(int);
@@ -1617,6 +1616,7 @@ package android.content.pm { 
    method public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(String);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract int getIntentVerificationStatusAsUser(String, int);

    method @android.content.pm.PackageManager.PermissionFlags @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS, android.Manifest.permission.GET_RUNTIME_PERMISSIONS}) public abstract int getPermissionFlags(String, String, @NonNull android.os.UserHandle);

    method public boolean getSyntheticAppDetailsActivityEnabled(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] getUnsuspendablePackages(@NonNull String[]);

    method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public abstract void grantRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);

    method @Deprecated public abstract int installExistingPackage(String) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -1630,12 +1630,12 @@ package android.content.pm { 
    method @Deprecated public void replacePreferredActivity(@NonNull android.content.IntentFilter, int, @NonNull java.util.List<android.content.ComponentName>, @NonNull android.content.ComponentName);

    method @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public abstract void revokeRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);

    method public void sendDeviceCustomizationReadyBroadcast();

    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public void setAppDetailsActivityEnabled(@NonNull String, boolean);

    method @RequiresPermission(allOf={android.Manifest.permission.SET_PREFERRED_APPLICATIONS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public abstract boolean setDefaultBrowserPackageNameAsUser(String, int);

    method @NonNull @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setDistractingPackageRestrictions(@NonNull String[], int);

    method @RequiresPermission(android.Manifest.permission.SET_HARMFUL_APP_WARNINGS) public void setHarmfulAppWarning(@NonNull String, @Nullable CharSequence);

    method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setPackagesSuspended(@Nullable String[], boolean, @Nullable android.os.PersistableBundle, @Nullable android.os.PersistableBundle, @Nullable String);

    method @Nullable @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setPackagesSuspended(@Nullable String[], boolean, @Nullable android.os.PersistableBundle, @Nullable android.os.PersistableBundle, @Nullable android.content.pm.SuspendDialogInfo);

    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public void setSyntheticAppDetailsActivityEnabled(@NonNull String, boolean);

    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public abstract void setUpdateAvailable(String, boolean);

    method @RequiresPermission(android.Manifest.permission.SET_PREFERRED_APPLICATIONS) public abstract boolean updateIntentVerificationStatusAsUser(String, int, int);

    method @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS}) public abstract void updatePermissionFlags(String, String, @android.content.pm.PackageManager.PermissionFlags int, @android.content.pm.PackageManager.PermissionFlags int, @NonNull android.os.UserHandle);

core/java/android/app/ApplicationPackageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2468,7 +2468,7 @@ public class ApplicationPackageManager extends PackageManager { 
    }



    @Override

    public void setAppDetailsActivityEnabled(String packageName, boolean enabled) {

    public void setSyntheticAppDetailsActivityEnabled(String packageName, boolean enabled) {

        try {

            ComponentName componentName = new ComponentName(packageName,

                    PackageManager.APP_DETAILS_ACTIVITY_CLASS_NAME);
@@ -2482,7 +2482,7 @@ public class ApplicationPackageManager extends PackageManager { 
    }



    @Override

    public boolean getAppDetailsActivityEnabled(String packageName) {

    public boolean getSyntheticAppDetailsActivityEnabled(String packageName) {

        try {

            ComponentName componentName = new ComponentName(packageName,

                    PackageManager.APP_DETAILS_ACTIVITY_CLASS_NAME);

core/java/android/content/pm/PackageManager.java

+11 −8
Original line number Diff line number Diff line
@@ -5874,34 +5874,37 @@ public abstract class PackageManager { 
            @NonNull ComponentName componentName);



    /**

     * Set the enabled setting for a package app settings activity.

     * Set whether a synthetic app details activity will be generated if the app has no enabled

     * launcher activity. Disabling this allows the app to have no launcher icon.

     *

     * @param packageName The package name of the app

     * @param enabled The new enabled state for app details activity

     * @param enabled The new enabled state for the synthetic app details activity.

     *

     * @hide

     */

    @RequiresPermission(value = android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE,

            conditional = true)

    @SystemApi

    public void setAppDetailsActivityEnabled(@NonNull String packageName, boolean enabled) {

    public void setSyntheticAppDetailsActivityEnabled(@NonNull String packageName,

            boolean enabled) {

        throw new UnsupportedOperationException(

                "setAppDetailsActivityEnabled not implemented");

                "setSyntheticAppDetailsActivityEnabled not implemented");

    }





    /**

     * Return the enabled setting for a package app settings activity.

     * Return whether a synthetic app details activity will be generated if the app has no enabled

     * launcher activity.

     *

     * @param packageName The package name of the app

     * @return Returns the current enabled state for app settings activity.

     * @return Returns the enabled state for the synthetic app details activity.

     *

     * @hide

     */

    @SystemApi

    public boolean getAppDetailsActivityEnabled(@NonNull String packageName) {

    public boolean getSyntheticAppDetailsActivityEnabled(@NonNull String packageName) {

        throw new UnsupportedOperationException(

                "getAppDetailsActivityEnabled not implemented");

                "getSyntheticAppDetailsActivityEnabled not implemented");

    }



    /**

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

+3 −3
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ public class LauncherAppsService extends SystemService { 
                    }

                    ApplicationInfo appInfo = pmInt.getApplicationInfo(packageName, /*flags*/ 0,

                            callingUid, user.getIdentifier());

                    if (shouldShowHiddenApp(user, appInfo)) {

                    if (shouldShowSyntheticActivity(user, appInfo)) {

                        ResolveInfo info = getHiddenAppActivityInfo(packageName, callingUid, user);

                        if (info != null) {

                            result.add(info);
@@ -448,7 +448,7 @@ public class LauncherAppsService extends SystemService { 
                        user.getIdentifier(), callingUid);

                for (ApplicationInfo applicationInfo : installedPackages) {

                    if (!visiblePackages.contains(applicationInfo.packageName)) {

                        if (!shouldShowHiddenApp(user, applicationInfo)) {

                        if (!shouldShowSyntheticActivity(user, applicationInfo)) {

                            continue;

                        }

                        ResolveInfo info = getHiddenAppActivityInfo(applicationInfo.packageName,
@@ -464,7 +464,7 @@ public class LauncherAppsService extends SystemService { 
            }

        }



        private boolean shouldShowHiddenApp(UserHandle user, ApplicationInfo appInfo) {

        private boolean shouldShowSyntheticActivity(UserHandle user, ApplicationInfo appInfo) {

            if (appInfo == null || appInfo.isSystemApp() || appInfo.isUpdatedSystemApp()) {

                return false;

            }