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

Commit de8d4874 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Clean up long launched flag and obsolete aconfig 

#codehealth

Bug: n/a
Test: presubmit
Flag: EXEMPT flag removal
Change-Id: I4d82d79214811bf11ef8e74b11bb8d328896b5d3
parent ae8f24a3

services/companion/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ java_library_static { 
    ],

    static_libs: [

        "ukey2_jni",

        "virtualdevice_flags_lib",

        "virtual_camera_service_aidl-java",

    ],

    lint: {

services/companion/java/com/android/server/companion/virtual/Android.bp

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
package {

    default_team: "trendy_team_xr_framework",

}



java_aconfig_library {

    name: "virtualdevice_flags_lib",

    aconfig_declarations: "virtualdevice_flags",

}



aconfig_declarations {

    name: "virtualdevice_flags",

    package: "com.android.server.companion.virtual",

    container: "system",

    srcs: [

        "flags.aconfig",

    ],

}

services/companion/java/com/android/server/companion/virtual/VirtualDeviceLog.java

+0 −9
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ final class VirtualDeviceLog { 
    void logCreated(int deviceId, int ownerUid) {

        final long token = Binder.clearCallingIdentity();

        try {

            if (!Flags.dumpHistory()) {

                return;

            }

            addEntry(new LogEntry(TYPE_CREATED, deviceId, System.currentTimeMillis(), ownerUid));

        } finally {

            Binder.restoreCallingIdentity(token);
@@ -60,9 +57,6 @@ final class VirtualDeviceLog { 
    void logClosed(int deviceId, int ownerUid) {

        final long token = Binder.clearCallingIdentity();

        try {

            if (!Flags.dumpHistory()) {

                return;

            }

            addEntry(new LogEntry(TYPE_CLOSED, deviceId, System.currentTimeMillis(), ownerUid));

        } finally {

            Binder.restoreCallingIdentity(token);
@@ -79,9 +73,6 @@ final class VirtualDeviceLog { 
    void dump(PrintWriter pw) {

        final long token = Binder.clearCallingIdentity();

        try {

            if (!Flags.dumpHistory()) {

                return;

            }

            pw.println("VirtualDevice Log:");

            UidToPackageNameCache packageNameCache = new UidToPackageNameCache(

                    mContext.getPackageManager());

services/companion/java/com/android/server/companion/virtual/flags.aconfig

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
# OLD PACKAGE, DO NOT USE: Prefer `flags.aconfig` in core/java/android/companion/virtual

# (or other custom files) to define your flags

package: "com.android.server.companion.virtual"

container: "system"



flag {

  name: "dump_history"

  namespace: "virtual_devices"

  description: "This flag controls if a history of virtual devices is shown in dumpsys virtualdevices"

  bug: "293114719"

}
 
 No newline at end of file