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

Commit 734d4049 authored by Yi Jiang's avatar Yi Jiang Committed by Android (Google) Code Review
Browse files

Merge "In getAttentionServicePackageName(), only return the package name of... 

Merge "In getAttentionServicePackageName(), only return the package name of Attention Service instead of package name+class name."
parents 6728ffe6 45abf1a0

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

+10 −2
Original line number Diff line number Diff line
@@ -20720,8 +20720,16 @@ public class PackageManagerService extends IPackageManager.Stub 
    }















    @Override













    public String getAttentionServicePackageName() {













        return mContext.getString(R.string.config_defaultAttentionService);













    public @Nullable String getAttentionServicePackageName() {













        final String flattenedComponentName =













                mContext.getString(R.string.config_defaultAttentionService);













        if (flattenedComponentName != null) {













            ComponentName componentName = ComponentName.unflattenFromString(flattenedComponentName);













            if (componentName != null && componentName.getPackageName() != null) {













                return componentName.getPackageName();













            }













        }













        return null;















    }





























    private @Nullable String getDocumenterPackageName() {