Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix adb shell cmd activity get-config --proto --device fail"

Browse Source
This commit is contained in:
Sudheer Shanka
2018-11-09 06:08:23 +00:00
committed by Gerrit Code Review
parent 0a390095df 1203000809
commit c0dd0d6648
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -2069,8 +2069,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) {