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

Commit b33e3fad authored by Song Hu's avatar Song Hu Committed by Automerger Merge Worker
Browse files

Merge "ChooserActivity reports whether the selected target is pinned in... 

Merge "ChooserActivity reports whether the selected target is pinned in Westworld logging" into tm-dev am: 42bf1451

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144333



Change-Id: I8cbc1e54b7a3863eb46696ce48ec4470c6174529
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43b655b9 42bf1451

core/java/com/android/internal/app/ChooserActivity.java

+14 −7
Original line number Diff line number Diff line
@@ -971,7 +971,8 @@ public class ChooserActivity extends ResolverActivity implements 
            getChooserActivityLogger().logShareTargetSelected(

                    SELECTION_TYPE_COPY,

                    "",

                    -1);

                    -1,

                    false);



            setResult(RESULT_OK);

            finish();
@@ -1155,7 +1156,8 @@ public class ChooserActivity extends ResolverActivity implements 
                    getChooserActivityLogger().logShareTargetSelected(

                            SELECTION_TYPE_NEARBY,

                            "",

                            -1);

                            -1,

                            false);

                    // Action bar is user-independent, always start as primary

                    safelyStartActivityAsUser(ti, getPersonalProfileUserHandle());

                    finish();
@@ -1177,7 +1179,8 @@ public class ChooserActivity extends ResolverActivity implements 
                    getChooserActivityLogger().logShareTargetSelected(

                            SELECTION_TYPE_EDIT,

                            "",

                            -1);

                            -1,

                            false);

                    // Action bar is user-independent, always start as primary

                    safelyStartActivityAsUser(ti, getPersonalProfileUserHandle());

                    finish();
@@ -1754,7 +1757,8 @@ public class ChooserActivity extends ResolverActivity implements 
                            target.getComponentName().getPackageName()

                                    + target.getTitle().toString(),

                            mMaxHashSaltDays);

                    directTargetAlsoRanked = getRankedPosition((SelectableTargetInfo) targetInfo);

                    SelectableTargetInfo selectableTargetInfo = (SelectableTargetInfo) targetInfo;

                    directTargetAlsoRanked = getRankedPosition(selectableTargetInfo);



                    if (mCallerChooserTargets != null) {

                        numCallerProvided = mCallerChooserTargets.length;
@@ -1762,7 +1766,8 @@ public class ChooserActivity extends ResolverActivity implements 
                    getChooserActivityLogger().logShareTargetSelected(

                            SELECTION_TYPE_SERVICE,

                            targetInfo.getResolveInfo().activityInfo.processName,

                            value

                            value,

                            selectableTargetInfo.isPinned()

                    );

                    break;

                case ChooserListAdapter.TARGET_CALLER:
@@ -1773,7 +1778,8 @@ public class ChooserActivity extends ResolverActivity implements 
                    getChooserActivityLogger().logShareTargetSelected(

                            SELECTION_TYPE_APP,

                            targetInfo.getResolveInfo().activityInfo.processName,

                            value

                            value,

                            targetInfo.isPinned()

                    );

                    break;

                case ChooserListAdapter.TARGET_STANDARD_AZ:
@@ -1784,7 +1790,8 @@ public class ChooserActivity extends ResolverActivity implements 
                    getChooserActivityLogger().logShareTargetSelected(

                            SELECTION_TYPE_STANDARD,

                            targetInfo.getResolveInfo().activityInfo.processName,

                            value

                            value,

                            false

                    );

                    break;

            }

core/java/com/android/internal/app/ChooserActivityLogger.java

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ public interface ChooserActivityLogger { 
            int appProvidedApp, boolean isWorkprofile, int previewType, String intent);



    /** Logs a UiEventReported event for the system sharesheet when the user selects a target. */

    void logShareTargetSelected(int targetType, String packageName, int positionPicked);

    void logShareTargetSelected(int targetType, String packageName, int positionPicked,

            boolean isPinned);



    /** Logs a UiEventReported event for the system sharesheet being triggered by the user. */

    default void logSharesheetTriggered() {

core/java/com/android/internal/app/ChooserActivityLoggerImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -51,12 +51,14 @@ public class ChooserActivityLoggerImpl implements ChooserActivityLogger { 
    }



    @Override

    public void logShareTargetSelected(int targetType, String packageName, int positionPicked) {

    public void logShareTargetSelected(int targetType, String packageName, int positionPicked,

            boolean isPinned) {

        FrameworkStatsLog.write(FrameworkStatsLog.RANKING_SELECTED,

                /* event_id = 1 */ SharesheetTargetSelectedEvent.fromTargetType(targetType).getId(),

                /* package_name = 2 */ packageName,

                /* instance_id = 3 */ getInstanceId().getId(),

                /* position_picked = 4 */ positionPicked);

                /* position_picked = 4 */ positionPicked,

                /* is_pinned = 5 */ isPinned);

    }



    @Override

core/java/com/android/internal/logging/UiEventLoggerImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ public class UiEventLoggerImpl implements UiEventLogger { 
                    /* event_id = 1 */ eventID,

                    /* package_name = 2 */ packageName,

                    /* instance_id = 3 */ 0,

                    /* position_picked = 4 */ position);

                    /* position_picked = 4 */ position,

                    /* is_pinned = 5 */ false);

        }

    }
@@ -82,7 +83,8 @@ public class UiEventLoggerImpl implements UiEventLogger { 
                    /* event_id = 1 */ eventID,

                    /* package_name = 2 */ packageName,

                    /* instance_id = 3 */ instance.getId(),

                    /* position_picked = 4 */ position);

                    /* position_picked = 4 */ position,

                    /* is_pinned = 5 */ false);

        } else if ((eventID > 0)) {

            logWithPosition(event, uid, packageName, position);

        }

core/tests/coretests/src/com/android/internal/app/ChooserActivityLoggerFake.java

+7 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class ChooserActivityLoggerFake implements ChooserActivityLogger { 
        // share completed fields

        public int targetType;

        public int positionPicked;

        public boolean isPinned;



        CallRecord(int atomId, UiEventLogger.UiEventEnum eventId,

                String packageName, InstanceId instanceId) {
@@ -68,12 +69,13 @@ public class ChooserActivityLoggerFake implements ChooserActivityLogger { 
        }



        CallRecord(int atomId, String packageName, InstanceId instanceId, int targetType,

                int positionPicked) {

                int positionPicked, boolean isPinned) {

            this.atomId = atomId;

            this.packageName = packageName;

            this.instanceId = instanceId;

            this.targetType = targetType;

            this.positionPicked = positionPicked;

            this.isPinned = isPinned;

        }



    }
@@ -112,9 +114,11 @@ public class ChooserActivityLoggerFake implements ChooserActivityLogger { 
    }



    @Override

    public void logShareTargetSelected(int targetType, String packageName, int positionPicked) {

    public void logShareTargetSelected(int targetType, String packageName, int positionPicked,

            boolean isPinned) {

        mCalls.add(new CallRecord(FrameworkStatsLog.RANKING_SELECTED, packageName, getInstanceId(),

                SharesheetTargetSelectedEvent.fromTargetType(targetType).getId(), positionPicked));

                SharesheetTargetSelectedEvent.fromTargetType(targetType).getId(), positionPicked,

                isPinned));

    }



    @Override