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

Commit c9df3142 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge "Fix adb shell cmd activity get-config --proto --device fail" am: c0dd0d66 am: bb5384db 

am: f604b8b6

Change-Id: If0cddc5548552e1f78702089da8c6e6fc461814d
parents f6f09c54 f604b8b6

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+7 −2
Original line number Diff line number Diff line
@@ -2105,8 +2105,13 @@ final class ActivityManagerShellCommand extends ShellCommand { 
        }



        FeatureInfo[] features = pm.getSystemAvailableFeatures();

        Arrays.sort(features, (o1, o2) ->

                (o1.name == o2.name ? 0 : (o1.name == null ? -1 : o1.name.compareTo(o2.name))));

        Arrays.sort(features, (o1, o2) -> {

            if (o1.name == o2.name) return 0;

            if (o1.name == null) return -1;

            if (o2.name == null) return 1;

            return o1.name.compareTo(o2.name);

        });



        for (int i = 0; i < features.length; i++) {

            if (features[i].name != null) {

                if (protoOutputStream != null) {