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

Commit 3684f14c authored by Michael Groover's avatar Michael Groover Committed by Android (Google) Code Review
Browse files

Merge "Set Build.SERIAL to UNKNOWN for all target SDK"

parents 5de53917 c2daefeb
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.text.DateFormat;
@@ -5936,18 +5935,6 @@ public final class ActivityThread extends ClientTransactionHandler {
        StrictMode.initThreadDefaults(data.appInfo);
        StrictMode.initVmDefaults(data.appInfo);

        // We deprecated Build.SERIAL and only apps that target pre NMR1
        // SDK can see it. Since access to the serial is now behind a
        // permission we push down the value and here we fix it up
        // before any app code has been loaded.
        try {
            Field field = Build.class.getDeclaredField("SERIAL");
            field.setAccessible(true);
            field.set(Build.class, data.buildSerial);
        } catch (NoSuchFieldException | IllegalAccessException e) {
            /* ignore */
        }

        if (data.debugMode != ApplicationThreadConstants.DEBUG_OFF) {
            // XXX should have option to change the port.
            Debug.changeDebugPort(8100);