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

Commit d2297637 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Fixed name of autofill service on save UI." into pi-dev 

am: d4296327

Change-Id: I4fdcc9d4474f77c0b7bd31c2f437675730a9e65f
parents 9821335e d4296327

services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java

+6 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.app.IActivityManager; 
import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageItemInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ServiceInfo;
@@ -667,7 +668,10 @@ final class AutofillManagerServiceImpl { 


    @NonNull

    CharSequence getServiceLabel() {

        return mInfo.getServiceInfo().loadLabel(mContext.getPackageManager());

        final CharSequence label = mInfo.getServiceInfo().loadSafeLabel(

                mContext.getPackageManager(), 0 /* do not ellipsize */,

                PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE | PackageItemInfo.SAFE_LABEL_FLAG_TRIM);

        return label;

    }



    @NonNull
@@ -912,6 +916,7 @@ final class AutofillManagerServiceImpl { 
        } else {

            pw.println();

            mInfo.dump(prefix2, pw);

            pw.print(prefix); pw.print("Service Label: "); pw.println(getServiceLabel());

        }

        pw.print(prefix); pw.print("Component from settings: ");

            pw.println(getComponentNameFromSettings());