Backed out changeset 2b54764bcf29 (bug 1860417) for causing mochitest failures on test_setSinkId_after_loop.html. CLOSED TREE

Author: pstanciu

browser/components/resistfingerprinting/test/browser/browser_navigator.js

@@ -20,15 +20,15 @@ const DEFAULT_APPVERSION = {
   linux: "5.0 (X11)",
   win: "5.0 (Windows)",
   macosx: "5.0 (Macintosh)",
-  android: `5.0 (Linux; Android ${osVersion})`,
+  android: `5.0 (Android ${osVersion})`,
   other: "5.0 (X11)",
 };
 
 const SPOOFED_APPVERSION = {
   linux: "5.0 (X11)",
   win: "5.0 (Windows)",
   macosx: "5.0 (Macintosh)",
-  android: "5.0 (Linux; Android 10)",
+  android: "5.0 (Android 10)",
   other: "5.0 (X11)",
 };
 
@@ -103,22 +103,22 @@ const SPOOFED_OSCPU = {
 const DEFAULT_UA_OS = {
   linux: `X11; Linux ${defaultLinuxCpu}`,
   macosx: "Macintosh; Intel Mac OS X 10.15",
-  android: `Linux; Android ${osVersion}; Mobile`,
+  android: `Android ${osVersion}; Mobile`,
   other: `X11; Linux ${defaultLinuxCpu}`,
 };
 
 const SPOOFED_UA_NAVIGATOR_OS = {
   linux: "X11; Linux x86_64",
   win: "Windows NT 10.0; Win64; x64",
   macosx: "Macintosh; Intel Mac OS X 10.15",
-  android: "Linux; Android 10; Mobile",
+  android: "Android 10; Mobile",
   other: "X11; Linux x86_64",
 };
 const SPOOFED_UA_HTTPHEADER_OS = {
   linux: "Windows NT 10.0",
   win: "Windows NT 10.0",
   macosx: "Windows NT 10.0",
-  android: "Linux; Android 10; Mobile",
+  android: "Android 10; Mobile",
   other: "Windows NT 10.0",
 };
 const SPOOFED_HW_CONCURRENCY = 2;

browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js

@@ -35,15 +35,15 @@ const DEFAULT_APPVERSION = {
   linux: "5.0 (X11)",
   win: "5.0 (Windows)",
   macosx: "5.0 (Macintosh)",
-  android: `5.0 (Linux; Android ${osVersion})`,
+  android: `5.0 (Android ${osVersion})`,
   other: "5.0 (X11)",
 };
 
 const SPOOFED_APPVERSION = {
   linux: "5.0 (X11)",
   win: "5.0 (Windows)",
   macosx: "5.0 (Macintosh)",
-  android: "5.0 (Linux; Android 10)",
+  android: "5.0 (Android 10)",
   other: "5.0 (X11)",
 };
 
@@ -118,22 +118,22 @@ const SPOOFED_OSCPU = {
 const DEFAULT_UA_OS = {
   linux: `X11; Linux ${defaultLinuxCpu}`,
   macosx: "Macintosh; Intel Mac OS X 10.15",
-  android: `Linux; Android ${osVersion}; Mobile`,
+  android: `Android ${osVersion}; Mobile`,
   other: `X11; Linux ${defaultLinuxCpu}`,
 };
 
 const SPOOFED_UA_NAVIGATOR_OS = {
   linux: "X11; Linux x86_64",
   win: "Windows NT 10.0; Win64; x64",
   macosx: "Macintosh; Intel Mac OS X 10.15",
-  android: "Linux; Android 10; Mobile",
+  android: "Android 10; Mobile",
   other: "X11; Linux x86_64",
 };
 const SPOOFED_UA_HTTPHEADER_OS = {
   linux: "Windows NT 10.0",
   win: "Windows NT 10.0",
   macosx: "Windows NT 10.0",
-  android: "Linux; Android 10; Mobile",
+  android: "Android 10; Mobile",
   other: "Windows NT 10.0",
 };
 const SPOOFED_HW_CONCURRENCY = 2;

mobile/android/geckoview/build.gradle

@@ -52,8 +52,8 @@ android {
         buildConfigField 'String', "OMNIJAR_NAME", "\"${mozconfig.substs.OMNIJAR_NAME}\"";
 
         // Keep in sync with actual user agent in nsHttpHandler::BuildUserAgent
-        buildConfigField 'String', "USER_AGENT_GECKOVIEW_MOBILE", "\"Mozilla/5.0 (Linux; Android \" + android.os.Build.VERSION.RELEASE + \"; Mobile; rv:\" + ${mozconfig.defines.MOZILLA_UAVERSION} + \") Gecko/\" + ${mozconfig.defines.MOZILLA_UAVERSION} + \" Firefox/\" + ${mozconfig.defines.MOZILLA_UAVERSION}";
-        buildConfigField 'String', "USER_AGENT_GECKOVIEW_TABLET", "\"Mozilla/5.0 (Linux; Android \" + android.os.Build.VERSION.RELEASE + \"; Tablet; rv:\" + ${mozconfig.defines.MOZILLA_UAVERSION} + \") Gecko/\" + ${mozconfig.defines.MOZILLA_UAVERSION} + \" Firefox/\" + ${mozconfig.defines.MOZILLA_UAVERSION}";
+        buildConfigField 'String', "USER_AGENT_GECKOVIEW_MOBILE", "\"Mozilla/5.0 (Android \" + android.os.Build.VERSION.RELEASE + \"; Mobile; rv:\" + ${mozconfig.defines.MOZILLA_UAVERSION} + \") Gecko/\" + ${mozconfig.defines.MOZILLA_UAVERSION} + \" Firefox/\" + ${mozconfig.defines.MOZILLA_UAVERSION}";
+        buildConfigField 'String', "USER_AGENT_GECKOVIEW_TABLET", "\"Mozilla/5.0 (Android \" + android.os.Build.VERSION.RELEASE + \"; Tablet; rv:\" + ${mozconfig.defines.MOZILLA_UAVERSION} + \") Gecko/\" + ${mozconfig.defines.MOZILLA_UAVERSION} + \" Firefox/\" + ${mozconfig.defines.MOZILLA_UAVERSION}";
 
         buildConfigField 'int', 'MIN_SDK_VERSION', mozconfig.substs.MOZ_ANDROID_MIN_SDK_VERSION;
 

netwerk/protocol/http/nsHttpHandler.cpp

@@ -825,7 +825,7 @@ void nsHttpHandler::InitUserAgentComponents() {
   // Gather platform.
   mPlatform.AssignLiteral(
 #if defined(ANDROID)
-      "Linux; Android"
+      "Android"
 #elif defined(XP_WIN)
       "Windows"
 #elif defined(XP_MACOSX)

toolkit/components/resistfingerprinting/nsRFPService.h

@@ -40,8 +40,8 @@
 #  define SPOOFED_OSCPU "Intel Mac OS X 10.15"
 #  define SPOOFED_PLATFORM "MacIntel"
 #elif defined(MOZ_WIDGET_ANDROID)
-#  define SPOOFED_UA_OS "Linux; Android 10; Mobile"
-#  define SPOOFED_APPVERSION "5.0 (Linux; Android 10)"
+#  define SPOOFED_UA_OS "Android 10; Mobile"
+#  define SPOOFED_APPVERSION "5.0 (Android 10)"
 #  define SPOOFED_OSCPU "Linux armv81"
 #  define SPOOFED_PLATFORM "Linux armv81"
 #else
@@ -61,7 +61,7 @@
 // For the HTTP User-Agent header, we use a simpler set of spoofed values
 // that do not reveal the specific desktop platform.
 #if defined(MOZ_WIDGET_ANDROID)
-#  define SPOOFED_HTTP_UA_OS "Linux; Android 10; Mobile"
+#  define SPOOFED_HTTP_UA_OS "Android 10; Mobile"
 #else
 #  define SPOOFED_HTTP_UA_OS "Windows NT 10.0"
 #endif