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

Commit 073f5ba7 authored by ESWAR MAGATAPALLI (xWF)'s avatar ESWAR MAGATAPALLI (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Audio: add dump in AudioVolumeGroup and Strategy" 

Revert submission 33102662-STEP3_VOL_GROUP_IMPR

Reason for revert: Droidmonitor created revert due to b/414697491. Will be verifying through ABTD before submission.


Reverted changes: /q/submissionid:33102662-STEP3_VOL_GROUP_IMPR

Change-Id: Ie72da8315705253a4c727833c354aeb3d4f191d0
parent 5b287e85

media/java/android/media/audiopolicy/AudioProductStrategy.java

+9 −35
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.util.Log; 


import com.android.internal.annotations.GuardedBy;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;
@@ -484,16 +483,13 @@ public final class AudioProductStrategy implements Parcelable { 
    @NonNull

    @Override

    public String toString() {

        return toString("");

    }



    @NonNull

    String toString(@NonNull String indent) {

        StringBuilder s = new StringBuilder();

        s.append("\n").append(indent).append("Name: ").append(mName);

        s.append(" Id: ").append(mId);

        s.append("\n Name: ");

        s.append(mName);

        s.append(" Id: ");

        s.append(Integer.toString(mId));

        for (AudioAttributesGroup aag : mAudioAttributesGroups) {

            s.append(aag.toString(indent)).append(indent);

            s.append(aag.toString());

        }

        return s.toString();

    }
@@ -740,39 +736,17 @@ public final class AudioProductStrategy implements Parcelable { 


        @Override

        public @NonNull String toString() {

            return toString("");

        }



        String toString(String indent) {

            StringBuilder s = new StringBuilder();

            s.append("\n").append(indent).append("Legacy Stream Type: ");

            s.append(mLegacyStreamType);

            s.append("\n    Legacy Stream Type: ");

            s.append(Integer.toString(mLegacyStreamType));

            s.append(" Volume Group Id: ");

            s.append(mVolumeGroupId);

            s.append(Integer.toString(mVolumeGroupId));



            for (AudioAttributes attribute : mAudioAttributes) {

                s.append("\n").append(indent).append("-");

                s.append("\n    -");

                s.append(attribute.toString());

            }

            return s.toString();

        }

    }



    private static final String INDENT = "  ";



    /**

     * @hide

     */

    public static void dump(@NonNull PrintWriter pw) {

        pw.println("- AUDIO PRODUCT STRATEGIES:");

        getAudioProductStrategies().forEach(aps -> {

            pw.printf("%s%s\n", INDENT, aps.toString(INDENT + INDENT));

        });

        pw.println();

        pw.println("- AUDIO VOLUME GROUPS:");

        AudioVolumeGroup.getAudioVolumeGroups().forEach(avg -> {

            pw.printf("%s%s\n", INDENT, avg.toString(INDENT + INDENT));

        });

        pw.println();

    }

}

media/java/android/media/audiopolicy/AudioVolumeGroup.java

+9 −11
Original line number Diff line number Diff line
@@ -207,23 +207,21 @@ public final class AudioVolumeGroup implements Parcelable { 


    @Override

    public @NonNull String toString() {

        return toString("");

    }



    String toString(String indent) {

        StringBuilder s = new StringBuilder();

        s.append("\n").append(indent).append("Name: ").append(mName);

        s.append(" Id: ").append(mId);

        s.append("\n Name: ");

        s.append(mName);

        s.append(" Id: ");

        s.append(Integer.toString(mId));



        s.append("\n").append(indent).append(indent).append("Supported Audio Attributes:");

        s.append("\n     Supported Audio Attributes:");

        for (AudioAttributes attribute : mAudioAttributes) {

            s.append("\n").append(indent).append(indent).append(indent).append("-");

            s.append("\n       -");

            s.append(attribute.toString());

        }



        s.append("\n").append(indent).append(indent).append("Supported Legacy Stream Types: { ");

        s.append("\n     Supported Legacy Stream Types: { ");

        for (int legacyStreamType : mLegacyStreamTypes) {

            s.append(legacyStreamType).append(" ");

            s.append(Integer.toString(legacyStreamType));

            s.append(" ");

        }

        s.append("}");

        return s.toString();

services/core/java/com/android/server/audio/AudioService.java

+0 −2
Original line number Diff line number Diff line
@@ -13140,8 +13140,6 @@ public class AudioService extends IAudioService.Stub 
        pw.println("\n");

        dumpSupportedSystemUsage(pw);













        AudioProductStrategy.dump(pw);



























        pw.println("\n");















        pw.println("\nSpatial audio:");















        pw.println("mHasSpatializerEffect:" + mHasSpatializerEffect + " (effect present)");