Merge "Move device serial behing a permission" (8b6456bc) · Commits · e / os / android_frameworks_base

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
		@@ -28398,6 +28398,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;
		@@ -28413,7 +28414,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
		@@ -30888,6 +30888,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;
		@@ -30904,7 +30905,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
		@@ -28470,6 +28470,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;
		@@ -28485,7 +28486,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;
		@@ -519,6 +521,7 @@ public final class ActivityThread {
		boolean persistent;
		Configuration config;
		CompatibilityInfo compatInfo;
		String buildSerial;

		/** Initial values for {@link Profiler}. */
		ProfilerInfo initProfilerInfo;
		@@ -855,7 +858,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
		@@ -880,6 +884,7 @@ public final class ActivityThread {
		data.config = config;
		data.compatInfo = compatInfo;
		data.initProfilerInfo = profilerInfo;
		data.buildSerial = buildSerial;
		sendMessage(H.BIND_APPLICATION, data);
		}

		@@ -5196,6 +5201,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);