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

Commit 37e43275 authored by Svet Ganov's avatar Svet Ganov Committed by Svetoslav Ganov
Browse files

Move device serial behing a permission 

Build serial is non-user resettable freely available deivice
identifier. It can be used by ad-netowrks to track the user
across apps which violates the user's privacy.

This change deprecates Build.SERIAL and adds a new Build.getSerial()
API which requires holding the read_phone_state permission.
The Build.SERIAL value is set to "undefined" for apps targeting
high enough SDK and for legacy app the value is still available.

bug:31402365

Change-Id: Iddd13430b2bd1d9ab4966e31038ecabdbdcec06d
parent 1fd68ad9

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IBatteryPropertiesListener.aidl \

	core/java/android/os/IBatteryPropertiesRegistrar.aidl \

	core/java/android/os/ICancellationSignal.aidl \

	core/java/android/os/IDeviceIdentifiersPolicyService.aidl \

	core/java/android/os/IDeviceIdleController.aidl \

	core/java/android/os/IHardwarePropertiesManager.aidl \

	core/java/android/os/IMaintenanceActivityListener.aidl \

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -28370,6 +28370,7 @@ package android.os { 
  public class Build {

    ctor public Build();

    method public static java.lang.String getRadioVersion();

    method public static java.lang.String getSerial();

    field public static final java.lang.String BOARD;

    field public static final java.lang.String BOOTLOADER;

    field public static final java.lang.String BRAND;
@@ -28385,7 +28386,7 @@ package android.os { 
    field public static final java.lang.String MODEL;

    field public static final java.lang.String PRODUCT;

    field public static final deprecated java.lang.String RADIO;

    field public static final java.lang.String SERIAL;

    field public static final deprecated java.lang.String SERIAL;

    field public static final java.lang.String[] SUPPORTED_32_BIT_ABIS;

    field public static final java.lang.String[] SUPPORTED_64_BIT_ABIS;

    field public static final java.lang.String[] SUPPORTED_ABIS;

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -30852,6 +30852,7 @@ package android.os { 
  public class Build {

    ctor public Build();

    method public static java.lang.String getRadioVersion();

    method public static java.lang.String getSerial();

    field public static final java.lang.String BOARD;

    field public static final java.lang.String BOOTLOADER;

    field public static final java.lang.String BRAND;
@@ -30868,7 +30869,7 @@ package android.os { 
    field public static final boolean PERMISSIONS_REVIEW_REQUIRED;

    field public static final java.lang.String PRODUCT;

    field public static final deprecated java.lang.String RADIO;

    field public static final java.lang.String SERIAL;

    field public static final deprecated java.lang.String SERIAL;

    field public static final java.lang.String[] SUPPORTED_32_BIT_ABIS;

    field public static final java.lang.String[] SUPPORTED_64_BIT_ABIS;

    field public static final java.lang.String[] SUPPORTED_ABIS;

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -28442,6 +28442,7 @@ package android.os { 
  public class Build {

    ctor public Build();

    method public static java.lang.String getRadioVersion();

    method public static java.lang.String getSerial();

    field public static final java.lang.String BOARD;

    field public static final java.lang.String BOOTLOADER;

    field public static final java.lang.String BRAND;
@@ -28457,7 +28458,7 @@ package android.os { 
    field public static final java.lang.String MODEL;

    field public static final java.lang.String PRODUCT;

    field public static final deprecated java.lang.String RADIO;

    field public static final java.lang.String SERIAL;

    field public static final deprecated java.lang.String SERIAL;

    field public static final java.lang.String[] SUPPORTED_32_BIT_ABIS;

    field public static final java.lang.String[] SUPPORTED_64_BIT_ABIS;

    field public static final java.lang.String[] SUPPORTED_ABIS;

core/java/android/app/ActivityThread.java

+18 −1
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ 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.InvocationTargetException;

import java.net.InetAddress;

import java.text.DateFormat;

import java.util.ArrayList;
@@ -517,6 +519,7 @@ public final class ActivityThread { 
        boolean persistent;

        Configuration config;

        CompatibilityInfo compatInfo;

        String buildSerial;



        /** Initial values for {@link Profiler}. */

        ProfilerInfo initProfilerInfo;
@@ -851,7 +854,8 @@ public final class ActivityThread { 
                IUiAutomationConnection instrumentationUiConnection, int debugMode,

                boolean enableBinderTracking, boolean trackAllocation,

                boolean isRestrictedBackupMode, boolean persistent, Configuration config,

                CompatibilityInfo compatInfo, Map<String, IBinder> services, Bundle coreSettings) {

                CompatibilityInfo compatInfo, Map<String, IBinder> services, Bundle coreSettings,

                String buildSerial) {



            if (services != null) {

                // Setup the service cache in the ServiceManager
@@ -876,6 +880,7 @@ public final class ActivityThread { 
            data.config = config;

            data.compatInfo = compatInfo;

            data.initProfilerInfo = profilerInfo;

            data.buildSerial = buildSerial;

            sendMessage(H.BIND_APPLICATION, data);

        }
@@ -5182,6 +5187,18 @@ public final class ActivityThread { 
            StrictMode.enableDeathOnFileUriExposure();

        }



        // 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 != IApplicationThread.DEBUG_OFF) {

            // XXX should have option to change the port.

            Debug.changeDebugPort(8100);