diff --git a/build-tools/enumification-helpers/Makefile b/build-tools/enumification-helpers/Makefile
index d78335ac659..b4b71af94ad 100644
--- a/build-tools/enumification-helpers/Makefile
+++ b/build-tools/enumification-helpers/Makefile
@@ -1,12 +1,11 @@
 topdir = ../..
 
-API_LEVEL = 26
-API_LEVEL_NAME = 26
+API_LEVEL = 27
+API_LEVEL_NAME = 27
 
 CSCOMPILE = csc -debug:portable
 
 CONFIGURATION = Debug
-DOCS_DIR=~/android-toolchain/docs/docs-api-$(API_LEVEL_NAME)
 
 CONST_MAPPER_SOURCES = \
 	generate-const-mapping.cs \
@@ -15,20 +14,11 @@ CONST_MAPPER_SOURCES = \
 
 all:: map.ext.csv remaining-int-consts.txt remaining-int-methods-filtered.txt
 
-#enum mappings
+generate-const-list-2.exe: generate-const-list-2.cs
+	$(CSCOMPILE) generate-const-list-2.cs
 
-generate-const-list.exe: generate-const-list.cs
-	$(CSCOMPILE) generate-const-list.cs
-
-const-list-$(API_LEVEL).xml: generate-const-list.exe
-	mono --debug generate-const-list.exe $(DOCS_DIR)/reference/ -v > const-list-$(API_LEVEL).xml || rm const-list-$(API_LEVEL).xml
-
-generate-intermediary-enum-candidates.exe : generate-intermediary-enum-candidates.cs
-	$(CSCOMPILE) generate-intermediary-enum-candidates.cs
-
-#it is obsolete
-intermediary-enum-candidates.xml: generate-intermediary-enum-candidates.exe
-	mono --debug generate-intermediary-enum-candidates.exe $(topdir)/src/Mono.Android/api-$(API_LEVEL).xml.in > intermediary-enum-candidates.xml || rm intermediary-enum-candidates.xml
+const-list-$(API_LEVEL).xml: generate-const-list-2.exe ../../src/Mono.Android/Profiles/*.xml.in
+	mono --debug generate-const-list-2.exe ../../src/Mono.Android/Profiles > const-list-$(API_LEVEL).xml || rm const-list-$(API_LEVEL).xml
 
 generate-const-mapping.exe: $(CONST_MAPPER_SOURCES)
 	$(CSCOMPILE) $(CONST_MAPPER_SOURCES)
@@ -47,28 +37,6 @@ remaining-int-consts.txt: ../../src/Mono.Android/obj/$(CONFIGURATION)/android-$(
 		| sed -e 's/android-[0-9]*/android-XXX/' \
 		> remaining-int-consts.txt
 
-# method mappings
-generate-intermediary-doc-enum-mapping.exe: generate-intermediary-doc-enum-mapping.cs
-	$(CSCOMPILE) generate-intermediary-doc-enum-mapping.cs
-
-generate-enumlist-to-query.exe : generate-enumlist-to-query.cs
-	$(CSCOMPILE) generate-enumlist-to-query.cs
-
-generate-intermediary-method-mapping.exe: generate-intermediary-method-mapping.cs
-	$(CSCOMPILE) generate-intermediary-method-mapping.cs
-
-intermediary-enum-list.txt: generate-enumlist-to-query.exe
-	mono --debug generate-enumlist-to-query.exe const-list-$(API_LEVEL).xml > intermediary-enum-list.txt || rm intermediary-enum-list.txt
-
-intermediary-doc-enum-mapping.tsv: generate-intermediary-doc-enum-mapping.exe intermediary-enum-list.txt
-	mono --debug generate-intermediary-doc-enum-mapping.exe $(DOCS_DIR)/reference intermediary-enum-list.txt > intermediary-doc-enum-mapping.tsv || rm intermediary-doc-enum-mapping.tsv
-
-intermediary-method-mapping.txt: generate-intermediary-method-mapping.exe
-	mono --debug generate-intermediary-method-mapping.exe intermediary-doc-enum-mapping.tsv const-list-$(API_LEVEL).xml $(DOCS_DIR)/reference > intermediary-method-mapping.txt || rm intermediary-method-mapping.txt
-
-intermediary-field-candidates.txt: intermediary-method-mapping.txt
-	grep "#[a-z]" intermediary-method-mapping.txt  | grep -v '('  > intermediary-field-candidates.txt
-
 remaining-int-methods-filtered.txt: remaining-int-methods.txt reduction_rules.txt
 	vi remaining-int-methods.txt -s reduction_rules.txt
 	grep "int[\[ ]" remaining-int-methods.txt > remaining-int-methods-filtered.txt
@@ -78,8 +46,6 @@ remaining-int-methods.txt: $(topdir)/src/Mono.Android/obj/$(CONFIGURATION)/andro
 
 clean::
 	-rm -rf tmp.xml const-list-$(API_LEVEL).xml \
-		generate-const-list.exe generate-const-list.exe.mdb \
-		generate-intermediary-enum-candidates.exe generate-intermediary-enum-candidates.exe.mdb \
+		generate-const-list-2.exe generate-const-list-2.exe.mdb \
 		generate-const-mapping.exe generate-const-mapping.exe.mdb \
 		map.ext.csv intermediate-enum-candidates.xml remaining-int-consts.txt \
-		generate-intermediary-doc-enum-mapping.exe generate-intermediary-doc-enum-mapping.exe.mdb
diff --git a/build-tools/enumification-helpers/enum-conversion-mappings.xml b/build-tools/enumification-helpers/enum-conversion-mappings.xml
index cf03f247104..01a55e6be2b 100644
--- a/build-tools/enumification-helpers/enum-conversion-mappings.xml
+++ b/build-tools/enumification-helpers/enum-conversion-mappings.xml
@@ -573,6 +573,7 @@
   <map package='android.view.accessibility' class='AccessibilityNodeInfo' fields='' prefix='MOVEMENT_GRANULARITY_' enum-name="MovementGranularity" api-level='16' />
   <map package='android.view.accessibility' class='AccessibilityNodeInfo.CollectionInfo' fields='' prefix='SELECTION_MODE_' enum-name="SelectionMode" api-level='21' />
   <map package='android.view.accessibility' class='AccessibilityNodeInfo.RangeInfo' fields='' prefix='RANGE_TYPE_' enum-name="RangeType" />
+  <map package='android.view.accessibility' class='AccessibilityRequestPreparer' prefix='REQUEST_TYPE_' enum-name="AccessibilityRequestTypes" api-level="27" />
   <map package='android.view.accessibility' class='AccessibilityWindowInfo' fields='' prefix='TYPE_' enum-name="AccessibilityWindowType" api-level="21" />
   <map package='android.view.accessibility' class='CaptioningManager.CaptionStyle' fields='' prefix='EDGE_TYPE_' enum-name="CaptionStyles" />
   <map package='android.view' class='Gravity' fields='*' prefix='' enum-name="GravityFlags" is-transient="false" />
@@ -645,11 +646,7 @@
   <map package="android.accessibilityservice" class="AccessibilityService" fields="" prefix="GESTURE_" enum-name="AccessibilityGesture" api-level="16" />
   <map package="android.accessibilityservice" class="AccessibilityService" fields="" prefix="GLOBAL_ACTION_" enum-name="GlobalAction" api-level="16" />
   <map package='android.app' class='Notification' fields='' prefix='PRIORITY_' enum-name="NotificationPriority" api-level="16" />
-  <!--
-  This had to be explicitly removed from auto-generation. see map.csv for the reason.
-  -->
-  <!--
-  map package="android.content.pm" class="PackageInfo" fields="" prefix="REQUESTED_PERMISSION_" enum-name="RequestedPermission" api-level="16" / -->
+  <map package="android.content.pm" class="PackageInfo" fields="" prefix="REQUESTED_PERMISSION_" enum-name="RequestedPermission" api-level="16" />
   <map package='android.media' class='MediaCodecInfo$CodecCapabilities' fields='' prefix='COLOR_' enum-name="MediaCodecCapabilities" api-level="16" />
   <!-- for those constants category, see http://tools.oesf.biz/android-4.1.1_r1.0/xref/frameworks/base/media/java/android/media/MediaCodecInfo.java -->
   <map package='android.media' class='MediaCodecInfo$CodecProfileLevel' fields='.*Level.*' enum-name="MediaCodecProfileLevel" api-level="16" />
@@ -803,7 +800,7 @@
     <field java='ACTION_DROP' managed='Drop' />
   </map>
   <map package='android.view' class='DragEvent' prefix='ACTION_DRAG_' enum-name='DragAction' is-transient='false' />
-  <map package='android.view' class='HapticFeedbackConstants' fields='CLOCK_TICK CONTEXT_CLICK KEYBOARD_TAP LONG_PRESS VIRTUAL_KEY' enum-name='FeedbackConstants' is-transient='true' />
+  <map package='android.view' class='HapticFeedbackConstants' fields='CLOCK_TICK CONTEXT_CLICK KEYBOARD_PRESS KEYBOARD_RELEASE KEYBOARD_TAP LONG_PRESS VIRTUAL_KEY TEXT_HANDLE_MOVE VIRTUAL_KEY_RELEASE' enum-name='FeedbackConstants' is-transient='true' />
   <map package='android.view' class='HapticFeedbackConstants' prefix='FLAG_' enum-name='FeedbackFlags' is-transient='true' />
   <map package='android.view' class='KeyCharacterMap' fields='ALPHA BUILT_IN_KEYBOARD FULL NUMERIC PREDICTIVE SPECIAL_FUNCTION VIRTUAL_KEYBOARD' enum-name='KeyboardType' is-transient='false' />
   <map package='android.view' class='KeyCharacterMap' prefix='MODIFIER_BEHAVIOR_' enum-name='KeyModifierBehavior' is-transient='false' />
@@ -844,6 +841,7 @@
   <map package='android.webkit' class='WebView' prefix='RENDERER_PRIORITY_' enum-name='RendererPriority' is-transient='false' />
   <map package='android.webkit' class='WebView.HitTestResult' fields='*' enum-name='HitTestResult' is-transient='false' />
   <map package='android.webkit' class='WebViewClient' prefix='ERROR_' enum-name='ClientError' is-transient='false' />
+  <map package='android.webkit' class='WebViewClient' prefix='SAFE_BROWSING_THREAT_' enum-name='SafeBrowsingThreat' is-transient='false' />
   <map package='android.widget' class='AbsListView' prefix='CHOICE_MODE_' enum-name='ChoiceMode' is-transient='false' />
   <map package='android.widget' class='AbsListView' prefix='TRANSCRIPT_MODE_' enum-name='TranscriptMode' is-transient='false' />
   <map package='android.widget' class='AdapterView' prefix='ITEM_VIEW_TYPE_' enum-name='ItemViewType' is-transient='false' />
@@ -940,7 +938,6 @@
   -->
   <map package='android.provider' class='Browser' prefix='HISTORY_PROJECTION_' enum-name='HistoryProjection' is-transient='false' />
   <map package='android.provider' class='Browser' prefix='SEARCHES_PROJECTION_' enum-name='SearchesProjection' is-transient='false' />
-  <map package='android.provider' class='Browser' prefix='SEARCHES_PROJECTION_' enum-name='HistoryProjection' is-transient='false' />
   <map package='android.provider' class='ContactsContract.ProviderStatus' prefix='STATUS_' enum-name='ContactsProviderStatus' is-transient='false' />
 
   <!-- New in API Level 24 -->
diff --git a/build-tools/enumification-helpers/generate-const-list-2.cs b/build-tools/enumification-helpers/generate-const-list-2.cs
new file mode 100644
index 00000000000..d44a336568c
--- /dev/null
+++ b/build-tools/enumification-helpers/generate-const-list-2.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+
+
+public class Driver
+{
+	class Constant {
+		public string Package, ParentType, Level, FieldType, Name, Value;
+		public bool IsTypeInterface;
+	}
+	
+	static string GetApiLevel (string file)
+	{
+		Console.Error.WriteLine ($"[{file}]");
+		return file.Substring (0, file.Length - ".xml.in".Length).Substring ("api-".Length);
+	}
+	
+	public static void Main (string [] args)
+	{
+		var docs = args.SelectMany (a => Directory.GetFiles (a, "api-*.xml.in"))
+			.Select (file => XDocument.Load (file, LoadOptions.SetBaseUri));
+		Dictionary<string,string> levels = docs.Select (doc => new { Doc = doc.BaseUri, File = Path.GetFileName (doc.BaseUri) })
+			.Select (p => new { Doc = p.Doc, Level = GetApiLevel (p.File) })
+			.ToDictionary (p => p.Doc, p => p.Level);
+		var results = docs.Select (doc => doc.Root.Elements ("package"))
+			.SelectMany (p => p.Elements ())
+			.SelectMany (t => t.Elements ("field"))
+			.Where (f => f.Attribute ("type")?.Value == "int")
+			.Where (f => f.Attribute ("final")?.Value == "true" && f.Attribute ("value") != null)
+			.ToArray ();
+		var consts = results.Select (f => new Constant {
+			Package = f.Parent.Parent.Attribute ("name").Value,
+			ParentType = f.Parent.Attribute ("name").Value,
+			IsTypeInterface = f.Parent.Name.LocalName == "interface",
+			Name = f.Attribute ("name").Value,
+			FieldType = f.Attribute ("type").Value,
+			Value = f.Attribute ("value").Value,
+			Level = levels [f.Document.BaseUri] 
+			})
+			.OrderBy (c => c.Package)
+			.ThenBy (c => c.ParentType)
+			.ThenBy (c => c.Name)
+			.ThenBy (c => c.Level)
+			.ToArray ();
+
+		for (int i = 1; i < consts.Length; i++) {
+			int x = 1;
+			while (consts [i - x].Name == consts [i].Name && consts [i - x].ParentType == consts [i].ParentType && consts [i - x].Package == consts [i].Package && consts [i - x].Value != consts [i].Value) {
+				Console.Error.WriteLine ("Overwrite field value: {0}.{1}.{2}: {3} (at {4}) -> {5} (at {6})", consts [i - x].Package, consts [i - x].ParentType, consts [i - x].Name, consts [i - x].Value, consts [i - x].Level, consts [i].Value, consts [i].Level);
+				consts [i - x].Value = consts [i].Value;
+				x++;
+			}
+		}
+
+		var fields = new List<string> ();
+		string package = null, type = null;
+		var writer = XmlWriter.Create (Console.Out, new XmlWriterSettings { Indent = true });
+		writer.WriteStartElement ("enums");
+		foreach (var c in consts) {
+			if (c.Package != package) {
+				if (package != null) {
+					writer.WriteEndElement (); // type
+					type = null;
+					writer.WriteEndElement (); // package
+				}
+				package = c.Package;
+				writer.WriteStartElement ("package");
+				writer.WriteAttributeString ("name", package);
+			}
+			if (c.ParentType != type) {
+				if (type != null)
+					writer.WriteEndElement ();
+				type = c.ParentType;
+				writer.WriteStartElement (c.IsTypeInterface ? "interface" : "class");
+				writer.WriteAttributeString ("name", c.ParentType);
+				fields.Clear ();
+			}
+			if (fields.Contains (c.Name))
+				continue;
+			fields.Add (c.Name);
+			writer.WriteStartElement ("const");
+			writer.WriteAttributeString ("type", c.FieldType);
+			writer.WriteAttributeString ("name", c.Name);
+			writer.WriteAttributeString ("api-level", c.Level);
+			writer.WriteString (c.Value);
+			writer.WriteEndElement ();
+		}
+		writer.Close ();
+	}
+}
diff --git a/build-tools/enumification-helpers/generate-const-list.cs b/build-tools/enumification-helpers/generate-const-list.cs
deleted file mode 100644
index 4384c3a7bfe..00000000000
--- a/build-tools/enumification-helpers/generate-const-list.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using System.Text;
-using System.Xml;
-
-public class Driver
-{
-	public static void Main (string [] args)
-	{
-		new Driver ().Run (args);
-	}
-
-	const string android_ns = "http://schemas.android.com/apk/res/android";
-
-	List<string> atts = new List<string> ();
-	TextWriter fs1;
-
-	TextWriter output = Console.Out;
-	string doc_base;
-
-	bool verbose;
-
-	XmlDocument GetDocument (string file)
-	{
-		try {
-			return DoGetDocument (file);
-		} catch (Exception ex) {
-			if (verbose)
-				Console.Error.WriteLine ("Processing " + file);
-			throw;
-		}
-	}
-
-	XmlDocument DoGetDocument (string file)
-	{
-		string abs = Path.Combine (Path.GetFullPath (doc_base), file);
-		string outfile = Path.Combine (Directory.GetParent (new Uri (Assembly.GetEntryAssembly ().CodeBase).LocalPath).ToString (), "tmp.xml");
-		string args = "--html --nsclean --insert --debugent --nonet --noent --recover --dropdtd --nocatalogs --output " + outfile + " --xmlout " + abs;
-		// FIXME: I cannot enable RedirectStandardError = true due to some mono bug.
-		Process proc = Process.Start (new ProcessStartInfo ("xmllint", args) { /*RedirectStandardError = true,*/ UseShellExecute = false });
-		proc.WaitForExit ();
-		if (proc.ExitCode != 0)
-			throw new Exception ("xmllint failed");
-
-		var doc = new XmlDocument ();
-		string s = File.ReadAllText ("tmp.xml");
-		s = s.Replace ("<html>", "<html xmlns:android='dummy'>");
-		s = s.Replace ("<!-- /New Search>", "<!-- /New Search -->"); // Why, Google. Why.
-		s = s.Replace ("<application ...=\"\">", "<application xxx=\"\">"); // ...
-		s = s.Replace (@" ..="""">setChannelMask(int)</a>",  @" __="""">setChannelMask(int)</a>"); // Really?!
-		s = s.Replace (@" ...=""""", @" __=""...""");
-		doc.Load (new XmlTextReader (new StringReader (s)) { Namespaces = false });
-		return doc;
-	}
-
-	public void Run (string [] args)
-	{
-		output.WriteLine ("<enums>");
-		doc_base = args [0];
-		verbose = args.Any (a => a == "-v" || a == "--verbose");
-
-		foreach (var rawPkgName in File.ReadAllLines (Path.Combine (Path.GetFullPath (doc_base), "packages.html"))) {
-			if (rawPkgName.Length == 0)
-				continue;
-			if (rawPkgName.StartsWith ("com.android.internal"))
-				continue;
-
-			output.WriteLine ("  <package name='{0}'>", rawPkgName);
-			string pkgName = rawPkgName.Replace ('.', '/');
-
-			if (pkgName.StartsWith ("org") && pkgName != "org/xmlpull/v1") {
-				output.WriteLine ("  </package>");
-				continue;
-			}
-			
-Console.Error.WriteLine ("Package " + pkgName);
-			string pkgfile = pkgName + "/" + "package-summary.html";
-			var pkgdoc = GetDocument (pkgfile);
-			foreach (XmlElement classes in GetTypeNodes (pkgdoc)) {
-				bool isInterface = classes.SelectSingleNode ("h2").InnerText == "Interfaces";
-Console.Error.WriteLine ("Class/Interface");
-				foreach (XmlElement cls in classes.SelectNodes ("ul/li"))
-					ProcessClass (cls, pkgName, isInterface);
-			}
-			output.WriteLine ("  </package>");
-		}
-		output.WriteLine ("</enums>");
-	}
-	
-	IEnumerable<XmlElement> GetTypeNodes (XmlDocument pkgdoc)
-	{
-		foreach (XmlElement e in pkgdoc.SelectNodes ("//div[@id='classes-nav' or @id='interfaces-nav']/ul/li"))
-			yield return e;
-		foreach (XmlElement e in pkgdoc.SelectNodes ("//ul[@data-reference-resources]/li"))
-			yield return e;
-	}
-	
-	void ProcessClass (XmlElement cls, string pkgName, bool isInterface)
-	{
-		StringWriter output = new StringWriter ();
-		bool existed = false;
-
-		string className = cls.InnerText;
-		string classNameNonGeneric = className.IndexOf ('<') > 0 ? className.Substring (0, className.IndexOf ('<')) : className;
-Console.Error.WriteLine ("  Class " + className + " from " + pkgName + "/" + classNameNonGeneric + ".html");
-		output.WriteLine ("    <{0} name='{1}' api-level='{2}'>", isInterface ? "interface" : "class", classNameNonGeneric, cls.GetAttribute ("class").Substring ("api apilevel-".Length));
-		var clsdoc = GetDocument (pkgName + "/" + classNameNonGeneric + ".html");
-		var constLinks = clsdoc.SelectNodes ("//h2[text()='Constants']/following-sibling::a[@name]");
-		var values = new Dictionary<string,XmlElement> ();
-		foreach (XmlElement constLink in constLinks) {
-			XmlElement details = constLink.SelectSingleNode ("following-sibling::div[1]") as XmlElement;
-			values [constLink.GetAttribute ("name")] = details;
-		}
-		var consts = clsdoc.SelectSingleNode ("//table[@id='constants'][1]");
-		if (consts == null)
-			Console.Error.WriteLine ("No constants in " + className);
-		else {
-			foreach (XmlElement constr in consts.SelectNodes ("tr[@class]")) {
-				string constClassAtt = constr.GetAttribute ("class");
-				string constType = constr.SelectSingleNode ("td[1]").InnerText;
-
-				if (constType != "int")
-					continue;
-
-				string constName = (constr.SelectSingleNode ("td[2]/code") ?? constr.SelectSingleNode ("td[2]")).InnerText;
-				var descDiv = values [constName];
-				var apiLevel = constClassAtt.Substring (constClassAtt.LastIndexOf ('-') + 1);
-				// FIXME: this is really hacky. Since Google made buggy changes to their HTML documents and their format miss correct API level for new stuff (or whatever), it now does not fill API Level there.
-				if (string.IsNullOrEmpty (apiLevel))
-					apiLevel = "24";
-				string value;
-				var valueSpan =
-							descDiv.SelectSingleNode (".//div[@class='jd-tagdata']/span[text()='Constant Value: ']/following-sibling::span");
-				if (valueSpan != null)
-					value = valueSpan.InnerText.Trim ();
-				else {
-					valueSpan = descDiv.SelectSingleNode (".//p[contains (text(), 'Constant Value:')]");
-					var splitValues = valueSpan.InnerText.Replace (" ", string.Empty).Split (new char [] {'\n'}, StringSplitOptions.RemoveEmptyEntries);
-					value = splitValues [1];
-				}
-				output.WriteLine ("      <const type='{0}' name='{1}' api-level='{2}'>{3}</const>",
-					constType,
-					constName,
-					apiLevel,
-					value);
-				existed = true;
-			}
-		}
-		output.WriteLine ("    </{0}>", isInterface ? "interface" : "class");
-
-		output.Close ();		
-		if (existed)
-			this.output.Write (output);
-	}
-}
diff --git a/build-tools/enumification-helpers/methodmap.ext.csv b/build-tools/enumification-helpers/methodmap.ext.csv
index 5a3f5a80007..320c7204e76 100644
--- a/build-tools/enumification-helpers/methodmap.ext.csv
+++ b/build-tools/enumification-helpers/methodmap.ext.csv
@@ -1756,3 +1756,25 @@
 26, android.widget, VideoView, setAudioFocusRequest, focusGain, Android.Media.AudioFocus
 
 26, java.util, Calendar.Builder, set, field, Java.Util.CalendarField
+
+27, android.content.pm, PackageInstaller.SessionInfo, getInstallLocation, return, Android.Content.PM.PackageInstallLocation
+27, android.content.pm, PackageInstaller.SessionParams, setInstallLocation, installLocation, Android.Content.PM.PackageInstallLocation
+27, android.content.pm, PackageInstaller.SessionInfo, getMode, return, Android.Content.PM.PackageInstallMode
+27, android.content.pm, PackageInstaller.SessionParams, ctor, mode, Android.Content.PM.PackageInstallMode
+// It was a bit too late to notice this method, or it was added after our final enumification effort for API Level 26.
+// 26, android.content.pm, PackageManager, setApplicationCategory, categoryHint, Android.Content.PM.ApplicationCategories
+// There is AssetInt property (of int) which was removed at API Level 21. We don't/can't enumify it.
+
+27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, addOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags
+27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, removeOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags
+27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, setOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags
+27, android.database.sqlite, SQLiteDatabase.OpenParams, getOpenFlags, return, Android.Database.Sqlite.DatabaseOpenFlags
+
+// Android reference doc says it was added at 24 but I'm 100% sure it wasn't. They just add members and docs, and claims that they were part of 24.
+24, android.icu.util, TimeZone, getTimeZone, type, Android.Icu.Util.TimeZoneType
+
+27, android.media, MediaMetadataRetriever, getScaledFrameAtTime, option, Android.Media.Option
+// 27, android.os, SharedMemory, map, prot, ... is part of OsConstants.
+27, android.view.accessibility, AccessibilityRequestPreparer, ctor, requestTypes, Android.Views.Accessibility.AccessibilityRequestTypes
+// android.view.ViewStructure.setInputType never appeared before - it seems Google keeps breaking API on the docs, which is rather likely they are filling doc bits by fixing their tools.
+27, android.webkit.WebViewClient, onSafeBrowsingHit, threatType, Android.Webkit.SafeBrowsingThreat
diff --git a/build-tools/enumification-helpers/remaining-int-consts.txt b/build-tools/enumification-helpers/remaining-int-consts.txt
index 12b4030c244..c529e37d50d 100644
--- a/build-tools/enumification-helpers/remaining-int-consts.txt
+++ b/build-tools/enumification-helpers/remaining-int-consts.txt
@@ -1430,7 +1430,6 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.Animations.Animation.cs:		public const int StartOnFirstFrame = (int) -1;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.Display.cs:		public const int DefaultDisplay = (int) 0;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.Display.cs:		public const int InvalidDisplay = (int) -1;
-../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.Display.cs:		public const int StateDozing = (int) 3;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IMenu.cs:		public const int First = (int) 1;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IMenu.cs:		public const int None = (int) 0;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IMenu.cs:		public const int SupportedModifiersMask = (int) 69647;
@@ -1440,7 +1439,6 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IWindowManager.cs:		public const int LastApplicationWindow = (int) 99;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IWindowManager.cs:		public const int LastSubWindow = (int) 1999;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IWindowManager.cs:		public const int LastSystemWindow = (int) 2999;
-../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IWindowManager.cs:		public const int TypeKeyguard = (int) 2004;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.KeyCharacterMap.cs:		public const int CombiningAccent = (int) -2147483648;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.KeyCharacterMap.cs:		public const int CombiningAccentMask = (int) 2147483647;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.KeyCharacterMap.cs:			public const int MetaLength = (int) 4;
@@ -1464,7 +1462,6 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.View.cs:		public const int MeasuredStateMask = (int) -16777216;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.View.cs:		public const int MeasuredStateTooSmall = (int) 16777216;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.View.cs:		public const int NoId = (int) -1;
-../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.View.cs:		public const int TextAlignmentResolvedDefault = (int) 131072;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewGroup.cs:		protected const int ClipToPaddingMask = (int) 34;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewGroup.cs:			public const int FillParent = (int) -1;
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewGroup.cs:			public const int MatchParent = (int) -1;
diff --git a/build-tools/enumification-helpers/remaining-int-methods-filtered.txt b/build-tools/enumification-helpers/remaining-int-methods-filtered.txt
index 2b489f5fa78..916dc06699c 100644
--- a/build-tools/enumification-helpers/remaining-int-methods-filtered.txt
+++ b/build-tools/enumification-helpers/remaining-int-methods-filtered.txt
@@ -17,10 +17,9 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.FragmentHostCallback.cs: public virtual unsafe int OnGetWindowAnimations ()
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobInfo.cs: public virtual unsafe int ClipGrantFlags {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobParameters.cs: public virtual unsafe int ClipGrantFlags {
-../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobScheduler.cs: public abstract int Enqueue (Android.App.Job.JobInfo p0, Android.App.Job.JobWorkItem p1);
-../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobScheduler.cs: public override unsafe int Enqueue (Android.App.Job.JobInfo p0, Android.App.Job.JobWorkItem p1)
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobScheduler.cs: public abstract int Enqueue (Android.App.Job.JobInfo job, Android.App.Job.JobWorkItem work);
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobScheduler.cs: public override unsafe int Enqueue (Android.App.Job.JobInfo job, Android.App.Job.JobWorkItem work)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.NotificationChannel.cs: public unsafe int LightColor {
-../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.NotificationChannel.cs: public unsafe int LockscreenVisibility {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Notification.cs: public int Color {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Notification.cs: public int LedARGB {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Notification.cs: public int LedOffMS {
@@ -54,12 +53,15 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageItemInfo.cs: public int Banner {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public abstract Android.Graphics.Drawables.Drawable GetUserBadgedDrawableForDensity (Android.Graphics.Drawables.Drawable drawable, Android.OS.UserHandle user, Android.Graphics.Rect badgeLocation, int badgeDensity);
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public abstract int InstantAppCookieMaxBytes {
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public abstract void SetApplicationCategory(string packageName, int categoryHint);
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public override unsafe Android.Graphics.Drawables.Drawable GetUserBadgedDrawableForDensity (Android.Graphics.Drawables.Drawable drawable, Android.OS.UserHandle user, Android.Graphics.Rect badgeLocation, int badgeDensity)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public override unsafe int InstantAppCookieMaxBytes {
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public override unsafe void SetApplicationCategory(string packageName, int categoryHint)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PermissionGroupInfo.cs: public int Priority {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.ResolveInfo.cs: public int Priority {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.ShortcutInfo.cs: public unsafe int Rank {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.ShortcutInfo.cs: public virtual unsafe Android.Content.PM.ShortcutInfo.Builder SetRank (int rank)
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.Res.AssetManager.cs: public unsafe int AssetInt {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.Res.ColorStateList.cs: public virtual unsafe int DefaultColor {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.Res.ColorStateList.cs: public virtual unsafe int GetColorForState (, Android.Graphics.Color defaultColor)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.RestrictionEntry.cs: public unsafe RestrictionEntry (string key, int selectedInt)
@@ -82,7 +84,11 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics._Color.cs: public static unsafe void RGBToHSV (int red, int green, int blue, float[] hsv)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics._Color.cs: public virtual unsafe float GetComponent (int component)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics._Color.cs: public virtual unsafe int ToArgb ()
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public abstract float GetMaxValue (int component);
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public abstract float GetMinValue (int component);
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public override unsafe float GetMaxValue (int component)
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public override unsafe float GetMaxValue (int component)
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public override unsafe float GetMinValue (int component)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public override unsafe float GetMinValue (int component)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.Drawables.GradientDrawable.cs: public virtual unsafe int[] GetColors ()
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.Drawables.LayerDrawable.cs: public virtual unsafe int AddLayer (Android.Graphics.Drawables.Drawable dr)
@@ -329,12 +335,15 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.ExifInterface.cs: public virtual unsafe  (string tag, int defaultValue)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.JetPlayer.cs: public int NbSegments {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.JetPlayer.cs: public int Paused {
-../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public int P1 {
-../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public int P2 {
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public int Arg {
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public int Event {
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public MediaCasEventArgs (Android.Media.MediaCas mediaCas, int e, int arg, byte[] data)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public static unsafe bool IsSystemIdSupported (int CA_system_id)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public unsafe MediaCas (int CA_system_id)
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public unsafe void OnEvent (Android.Media.MediaCas mediaCas, int e, int arg, byte[] data)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public unsafe void RefreshEntitlements (int refreshType, byte[] refreshData)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public unsafe void SendEvent (int e, int arg, byte[] data)
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public void OnEvent (Android.Media.MediaCas mediaCas, int e, int arg, byte[] data)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCodec.cs: 	public unsafe int EncryptBlocks {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCodec.cs: 	public unsafe int SkipBlocks {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCodec.cs: 	public unsafe Pattern (int blocksToEncrypt, int blocksToSkip)
@@ -344,7 +353,6 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaDescrambler.cs: public unsafe MediaDescrambler (int CA_system_id)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaDrm.cs: public int Extra {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaDrm.cs: public unsafe int RequestType {
-../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaPlayer.cs: public int P1 {
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaRouter.cs: public virtual unsafe void RequestUpdateVolume (int direction)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaSync.cs: public ErrorEventArgs (Android.Media.MediaSync sync, Android.Media.MediaSyncErrorCode what, int extra)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaSync.cs: public int Extra {
@@ -422,6 +430,8 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.Process.cs: public static unsafe int[] GetExclusiveCores ()
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.ProxyFileDescriptorCallback.cs: public virtual unsafe int OnRead (long offset, , byte[] data)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.ProxyFileDescriptorCallback.cs: public virtual unsafe int OnWrite (long offset, , byte[] data)
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.SharedMemory.cs: public unsafe bool SetProtect (int prot)
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.SharedMemory.cs: public unsafe Java.Nio.ByteBuffer Map (int prot, , )
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.TestLooperManager.cs: public virtual unsafe bool HasMessages (Android.OS.Handler h, Java.Lang.Object @object, int what)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.VibrationEffect.cs: public static unsafe Android.OS.VibrationEffect CreateOneShot (long milliseconds, int amplitude)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.VibrationEffect.cs: public static unsafe Android.OS.VibrationEffect CreateWaveform (long[] timings, int[] amplitudes, )
@@ -531,9 +541,11 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewDebug.cs: public override unsafe int Mask ()
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewGroup.cs: public virtual unsafe void OnNestedPreScroll (Android.Views.View target, , int[] consumed)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public abstract void SetDimens (int left, ,   , );
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public abstract void SetInputType (int inputType);
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public abstract void SetText (Java.Lang.ICharSequence text, int selectionStart, int selectionEnd);
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public abstract void SetTextLines (int[] charOffsets, int[] baselines);
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public override unsafe void SetDimens (int left, ,   , )
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public override unsafe void SetInputType (int inputType)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public override unsafe void SetText (Java.Lang.ICharSequence text, int selectionStart, int selectionEnd)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public override unsafe void SetTextLines (int[] charOffsets, int[] baselines)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public void SetText (string text, int selectionStart, int selectionEnd)
@@ -672,6 +684,8 @@
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Net.Socket.cs: public virtual unsafe void SetSoLinger (bool on, int linger)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Net.URLConnection.cs: public virtual unsafe int GetHeaderFieldInt (string name, int Default)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Nio.Channels.AsynchronousChannelGroup.cs: public static unsafe Java.Nio.Channels.AsynchronousChannelGroup WithFixedThreadPool (int nThreads, Java.Util.Concurrent.IThreadFactory threadFactory)
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Nio.Channels.Spi.AsynchronousChannelProvider.cs: public abstract Java.Nio.Channels.AsynchronousChannelGroup OpenAsynchronousChannelGroup (int nThreads, Java.Util.Concurrent.IThreadFactory threadFactory);
+../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Nio.Channels.Spi.AsynchronousChannelProvider.cs: public override unsafe Java.Nio.Channels.AsynchronousChannelGroup OpenAsynchronousChannelGroup (int nThreads, Java.Util.Concurrent.IThreadFactory threadFactory)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Security.Cert.X509CertSelector.cs: public virtual unsafe void AddSubjectAlternativeName (int type, byte[] name)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Security.Cert.X509CertSelector.cs: public virtual unsafe void AddSubjectAlternativeName (int type, string name)
 ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Sql.BatchUpdateException.cs: public unsafe BatchUpdateException (int[] updateCounts)
diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility
index c050ba3c124..6a262943294 160000
--- a/external/xamarin-android-api-compatibility
+++ b/external/xamarin-android-api-compatibility
@@ -1 +1 @@
-Subproject commit c050ba3c124f628bee550756512a9ea7fbf4b4b7
+Subproject commit 6a26294329428a1369462bba32e91d5c83164994
diff --git a/src/Mono.Android/Android.Content.PM/PackageInfo.cs b/src/Mono.Android/Android.Content.PM/PackageInfo.cs
deleted file mode 100644
index da06dfddcd9..00000000000
--- a/src/Mono.Android/Android.Content.PM/PackageInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#if ANDROID_16
-using System;
-
-namespace Android.Content.PM
-{
-	public partial class PackageInfo
-	{
-		[Obsolete]
-		public const RequestedPermission RequestedPermissionGranted = RequestedPermission.Granted;
-
-		[Obsolete]
-		public const RequestedPermission RequestedPermissionRequired = RequestedPermission.Required;
-	}
-}
-#endif
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index 2d5140a68d6..584a9f0662e 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -147,7 +147,6 @@
     <Compile Include="Android.Content\CursorLoader.cs" />
     <Compile Include="Android.Content\GrantUriPermissionAttribute.cs" />
     <Compile Include="Android.Content\Intent.cs" />
-    <Compile Include="Android.Content.PM\PackageInfo.cs" />
     <Compile Include="Android.Content.Res\IXmlResourceParser.cs" />
     <Compile Include="Android.Graphics\AndroidBitmapInfo.cs" />
     <Compile Include="Android.Graphics\Bitmap.cs" />
diff --git a/src/Mono.Android/map.csv b/src/Mono.Android/map.csv
index 85e9464d300..dc707d02948 100644
--- a/src/Mono.Android/map.csv
+++ b/src/Mono.Android/map.csv
@@ -8,12 +8,6 @@
 1,Android.Media.Stream,System,android/media/AudioManager.STREAM_SYSTEM,1
 1,Android.Media.Stream,VoiceCall,android/media/AudioManager.STREAM_VOICE_CALL,0
 
-// Users SHOULD NOT use Android.Renderscripts.Mesh as it's UNDOCUMENTED.
-// These enums cannot be generated because they are NOT documented.
-11,Android.Renderscripts.TriangleFlags, Color, android/renderscript/Mesh$TriangleMeshBuilder.COLOR,1
-11,Android.Renderscripts.TriangleFlags, Normal, android/renderscript/Mesh$TriangleMeshBuilder.NORMAL,2
-11,Android.Renderscripts.TriangleFlags, Texture0, android/renderscript/Mesh$TriangleMeshBuilder.TEXTURE_0,256
-
 // They are based on either obsolete or wrong API.
 // They used to be in ListView, so we had mappings to them.
 // Then they moved to AbsListView, and at that stage we created duplicate-ish enums for these constants.
@@ -29,22 +23,6 @@
 1,Android.Widget.AbsListViewChoiceMode,None,android/widget/AbsListView.CHOICE_MODE_NONE,0
 1,Android.Widget.AbsListViewChoiceMode,Single,android/widget/AbsListView.CHOICE_MODE_SINGLE,1
 
-// dropped at API Level 23.
-0,Android.Provider.HistoryProjection,BookmarkIndex,android/provider/Browser.HISTORY_PROJECTION_BOOKMARK_INDEX,4
-0,Android.Provider.HistoryProjection,DateIndex,android/provider/Browser.HISTORY_PROJECTION_DATE_INDEX,3
-0,Android.Provider.HistoryProjection,FaviconIndex,android/provider/Browser.HISTORY_PROJECTION_FAVICON_INDEX,6
-0,Android.Provider.HistoryProjection,IdIndex,android/provider/Browser.HISTORY_PROJECTION_ID_INDEX,0
-0,Android.Provider.HistoryProjection,TitleIndex,android/provider/Browser.HISTORY_PROJECTION_TITLE_INDEX,5
-0,Android.Provider.HistoryProjection,UrlIndex,android/provider/Browser.HISTORY_PROJECTION_URL_INDEX,1
-0,Android.Provider.HistoryProjection,VisitsIndex,android/provider/Browser.HISTORY_PROJECTION_VISITS_INDEX,2
-0,Android.Provider.SearchesProjection,DateIndex,android/provider/Browser.SEARCHES_PROJECTION_DATE_INDEX,2
-0,Android.Provider.SearchesProjection,SearchIndex,android/provider/Browser.SEARCHES_PROJECTION_SEARCH_INDEX,1
-// This specific "Required" is removed at API Level 23, but "Granted"
-// still exists. We cannot define the same enums in different
-// spaces, hence entire generation of this enum is removed :-(
-16,Android.Content.PM.RequestedPermission,Required,android/content/pm/PackageInfo.REQUESTED_PERMISSION_REQUIRED,1
-16,Android.Content.PM.RequestedPermission,Granted,android/content/pm/PackageInfo.REQUESTED_PERMISSION_GRANTED,2
-
 
 // explicitly removed as obsolete consts.
 0,,,android/hardware/SensorManager.DATA_X,0
@@ -71,53 +49,34 @@
 0,,,android/view/Surface.FX_SURFACE_MASK,98304
 0,,,android/view/Surface.FX_SURFACE_NORMAL,0
 
-18,Android.Hardware.Location.GeofenceTransition,Entered,android/hardware/location/GeofenceHardware.GEOFENCE_ENTERED,1
-18,Android.Hardware.Location.GeofenceTransition,Exited,android/hardware/location/GeofenceHardware.GEOFENCE_EXITED,2
-18,Android.Hardware.Location.GeofenceTransition,Failure,android/hardware/location/GeofenceHardware.GEOFENCE_FAILURE,5
-18,Android.Hardware.Location.GeofenceTransition,Success,android/hardware/location/GeofenceHardware.GEOFENCE_SUCCESS,0
-18,Android.Hardware.Location.GeofenceTransition,Uncertain,android/hardware/location/GeofenceHardware.GEOFENCE_UNCERTAIN,4
-18,Android.Hardware.Location.GeofenceError,IdExists,android/hardware/location/GeofenceHardware.GEOFENCE_ERROR_ID_EXISTS,2
-18,Android.Hardware.Location.GeofenceError,IdUnknown,android/hardware/location/GeofenceHardware.GEOFENCE_ERROR_ID_UNKNOWN,3
-18,Android.Hardware.Location.GeofenceError,InvalidTransition,android/hardware/location/GeofenceHardware.GEOFENCE_ERROR_INVALID_TRANSITION,4
-18,Android.Hardware.Location.GeofenceError,TooManyGeofences,android/hardware/location/GeofenceHardware.GEOFENCE_ERROR_TOO_MANY_GEOFENCES,1
-18,Android.Hardware.Location.GeofenceMonitoringType,GpsHardware,android/hardware/location/GeofenceHardware.MONITORING_TYPE_GPS_HARDWARE,0
-18,Android.Hardware.Location.GeofenceMonitorStatus,CurrentlyAvailable,android/hardware/location/GeofenceHardware.MONITOR_CURRENTLY_AVAILABLE,0
-18,Android.Hardware.Location.GeofenceMonitorStatus,CurrentlyUnavailable,android/hardware/location/GeofenceHardware.MONITOR_CURRENTLY_UNAVAILABLE,1
-18,Android.Hardware.Location.GeofenceMonitorStatus,Unsupported,android/hardware/location/GeofenceHardware.MONITOR_UNSUPPORTED,2
 
 
-// FIXME: They had better be converted to enums, they are missed ones. But cannot simply add without API changes.
 
-//18,Android.Util.DisplayMetricsDensity,None,android/graphics/Bitmap.DENSITY_NONE,0
-//14,Android.Views.GravityFlags, Start, android/view/Gravity.START, 14
-//1,Android.Views.WindowManagerTypes, FirstApplicationWindow, android/view/WindowManager$LayoutParams.FIRST_APPLICATION_WINDOW, 1
-//1,Android.Views.WindowManagerTypes, FirstSubWindow, android/view/WindowManager$LayoutParams.FIRST_SUB_WINDOW, 1000
-//1,Android.Views.WindowManagerTypes, FirstSystemWindow, android/view/WindowManager$LayoutParams.FIRST_SYSTEM_WINDOW, 2000
-//1,Android.Views.WindowManagerTypes, LastApplicationWindow, android/view/WindowManager$LayoutParams.LAST_APPLICATION_WINDOW, 99
-//1,Android.Views.WindowManagerTypes, LastSubWindow, android/view/WindowManager$LayoutParams.LAST_SUB_WINDOW, 1999
-//1,Android.Views.WindowManagerTypes, LastSystemWindow, android/view/WindowManager$LayoutParams.LAST_SYSTEM_WINDOW, 2999
-//11,Android.Views.KeyEventFlags, Fallback, android/view/KeyEvent.FLAG_FALLBACK, 1024
+
+
+
+
 
 // - Automatically generated mappings (see tools/enumification-helpers how map.ext.csv is generated.)
 
-1,Org.XmlPull.V1.XmlPullParserNode,Cdsect,I:org/xmlpull/v1/XmlPullParser.CDSECT,5
-1,Org.XmlPull.V1.XmlPullParserNode,Comment,I:org/xmlpull/v1/XmlPullParser.COMMENT,9
-1,Org.XmlPull.V1.XmlPullParserNode,Docdecl,I:org/xmlpull/v1/XmlPullParser.DOCDECL,10
-1,Org.XmlPull.V1.XmlPullParserNode,EndDocument,I:org/xmlpull/v1/XmlPullParser.END_DOCUMENT,1
-1,Org.XmlPull.V1.XmlPullParserNode,EndTag,I:org/xmlpull/v1/XmlPullParser.END_TAG,3
-1,Org.XmlPull.V1.XmlPullParserNode,EntityRef,I:org/xmlpull/v1/XmlPullParser.ENTITY_REF,6
-1,Org.XmlPull.V1.XmlPullParserNode,IgnorableWhitespace,I:org/xmlpull/v1/XmlPullParser.IGNORABLE_WHITESPACE,7
-1,Org.XmlPull.V1.XmlPullParserNode,ProcessingInstruction,I:org/xmlpull/v1/XmlPullParser.PROCESSING_INSTRUCTION,8
-1,Org.XmlPull.V1.XmlPullParserNode,StartDocument,I:org/xmlpull/v1/XmlPullParser.START_DOCUMENT,0
-1,Org.XmlPull.V1.XmlPullParserNode,StartTag,I:org/xmlpull/v1/XmlPullParser.START_TAG,2
-1,Org.XmlPull.V1.XmlPullParserNode,Text,I:org/xmlpull/v1/XmlPullParser.TEXT,4
-14,Android.AccessibilityServices.FeedbackFlags,AllMask,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_ALL_MASK,-1
-4,Android.AccessibilityServices.FeedbackFlags,Audible,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_AUDIBLE,4
+10,Org.XmlPull.V1.XmlPullParserNode,Cdsect,I:org/xmlpull/v1/XmlPullParser.CDSECT,5
+10,Org.XmlPull.V1.XmlPullParserNode,Comment,I:org/xmlpull/v1/XmlPullParser.COMMENT,9
+10,Org.XmlPull.V1.XmlPullParserNode,Docdecl,I:org/xmlpull/v1/XmlPullParser.DOCDECL,10
+10,Org.XmlPull.V1.XmlPullParserNode,EndDocument,I:org/xmlpull/v1/XmlPullParser.END_DOCUMENT,1
+10,Org.XmlPull.V1.XmlPullParserNode,EndTag,I:org/xmlpull/v1/XmlPullParser.END_TAG,3
+10,Org.XmlPull.V1.XmlPullParserNode,EntityRef,I:org/xmlpull/v1/XmlPullParser.ENTITY_REF,6
+10,Org.XmlPull.V1.XmlPullParserNode,IgnorableWhitespace,I:org/xmlpull/v1/XmlPullParser.IGNORABLE_WHITESPACE,7
+10,Org.XmlPull.V1.XmlPullParserNode,ProcessingInstruction,I:org/xmlpull/v1/XmlPullParser.PROCESSING_INSTRUCTION,8
+10,Org.XmlPull.V1.XmlPullParserNode,StartDocument,I:org/xmlpull/v1/XmlPullParser.START_DOCUMENT,0
+10,Org.XmlPull.V1.XmlPullParserNode,StartTag,I:org/xmlpull/v1/XmlPullParser.START_TAG,2
+10,Org.XmlPull.V1.XmlPullParserNode,Text,I:org/xmlpull/v1/XmlPullParser.TEXT,4
+15,Android.AccessibilityServices.FeedbackFlags,AllMask,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_ALL_MASK,-1
+10,Android.AccessibilityServices.FeedbackFlags,Audible,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_AUDIBLE,4
 17,Android.AccessibilityServices.FeedbackFlags,Braille,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_BRAILLE,32
-4,Android.AccessibilityServices.FeedbackFlags,Generic,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_GENERIC,16
-4,Android.AccessibilityServices.FeedbackFlags,Haptic,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_HAPTIC,2
-4,Android.AccessibilityServices.FeedbackFlags,Spoken,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_SPOKEN,1
-4,Android.AccessibilityServices.FeedbackFlags,Visual,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_VISUAL,8
+10,Android.AccessibilityServices.FeedbackFlags,Generic,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_GENERIC,16
+10,Android.AccessibilityServices.FeedbackFlags,Haptic,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_HAPTIC,2
+10,Android.AccessibilityServices.FeedbackFlags,Spoken,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_SPOKEN,1
+10,Android.AccessibilityServices.FeedbackFlags,Visual,android/accessibilityservice/AccessibilityServiceInfo.FEEDBACK_VISUAL,8
 26,Android.AccessibilityServices.FingerptintGestureTypes,SwipeDown,android/accessibilityservice/FingerprintGestureController.FINGERPRINT_GESTURE_SWIPE_DOWN,8
 26,Android.AccessibilityServices.FingerptintGestureTypes,SwipeLeft,android/accessibilityservice/FingerprintGestureController.FINGERPRINT_GESTURE_SWIPE_LEFT,2
 26,Android.AccessibilityServices.FingerptintGestureTypes,SwipeRight,android/accessibilityservice/FingerprintGestureController.FINGERPRINT_GESTURE_SWIPE_RIGHT,1
@@ -127,58 +86,58 @@
 26,Android.Accounts.AccountVisibility,UserManagedNotVisible,android/accounts/AccountManager.VISIBILITY_USER_MANAGED_NOT_VISIBLE,4
 26,Android.Accounts.AccountVisibility,UserManagedVisible,android/accounts/AccountManager.VISIBILITY_USER_MANAGED_VISIBLE,2
 26,Android.Accounts.AccountVisibility,Visible,android/accounts/AccountManager.VISIBILITY_VISIBLE,1
-11,Android.App.ActionBarDisplayOptions,HomeAsUp,android/app/ActionBar.DISPLAY_HOME_AS_UP,4
-11,Android.App.ActionBarDisplayOptions,ShowCustom,android/app/ActionBar.DISPLAY_SHOW_CUSTOM,16
-11,Android.App.ActionBarDisplayOptions,ShowHome,android/app/ActionBar.DISPLAY_SHOW_HOME,2
-11,Android.App.ActionBarDisplayOptions,ShowTitle,android/app/ActionBar.DISPLAY_SHOW_TITLE,8
-11,Android.App.ActionBarDisplayOptions,UseLogo,android/app/ActionBar.DISPLAY_USE_LOGO,1
-11,Android.App.ActionBarNavigationMode,List,android/app/ActionBar.NAVIGATION_MODE_LIST,1
-11,Android.App.ActionBarNavigationMode,Standard,android/app/ActionBar.NAVIGATION_MODE_STANDARD,0
-11,Android.App.ActionBarNavigationMode,Tabs,android/app/ActionBar.NAVIGATION_MODE_TABS,2
-1,Android.App.DefaultKey,Dialer,android/app/Activity.DEFAULT_KEYS_DIALER,1
-1,Android.App.DefaultKey,Disable,android/app/Activity.DEFAULT_KEYS_DISABLE,0
-1,Android.App.DefaultKey,SearchGlobal,android/app/Activity.DEFAULT_KEYS_SEARCH_GLOBAL,4
-1,Android.App.DefaultKey,SearchLocal,android/app/Activity.DEFAULT_KEYS_SEARCH_LOCAL,3
-1,Android.App.DefaultKey,Shortcut,android/app/Activity.DEFAULT_KEYS_SHORTCUT,2
-1,Android.App.Result,Canceled,android/app/Activity.RESULT_CANCELED,0
-1,Android.App.Result,FirstUser,android/app/Activity.RESULT_FIRST_USER,1
-1,Android.App.Result,Ok,android/app/Activity.RESULT_OK,-1
-12,Android.App.MoveTaskFlags,NoUserAction,android/app/ActivityManager.MOVE_TASK_NO_USER_ACTION,2
-11,Android.App.MoveTaskFlags,WithHome,android/app/ActivityManager.MOVE_TASK_WITH_HOME,1
-11,Android.App.RecentTaskFlags,IgnoreUnavailable,android/app/ActivityManager.RECENT_IGNORE_UNAVAILABLE,2
-1,Android.App.RecentTaskFlags,WithExcluded,android/app/ActivityManager.RECENT_WITH_EXCLUDED,1
-1,Android.App.AlarmType,ElapsedRealtime,android/app/AlarmManager.ELAPSED_REALTIME,3
-1,Android.App.AlarmType,ElapsedRealtimeWakeup,android/app/AlarmManager.ELAPSED_REALTIME_WAKEUP,2
-1,Android.App.AlarmType,Rtc,android/app/AlarmManager.RTC,1
-1,Android.App.AlarmType,RtcWakeup,android/app/AlarmManager.RTC_WAKEUP,0
-11,Android.App.DialogFragmentStyle,Normal,android/app/DialogFragment.STYLE_NORMAL,0
-11,Android.App.DialogFragmentStyle,NoFrame,android/app/DialogFragment.STYLE_NO_FRAME,2
-11,Android.App.DialogFragmentStyle,NoInput,android/app/DialogFragment.STYLE_NO_INPUT,3
-11,Android.App.DialogFragmentStyle,NoTitle,android/app/DialogFragment.STYLE_NO_TITLE,1
-11,Android.App.FragmentTransit,EnterMask,android/app/FragmentTransaction.TRANSIT_ENTER_MASK,4096
-11,Android.App.FragmentTransit,ExitMask,android/app/FragmentTransaction.TRANSIT_EXIT_MASK,8192
-11,Android.App.FragmentTransit,FragmentClose,android/app/FragmentTransaction.TRANSIT_FRAGMENT_CLOSE,8194
-11,Android.App.FragmentTransit,FragmentFade,android/app/FragmentTransaction.TRANSIT_FRAGMENT_FADE,4099
-11,Android.App.FragmentTransit,FragmentOpen,android/app/FragmentTransaction.TRANSIT_FRAGMENT_OPEN,4097
-11,Android.App.FragmentTransit,None,android/app/FragmentTransaction.TRANSIT_NONE,0
-11,Android.App.FragmentTransit,Unset,android/app/FragmentTransaction.TRANSIT_UNSET,-1
+15,Android.App.ActionBarDisplayOptions,HomeAsUp,android/app/ActionBar.DISPLAY_HOME_AS_UP,4
+15,Android.App.ActionBarDisplayOptions,ShowCustom,android/app/ActionBar.DISPLAY_SHOW_CUSTOM,16
+15,Android.App.ActionBarDisplayOptions,ShowHome,android/app/ActionBar.DISPLAY_SHOW_HOME,2
+15,Android.App.ActionBarDisplayOptions,ShowTitle,android/app/ActionBar.DISPLAY_SHOW_TITLE,8
+15,Android.App.ActionBarDisplayOptions,UseLogo,android/app/ActionBar.DISPLAY_USE_LOGO,1
+15,Android.App.ActionBarNavigationMode,List,android/app/ActionBar.NAVIGATION_MODE_LIST,1
+15,Android.App.ActionBarNavigationMode,Standard,android/app/ActionBar.NAVIGATION_MODE_STANDARD,0
+15,Android.App.ActionBarNavigationMode,Tabs,android/app/ActionBar.NAVIGATION_MODE_TABS,2
+10,Android.App.DefaultKey,Dialer,android/app/Activity.DEFAULT_KEYS_DIALER,1
+10,Android.App.DefaultKey,Disable,android/app/Activity.DEFAULT_KEYS_DISABLE,0
+10,Android.App.DefaultKey,SearchGlobal,android/app/Activity.DEFAULT_KEYS_SEARCH_GLOBAL,4
+10,Android.App.DefaultKey,SearchLocal,android/app/Activity.DEFAULT_KEYS_SEARCH_LOCAL,3
+10,Android.App.DefaultKey,Shortcut,android/app/Activity.DEFAULT_KEYS_SHORTCUT,2
+10,Android.App.Result,Canceled,android/app/Activity.RESULT_CANCELED,0
+10,Android.App.Result,FirstUser,android/app/Activity.RESULT_FIRST_USER,1
+10,Android.App.Result,Ok,android/app/Activity.RESULT_OK,-1
+15,Android.App.MoveTaskFlags,NoUserAction,android/app/ActivityManager.MOVE_TASK_NO_USER_ACTION,2
+15,Android.App.MoveTaskFlags,WithHome,android/app/ActivityManager.MOVE_TASK_WITH_HOME,1
+15,Android.App.RecentTaskFlags,IgnoreUnavailable,android/app/ActivityManager.RECENT_IGNORE_UNAVAILABLE,2
+10,Android.App.RecentTaskFlags,WithExcluded,android/app/ActivityManager.RECENT_WITH_EXCLUDED,1
+10,Android.App.AlarmType,ElapsedRealtime,android/app/AlarmManager.ELAPSED_REALTIME,3
+10,Android.App.AlarmType,ElapsedRealtimeWakeup,android/app/AlarmManager.ELAPSED_REALTIME_WAKEUP,2
+10,Android.App.AlarmType,Rtc,android/app/AlarmManager.RTC,1
+10,Android.App.AlarmType,RtcWakeup,android/app/AlarmManager.RTC_WAKEUP,0
+15,Android.App.DialogFragmentStyle,NoFrame,android/app/DialogFragment.STYLE_NO_FRAME,2
+15,Android.App.DialogFragmentStyle,NoInput,android/app/DialogFragment.STYLE_NO_INPUT,3
+15,Android.App.DialogFragmentStyle,NoTitle,android/app/DialogFragment.STYLE_NO_TITLE,1
+15,Android.App.DialogFragmentStyle,Normal,android/app/DialogFragment.STYLE_NORMAL,0
+15,Android.App.FragmentTransit,EnterMask,android/app/FragmentTransaction.TRANSIT_ENTER_MASK,4096
+15,Android.App.FragmentTransit,ExitMask,android/app/FragmentTransaction.TRANSIT_EXIT_MASK,8192
+15,Android.App.FragmentTransit,FragmentClose,android/app/FragmentTransaction.TRANSIT_FRAGMENT_CLOSE,8194
+15,Android.App.FragmentTransit,FragmentFade,android/app/FragmentTransaction.TRANSIT_FRAGMENT_FADE,4099
+15,Android.App.FragmentTransit,FragmentOpen,android/app/FragmentTransaction.TRANSIT_FRAGMENT_OPEN,4097
+15,Android.App.FragmentTransit,None,android/app/FragmentTransaction.TRANSIT_NONE,0
+15,Android.App.FragmentTransit,Unset,android/app/FragmentTransaction.TRANSIT_UNSET,-1
 26,Android.App.NotificationBadgeIconType,Large,android/app/Notification.BADGE_ICON_LARGE,2
 26,Android.App.NotificationBadgeIconType,None,android/app/Notification.BADGE_ICON_NONE,0
 26,Android.App.NotificationBadgeIconType,Small,android/app/Notification.BADGE_ICON_SMALL,1
-1,Android.App.NotificationFlags,AutoCancel,android/app/Notification.FLAG_AUTO_CANCEL,16
-5,Android.App.NotificationFlags,ForegroundService,android/app/Notification.FLAG_FOREGROUND_SERVICE,64
+10,Android.App.NotificationFlags,AutoCancel,android/app/Notification.FLAG_AUTO_CANCEL,16
+10,Android.App.NotificationFlags,ForegroundService,android/app/Notification.FLAG_FOREGROUND_SERVICE,64
 20,Android.App.NotificationFlags,GroupSummary,android/app/Notification.FLAG_GROUP_SUMMARY,512
-11,Android.App.NotificationFlags,HighPriority,android/app/Notification.FLAG_HIGH_PRIORITY,128
-1,Android.App.NotificationFlags,Insistent,android/app/Notification.FLAG_INSISTENT,4
+15,Android.App.NotificationFlags,HighPriority,android/app/Notification.FLAG_HIGH_PRIORITY,128
+10,Android.App.NotificationFlags,Insistent,android/app/Notification.FLAG_INSISTENT,4
 20,Android.App.NotificationFlags,LocalOnly,android/app/Notification.FLAG_LOCAL_ONLY,256
-1,Android.App.NotificationFlags,NoClear,android/app/Notification.FLAG_NO_CLEAR,32
-1,Android.App.NotificationFlags,OngoingEvent,android/app/Notification.FLAG_ONGOING_EVENT,2
-1,Android.App.NotificationFlags,OnlyAlertOnce,android/app/Notification.FLAG_ONLY_ALERT_ONCE,8
-1,Android.App.NotificationFlags,ShowLights,android/app/Notification.FLAG_SHOW_LIGHTS,1
-1,Android.App.NotificationDefaults,All,android/app/Notification.DEFAULT_ALL,-1
-1,Android.App.NotificationDefaults,Lights,android/app/Notification.DEFAULT_LIGHTS,4
-1,Android.App.NotificationDefaults,Sound,android/app/Notification.DEFAULT_SOUND,1
-1,Android.App.NotificationDefaults,Vibrate,android/app/Notification.DEFAULT_VIBRATE,2
+10,Android.App.NotificationFlags,NoClear,android/app/Notification.FLAG_NO_CLEAR,32
+10,Android.App.NotificationFlags,OngoingEvent,android/app/Notification.FLAG_ONGOING_EVENT,2
+10,Android.App.NotificationFlags,OnlyAlertOnce,android/app/Notification.FLAG_ONLY_ALERT_ONCE,8
+10,Android.App.NotificationFlags,ShowLights,android/app/Notification.FLAG_SHOW_LIGHTS,1
+10,Android.App.NotificationDefaults,All,android/app/Notification.DEFAULT_ALL,-1
+10,Android.App.NotificationDefaults,Lights,android/app/Notification.DEFAULT_LIGHTS,4
+10,Android.App.NotificationDefaults,Sound,android/app/Notification.DEFAULT_SOUND,1
+10,Android.App.NotificationDefaults,Vibrate,android/app/Notification.DEFAULT_VIBRATE,2
 26,Android.App.NotificationGroupAlertBehavior,All,android/app/Notification.GROUP_ALERT_ALL,0
 26,Android.App.NotificationGroupAlertBehavior,Children,android/app/Notification.GROUP_ALERT_CHILDREN,2
 26,Android.App.NotificationGroupAlertBehavior,Summary,android/app/Notification.GROUP_ALERT_SUMMARY,1
@@ -191,34 +150,34 @@
 20,Android.App.WearableSizePreset,Medium,android/app/Notification.WearableExtender.SIZE_MEDIUM,3
 20,Android.App.WearableSizePreset,Small,android/app/Notification.WearableExtender.SIZE_SMALL,2
 20,Android.App.WearableSizePreset,Xsmall,android/app/Notification.WearableExtender.SIZE_XSMALL,1
-1,Android.App.PendingIntentFlags,CancelCurrent,android/app/PendingIntent.FLAG_CANCEL_CURRENT,268435456
+10,Android.App.PendingIntentFlags,CancelCurrent,android/app/PendingIntent.FLAG_CANCEL_CURRENT,268435456
 23,Android.App.PendingIntentFlags,Immutable,android/app/PendingIntent.FLAG_IMMUTABLE,67108864
-1,Android.App.PendingIntentFlags,NoCreate,android/app/PendingIntent.FLAG_NO_CREATE,536870912
-1,Android.App.PendingIntentFlags,OneShot,android/app/PendingIntent.FLAG_ONE_SHOT,1073741824
-3,Android.App.PendingIntentFlags,UpdateCurrent,android/app/PendingIntent.FLAG_UPDATE_CURRENT,134217728
-1,Android.App.ProgressDialogStyle,Horizontal,android/app/ProgressDialog.STYLE_HORIZONTAL,1
-1,Android.App.ProgressDialogStyle,Spinner,android/app/ProgressDialog.STYLE_SPINNER,0
-5,Android.App.StartCommandResult,ContinuationMask,android/app/Service.START_CONTINUATION_MASK,15
-5,Android.App.StartCommandResult,NotSticky,android/app/Service.START_NOT_STICKY,2
-5,Android.App.StartCommandResult,RedeliverIntent,android/app/Service.START_REDELIVER_INTENT,3
-5,Android.App.StartCommandResult,Sticky,android/app/Service.START_STICKY,1
-5,Android.App.StartCommandResult,StickyCompatibility,android/app/Service.START_STICKY_COMPATIBILITY,0
-5,Android.App.StartCommandFlags,Redelivery,android/app/Service.START_FLAG_REDELIVERY,1
-5,Android.App.StartCommandFlags,Retry,android/app/Service.START_FLAG_RETRY,2
-11,Android.App.Admin.EncryptionStatus,Activating,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING,2
-11,Android.App.Admin.EncryptionStatus,Active,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE,3
+10,Android.App.PendingIntentFlags,NoCreate,android/app/PendingIntent.FLAG_NO_CREATE,536870912
+10,Android.App.PendingIntentFlags,OneShot,android/app/PendingIntent.FLAG_ONE_SHOT,1073741824
+10,Android.App.PendingIntentFlags,UpdateCurrent,android/app/PendingIntent.FLAG_UPDATE_CURRENT,134217728
+10,Android.App.ProgressDialogStyle,Horizontal,android/app/ProgressDialog.STYLE_HORIZONTAL,1
+10,Android.App.ProgressDialogStyle,Spinner,android/app/ProgressDialog.STYLE_SPINNER,0
+10,Android.App.StartCommandResult,ContinuationMask,android/app/Service.START_CONTINUATION_MASK,15
+10,Android.App.StartCommandResult,NotSticky,android/app/Service.START_NOT_STICKY,2
+10,Android.App.StartCommandResult,RedeliverIntent,android/app/Service.START_REDELIVER_INTENT,3
+10,Android.App.StartCommandResult,Sticky,android/app/Service.START_STICKY,1
+10,Android.App.StartCommandResult,StickyCompatibility,android/app/Service.START_STICKY_COMPATIBILITY,0
+10,Android.App.StartCommandFlags,Redelivery,android/app/Service.START_FLAG_REDELIVERY,1
+10,Android.App.StartCommandFlags,Retry,android/app/Service.START_FLAG_RETRY,2
+15,Android.App.Admin.EncryptionStatus,Activating,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING,2
+15,Android.App.Admin.EncryptionStatus,Active,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE,3
 23,Android.App.Admin.EncryptionStatus,ActiveDefaultKey,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY,4
 24,Android.App.Admin.EncryptionStatus,ActivePerUser,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER,5
-11,Android.App.Admin.EncryptionStatus,Inactive,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE,1
-11,Android.App.Admin.EncryptionStatus,Unsupported,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED,0
-8,Android.App.Admin.PasswordQuality,Alphabetic,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC,262144
-8,Android.App.Admin.PasswordQuality,Alphanumeric,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC,327680
-14,Android.App.Admin.PasswordQuality,BiometricWeak,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,32768
-11,Android.App.Admin.PasswordQuality,Complex,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_COMPLEX,393216
-8,Android.App.Admin.PasswordQuality,Numeric,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_NUMERIC,131072
+15,Android.App.Admin.EncryptionStatus,Inactive,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE,1
+15,Android.App.Admin.EncryptionStatus,Unsupported,android/app/admin/DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED,0
+10,Android.App.Admin.PasswordQuality,Alphabetic,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC,262144
+10,Android.App.Admin.PasswordQuality,Alphanumeric,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC,327680
+15,Android.App.Admin.PasswordQuality,BiometricWeak,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,32768
+15,Android.App.Admin.PasswordQuality,Complex,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_COMPLEX,393216
+10,Android.App.Admin.PasswordQuality,Numeric,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_NUMERIC,131072
 21,Android.App.Admin.PasswordQuality,NumericComplex,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX,196608
-8,Android.App.Admin.PasswordQuality,Something,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,65536
-8,Android.App.Admin.PasswordQuality,Unspecified,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,0
+10,Android.App.Admin.PasswordQuality,Something,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,65536
+10,Android.App.Admin.PasswordQuality,Unspecified,android/app/admin/DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,0
 26,Android.App.Admin.SecurityPatchStates,StateFalse,android/app/admin/SystemUpdateInfo.SECURITY_PATCH_STATE_FALSE,1
 26,Android.App.Admin.SecurityPatchStates,StateTrue,android/app/admin/SystemUpdateInfo.SECURITY_PATCH_STATE_TRUE,2
 26,Android.App.Admin.SecurityPatchStates,StateUnknown,android/app/admin/SystemUpdateInfo.SECURITY_PATCH_STATE_UNKNOWN,0
@@ -243,44 +202,44 @@
 26,Android.App.Usage.MeteredStates,All,android/app/usage/NetworkStats.Bucket.METERED_ALL,-1
 26,Android.App.Usage.MeteredStates,No,android/app/usage/NetworkStats.Bucket.METERED_NO,1
 26,Android.App.Usage.MeteredStates,Yes,android/app/usage/NetworkStats.Bucket.METERED_YES,2
-12,Android.Appwidget.ResizeMode,Both,android/appwidget/AppWidgetProviderInfo.RESIZE_BOTH,3
-12,Android.Appwidget.ResizeMode,Horizontal,android/appwidget/AppWidgetProviderInfo.RESIZE_HORIZONTAL,1
-12,Android.Appwidget.ResizeMode,None,android/appwidget/AppWidgetProviderInfo.RESIZE_NONE,0
-12,Android.Appwidget.ResizeMode,Vertical,android/appwidget/AppWidgetProviderInfo.RESIZE_VERTICAL,2
-11,Android.Bluetooth.State,Connected,android/bluetooth/BluetoothAdapter.STATE_CONNECTED,2
-11,Android.Bluetooth.State,Connecting,android/bluetooth/BluetoothAdapter.STATE_CONNECTING,1
-11,Android.Bluetooth.State,Disconnected,android/bluetooth/BluetoothAdapter.STATE_DISCONNECTED,0
-11,Android.Bluetooth.State,Disconnecting,android/bluetooth/BluetoothAdapter.STATE_DISCONNECTING,3
-5,Android.Bluetooth.State,Off,android/bluetooth/BluetoothAdapter.STATE_OFF,10
-5,Android.Bluetooth.State,On,android/bluetooth/BluetoothAdapter.STATE_ON,12
-5,Android.Bluetooth.State,TurningOff,android/bluetooth/BluetoothAdapter.STATE_TURNING_OFF,13
-5,Android.Bluetooth.State,TurningOn,android/bluetooth/BluetoothAdapter.STATE_TURNING_ON,11
-5,Android.Bluetooth.ScanMode,Connectable,android/bluetooth/BluetoothAdapter.SCAN_MODE_CONNECTABLE,21
-5,Android.Bluetooth.ScanMode,ConnectableDiscoverable,android/bluetooth/BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE,23
-5,Android.Bluetooth.ScanMode,None,android/bluetooth/BluetoothAdapter.SCAN_MODE_NONE,20
-5,Android.Bluetooth.MajorDeviceClass,AudioVideo,android/bluetooth/BluetoothClass$Device$Major.AUDIO_VIDEO,1024
-5,Android.Bluetooth.MajorDeviceClass,Computer,android/bluetooth/BluetoothClass$Device$Major.COMPUTER,256
-5,Android.Bluetooth.MajorDeviceClass,Health,android/bluetooth/BluetoothClass$Device$Major.HEALTH,2304
-5,Android.Bluetooth.MajorDeviceClass,Imaging,android/bluetooth/BluetoothClass$Device$Major.IMAGING,1536
-5,Android.Bluetooth.MajorDeviceClass,Misc,android/bluetooth/BluetoothClass$Device$Major.MISC,0
-5,Android.Bluetooth.MajorDeviceClass,Networking,android/bluetooth/BluetoothClass$Device$Major.NETWORKING,768
-5,Android.Bluetooth.MajorDeviceClass,Peripheral,android/bluetooth/BluetoothClass$Device$Major.PERIPHERAL,1280
-5,Android.Bluetooth.MajorDeviceClass,Phone,android/bluetooth/BluetoothClass$Device$Major.PHONE,512
-5,Android.Bluetooth.MajorDeviceClass,Toy,android/bluetooth/BluetoothClass$Device$Major.TOY,2048
-5,Android.Bluetooth.MajorDeviceClass,Uncategorized,android/bluetooth/BluetoothClass$Device$Major.UNCATEGORIZED,7936
-5,Android.Bluetooth.MajorDeviceClass,Wearable,android/bluetooth/BluetoothClass$Device$Major.WEARABLE,1792
-5,Android.Bluetooth.ServiceClass,Audio,android/bluetooth/BluetoothClass$Service.AUDIO,2097152
-5,Android.Bluetooth.ServiceClass,Capture,android/bluetooth/BluetoothClass$Service.CAPTURE,524288
-5,Android.Bluetooth.ServiceClass,Information,android/bluetooth/BluetoothClass$Service.INFORMATION,8388608
-5,Android.Bluetooth.ServiceClass,LimitedDiscoverability,android/bluetooth/BluetoothClass$Service.LIMITED_DISCOVERABILITY,8192
-5,Android.Bluetooth.ServiceClass,Networking,android/bluetooth/BluetoothClass$Service.NETWORKING,131072
-5,Android.Bluetooth.ServiceClass,ObjectTransfer,android/bluetooth/BluetoothClass$Service.OBJECT_TRANSFER,1048576
-5,Android.Bluetooth.ServiceClass,Positioning,android/bluetooth/BluetoothClass$Service.POSITIONING,65536
-5,Android.Bluetooth.ServiceClass,Render,android/bluetooth/BluetoothClass$Service.RENDER,262144
-5,Android.Bluetooth.ServiceClass,Telephony,android/bluetooth/BluetoothClass$Service.TELEPHONY,4194304
-5,Android.Bluetooth.Bond,Bonded,android/bluetooth/BluetoothDevice.BOND_BONDED,12
-5,Android.Bluetooth.Bond,Bonding,android/bluetooth/BluetoothDevice.BOND_BONDING,11
-5,Android.Bluetooth.Bond,None,android/bluetooth/BluetoothDevice.BOND_NONE,10
+15,Android.Appwidget.ResizeMode,Both,android/appwidget/AppWidgetProviderInfo.RESIZE_BOTH,3
+15,Android.Appwidget.ResizeMode,Horizontal,android/appwidget/AppWidgetProviderInfo.RESIZE_HORIZONTAL,1
+15,Android.Appwidget.ResizeMode,None,android/appwidget/AppWidgetProviderInfo.RESIZE_NONE,0
+15,Android.Appwidget.ResizeMode,Vertical,android/appwidget/AppWidgetProviderInfo.RESIZE_VERTICAL,2
+15,Android.Bluetooth.State,Connected,android/bluetooth/BluetoothAdapter.STATE_CONNECTED,2
+15,Android.Bluetooth.State,Connecting,android/bluetooth/BluetoothAdapter.STATE_CONNECTING,1
+15,Android.Bluetooth.State,Disconnected,android/bluetooth/BluetoothAdapter.STATE_DISCONNECTED,0
+15,Android.Bluetooth.State,Disconnecting,android/bluetooth/BluetoothAdapter.STATE_DISCONNECTING,3
+10,Android.Bluetooth.State,Off,android/bluetooth/BluetoothAdapter.STATE_OFF,10
+10,Android.Bluetooth.State,On,android/bluetooth/BluetoothAdapter.STATE_ON,12
+10,Android.Bluetooth.State,TurningOff,android/bluetooth/BluetoothAdapter.STATE_TURNING_OFF,13
+10,Android.Bluetooth.State,TurningOn,android/bluetooth/BluetoothAdapter.STATE_TURNING_ON,11
+10,Android.Bluetooth.ScanMode,Connectable,android/bluetooth/BluetoothAdapter.SCAN_MODE_CONNECTABLE,21
+10,Android.Bluetooth.ScanMode,ConnectableDiscoverable,android/bluetooth/BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE,23
+10,Android.Bluetooth.ScanMode,None,android/bluetooth/BluetoothAdapter.SCAN_MODE_NONE,20
+10,Android.Bluetooth.MajorDeviceClass,AudioVideo,android/bluetooth/BluetoothClass$Device$Major.AUDIO_VIDEO,1024
+10,Android.Bluetooth.MajorDeviceClass,Computer,android/bluetooth/BluetoothClass$Device$Major.COMPUTER,256
+10,Android.Bluetooth.MajorDeviceClass,Health,android/bluetooth/BluetoothClass$Device$Major.HEALTH,2304
+10,Android.Bluetooth.MajorDeviceClass,Imaging,android/bluetooth/BluetoothClass$Device$Major.IMAGING,1536
+10,Android.Bluetooth.MajorDeviceClass,Misc,android/bluetooth/BluetoothClass$Device$Major.MISC,0
+10,Android.Bluetooth.MajorDeviceClass,Networking,android/bluetooth/BluetoothClass$Device$Major.NETWORKING,768
+10,Android.Bluetooth.MajorDeviceClass,Peripheral,android/bluetooth/BluetoothClass$Device$Major.PERIPHERAL,1280
+10,Android.Bluetooth.MajorDeviceClass,Phone,android/bluetooth/BluetoothClass$Device$Major.PHONE,512
+10,Android.Bluetooth.MajorDeviceClass,Toy,android/bluetooth/BluetoothClass$Device$Major.TOY,2048
+10,Android.Bluetooth.MajorDeviceClass,Uncategorized,android/bluetooth/BluetoothClass$Device$Major.UNCATEGORIZED,7936
+10,Android.Bluetooth.MajorDeviceClass,Wearable,android/bluetooth/BluetoothClass$Device$Major.WEARABLE,1792
+10,Android.Bluetooth.ServiceClass,Audio,android/bluetooth/BluetoothClass$Service.AUDIO,2097152
+10,Android.Bluetooth.ServiceClass,Capture,android/bluetooth/BluetoothClass$Service.CAPTURE,524288
+10,Android.Bluetooth.ServiceClass,Information,android/bluetooth/BluetoothClass$Service.INFORMATION,8388608
+10,Android.Bluetooth.ServiceClass,LimitedDiscoverability,android/bluetooth/BluetoothClass$Service.LIMITED_DISCOVERABILITY,8192
+10,Android.Bluetooth.ServiceClass,Networking,android/bluetooth/BluetoothClass$Service.NETWORKING,131072
+10,Android.Bluetooth.ServiceClass,ObjectTransfer,android/bluetooth/BluetoothClass$Service.OBJECT_TRANSFER,1048576
+10,Android.Bluetooth.ServiceClass,Positioning,android/bluetooth/BluetoothClass$Service.POSITIONING,65536
+10,Android.Bluetooth.ServiceClass,Render,android/bluetooth/BluetoothClass$Service.RENDER,262144
+10,Android.Bluetooth.ServiceClass,Telephony,android/bluetooth/BluetoothClass$Service.TELEPHONY,4194304
+10,Android.Bluetooth.Bond,Bonded,android/bluetooth/BluetoothDevice.BOND_BONDED,12
+10,Android.Bluetooth.Bond,Bonding,android/bluetooth/BluetoothDevice.BOND_BONDING,11
+10,Android.Bluetooth.Bond,None,android/bluetooth/BluetoothDevice.BOND_NONE,10
 26,Android.Bluetooth.BluetoothPhy,Le1m,android/bluetooth/BluetoothDevice.PHY_LE_1M,1
 26,Android.Bluetooth.BluetoothPhy,Le1mMask,android/bluetooth/BluetoothDevice.PHY_LE_1M_MASK,1
 26,Android.Bluetooth.BluetoothPhy,Le2m,android/bluetooth/BluetoothDevice.PHY_LE_2M,2
@@ -291,10 +250,10 @@
 26,Android.Bluetooth.BluetoothPhyOption,S2,android/bluetooth/BluetoothDevice.PHY_OPTION_S2,1
 26,Android.Bluetooth.BluetoothPhyOption,S8,android/bluetooth/BluetoothDevice.PHY_OPTION_S8,2
 26,Android.Bluetooth.LE.BluetoothPhy,Unused,android/bluetooth/le/ScanResult.PHY_UNUSED,0
-11,Android.Bluetooth.ProfileState,Connected,I:android/bluetooth/BluetoothProfile.STATE_CONNECTED,2
-11,Android.Bluetooth.ProfileState,Connecting,I:android/bluetooth/BluetoothProfile.STATE_CONNECTING,1
-11,Android.Bluetooth.ProfileState,Disconnected,I:android/bluetooth/BluetoothProfile.STATE_DISCONNECTED,0
-11,Android.Bluetooth.ProfileState,Disconnecting,I:android/bluetooth/BluetoothProfile.STATE_DISCONNECTING,3
+15,Android.Bluetooth.ProfileState,Connected,I:android/bluetooth/BluetoothProfile.STATE_CONNECTED,2
+15,Android.Bluetooth.ProfileState,Connecting,I:android/bluetooth/BluetoothProfile.STATE_CONNECTING,1
+15,Android.Bluetooth.ProfileState,Disconnected,I:android/bluetooth/BluetoothProfile.STATE_DISCONNECTED,0
+15,Android.Bluetooth.ProfileState,Disconnecting,I:android/bluetooth/BluetoothProfile.STATE_DISCONNECTING,3
 21,Android.Bluetooth.LE.AdvertiseFailure,AlreadyStarted,android/bluetooth/le/AdvertiseCallback.ADVERTISE_FAILED_ALREADY_STARTED,3
 21,Android.Bluetooth.LE.AdvertiseFailure,DataTooLarge,android/bluetooth/le/AdvertiseCallback.ADVERTISE_FAILED_DATA_TOO_LARGE,1
 21,Android.Bluetooth.LE.AdvertiseFailure,FeatureUnsupported,android/bluetooth/le/AdvertiseCallback.ADVERTISE_FAILED_FEATURE_UNSUPPORTED,5
@@ -334,70 +293,70 @@
 23,Android.Bluetooth.LE.ScanCallbackType,MatchLost,android/bluetooth/le/ScanSettings.CALLBACK_TYPE_MATCH_LOST,4
 26,Android.Bluetooth.LE.ScanSettingsPhy,AllSupported,android/bluetooth/le/ScanSettings.PHY_LE_ALL_SUPPORTED,255
 0,Android.Content.Bind,None,,0
-14,Android.Content.Bind,AboveClient,android/content/Context.BIND_ABOVE_CLIENT,8
-14,Android.Content.Bind,AdjustWithActivity,android/content/Context.BIND_ADJUST_WITH_ACTIVITY,128
-14,Android.Content.Bind,AllowOomManagement,android/content/Context.BIND_ALLOW_OOM_MANAGEMENT,16
-1,Android.Content.Bind,AutoCreate,android/content/Context.BIND_AUTO_CREATE,1
-1,Android.Content.Bind,DebugUnbind,android/content/Context.BIND_DEBUG_UNBIND,2
+15,Android.Content.Bind,AboveClient,android/content/Context.BIND_ABOVE_CLIENT,8
+15,Android.Content.Bind,AdjustWithActivity,android/content/Context.BIND_ADJUST_WITH_ACTIVITY,128
+15,Android.Content.Bind,AllowOomManagement,android/content/Context.BIND_ALLOW_OOM_MANAGEMENT,16
+10,Android.Content.Bind,AutoCreate,android/content/Context.BIND_AUTO_CREATE,1
+10,Android.Content.Bind,DebugUnbind,android/content/Context.BIND_DEBUG_UNBIND,2
 24,Android.Content.Bind,ExternalService,android/content/Context.BIND_EXTERNAL_SERVICE,-2147483648
-14,Android.Content.Bind,Important,android/content/Context.BIND_IMPORTANT,64
-8,Android.Content.Bind,NotForeground,android/content/Context.BIND_NOT_FOREGROUND,4
-14,Android.Content.Bind,WaivePriority,android/content/Context.BIND_WAIVE_PRIORITY,32
-1,Android.Content.ActivityFlags,BroughtToFront,android/content/Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT,4194304
-11,Android.Content.ActivityFlags,ClearTask,android/content/Intent.FLAG_ACTIVITY_CLEAR_TASK,32768
-1,Android.Content.ActivityFlags,ClearTop,android/content/Intent.FLAG_ACTIVITY_CLEAR_TOP,67108864
-3,Android.Content.ActivityFlags,ClearWhenTaskReset,android/content/Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,524288
-1,Android.Content.ActivityFlags,ExcludeFromRecents,android/content/Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS,8388608
-1,Android.Content.ActivityFlags,ForwardResult,android/content/Intent.FLAG_ACTIVITY_FORWARD_RESULT,33554432
-1,Android.Content.ActivityFlags,LaunchedFromHistory,android/content/Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY,1048576
+15,Android.Content.Bind,Important,android/content/Context.BIND_IMPORTANT,64
+10,Android.Content.Bind,NotForeground,android/content/Context.BIND_NOT_FOREGROUND,4
+15,Android.Content.Bind,WaivePriority,android/content/Context.BIND_WAIVE_PRIORITY,32
+10,Android.Content.ActivityFlags,BroughtToFront,android/content/Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT,4194304
+15,Android.Content.ActivityFlags,ClearTask,android/content/Intent.FLAG_ACTIVITY_CLEAR_TASK,32768
+10,Android.Content.ActivityFlags,ClearTop,android/content/Intent.FLAG_ACTIVITY_CLEAR_TOP,67108864
+10,Android.Content.ActivityFlags,ClearWhenTaskReset,android/content/Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,524288
+10,Android.Content.ActivityFlags,ExcludeFromRecents,android/content/Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS,8388608
+10,Android.Content.ActivityFlags,ForwardResult,android/content/Intent.FLAG_ACTIVITY_FORWARD_RESULT,33554432
 24,Android.Content.ActivityFlags,LaunchAdjacent,android/content/Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT,4096
-1,Android.Content.ActivityFlags,MultipleTask,android/content/Intent.FLAG_ACTIVITY_MULTIPLE_TASK,134217728
+10,Android.Content.ActivityFlags,LaunchedFromHistory,android/content/Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY,1048576
+10,Android.Content.ActivityFlags,MultipleTask,android/content/Intent.FLAG_ACTIVITY_MULTIPLE_TASK,134217728
 21,Android.Content.ActivityFlags,NewDocument,android/content/Intent.FLAG_ACTIVITY_NEW_DOCUMENT,524288
-1,Android.Content.ActivityFlags,NewTask,android/content/Intent.FLAG_ACTIVITY_NEW_TASK,268435456
-5,Android.Content.ActivityFlags,NoAnimation,android/content/Intent.FLAG_ACTIVITY_NO_ANIMATION,65536
-1,Android.Content.ActivityFlags,NoHistory,android/content/Intent.FLAG_ACTIVITY_NO_HISTORY,1073741824
-3,Android.Content.ActivityFlags,NoUserAction,android/content/Intent.FLAG_ACTIVITY_NO_USER_ACTION,262144
-1,Android.Content.ActivityFlags,PreviousIsTop,android/content/Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP,16777216
-3,Android.Content.ActivityFlags,ReorderToFront,android/content/Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,131072
-1,Android.Content.ActivityFlags,ResetTaskIfNeeded,android/content/Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED,2097152
+10,Android.Content.ActivityFlags,NewTask,android/content/Intent.FLAG_ACTIVITY_NEW_TASK,268435456
+10,Android.Content.ActivityFlags,NoAnimation,android/content/Intent.FLAG_ACTIVITY_NO_ANIMATION,65536
+10,Android.Content.ActivityFlags,NoHistory,android/content/Intent.FLAG_ACTIVITY_NO_HISTORY,1073741824
+10,Android.Content.ActivityFlags,NoUserAction,android/content/Intent.FLAG_ACTIVITY_NO_USER_ACTION,262144
+10,Android.Content.ActivityFlags,PreviousIsTop,android/content/Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP,16777216
+10,Android.Content.ActivityFlags,ReorderToFront,android/content/Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,131072
+10,Android.Content.ActivityFlags,ResetTaskIfNeeded,android/content/Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED,2097152
 21,Android.Content.ActivityFlags,RetainInRecents,android/content/Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS,8192
-1,Android.Content.ActivityFlags,SingleTop,android/content/Intent.FLAG_ACTIVITY_SINGLE_TOP,536870912
-11,Android.Content.ActivityFlags,TaskOnHome,android/content/Intent.FLAG_ACTIVITY_TASK_ON_HOME,16384
-1,Android.Content.ActivityFlags,DebugLogResolution,android/content/Intent.FLAG_DEBUG_LOG_RESOLUTION,8
-12,Android.Content.ActivityFlags,ExcludeStoppedPackages,android/content/Intent.FLAG_EXCLUDE_STOPPED_PACKAGES,16
-1,Android.Content.ActivityFlags,FromBackground,android/content/Intent.FLAG_FROM_BACKGROUND,4
+10,Android.Content.ActivityFlags,SingleTop,android/content/Intent.FLAG_ACTIVITY_SINGLE_TOP,536870912
+15,Android.Content.ActivityFlags,TaskOnHome,android/content/Intent.FLAG_ACTIVITY_TASK_ON_HOME,16384
+10,Android.Content.ActivityFlags,DebugLogResolution,android/content/Intent.FLAG_DEBUG_LOG_RESOLUTION,8
+15,Android.Content.ActivityFlags,ExcludeStoppedPackages,android/content/Intent.FLAG_EXCLUDE_STOPPED_PACKAGES,16
+10,Android.Content.ActivityFlags,FromBackground,android/content/Intent.FLAG_FROM_BACKGROUND,4
 19,Android.Content.ActivityFlags,GrantPersistableUriPermission,android/content/Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION,64
 21,Android.Content.ActivityFlags,GrantPrefixUriPermission,android/content/Intent.FLAG_GRANT_PREFIX_URI_PERMISSION,128
-1,Android.Content.ActivityFlags,GrantReadUriPermission,android/content/Intent.FLAG_GRANT_READ_URI_PERMISSION,1
-1,Android.Content.ActivityFlags,GrantWriteUriPermission,android/content/Intent.FLAG_GRANT_WRITE_URI_PERMISSION,2
-12,Android.Content.ActivityFlags,IncludeStoppedPackages,android/content/Intent.FLAG_INCLUDE_STOPPED_PACKAGES,32
+10,Android.Content.ActivityFlags,GrantReadUriPermission,android/content/Intent.FLAG_GRANT_READ_URI_PERMISSION,1
+10,Android.Content.ActivityFlags,GrantWriteUriPermission,android/content/Intent.FLAG_GRANT_WRITE_URI_PERMISSION,2
+15,Android.Content.ActivityFlags,IncludeStoppedPackages,android/content/Intent.FLAG_INCLUDE_STOPPED_PACKAGES,32
 16,Android.Content.ActivityFlags,ReceiverForeground,android/content/Intent.FLAG_RECEIVER_FOREGROUND,268435456
 19,Android.Content.ActivityFlags,ReceiverNoAbort,android/content/Intent.FLAG_RECEIVER_NO_ABORT,134217728
-1,Android.Content.ActivityFlags,ReceiverRegisteredOnly,android/content/Intent.FLAG_RECEIVER_REGISTERED_ONLY,1073741824
-8,Android.Content.ActivityFlags,ReceiverReplacePending,android/content/Intent.FLAG_RECEIVER_REPLACE_PENDING,536870912
+10,Android.Content.ActivityFlags,ReceiverRegisteredOnly,android/content/Intent.FLAG_RECEIVER_REGISTERED_ONLY,1073741824
+10,Android.Content.ActivityFlags,ReceiverReplacePending,android/content/Intent.FLAG_RECEIVER_REPLACE_PENDING,536870912
 26,Android.Content.ActivityFlags,ReceiverVisibleToInstantApps,android/content/Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS,2097152
-1,Android.Content.FillInFlags,Action,android/content/Intent.FILL_IN_ACTION,1
-1,Android.Content.FillInFlags,Categories,android/content/Intent.FILL_IN_CATEGORIES,4
+10,Android.Content.FillInFlags,Action,android/content/Intent.FILL_IN_ACTION,1
+10,Android.Content.FillInFlags,Categories,android/content/Intent.FILL_IN_CATEGORIES,4
 16,Android.Content.FillInFlags,ClipData,android/content/Intent.FILL_IN_CLIP_DATA,128
-1,Android.Content.FillInFlags,Component,android/content/Intent.FILL_IN_COMPONENT,8
-1,Android.Content.FillInFlags,Data,android/content/Intent.FILL_IN_DATA,2
-4,Android.Content.FillInFlags,Package,android/content/Intent.FILL_IN_PACKAGE,16
+10,Android.Content.FillInFlags,Component,android/content/Intent.FILL_IN_COMPONENT,8
+10,Android.Content.FillInFlags,Data,android/content/Intent.FILL_IN_DATA,2
+10,Android.Content.FillInFlags,Package,android/content/Intent.FILL_IN_PACKAGE,16
 15,Android.Content.FillInFlags,Selector,android/content/Intent.FILL_IN_SELECTOR,64
-7,Android.Content.FillInFlags,SourceBounds,android/content/Intent.FILL_IN_SOURCE_BOUNDS,32
-1,Android.Content.MatchResults,MatchAdjustmentMask,android/content/IntentFilter.MATCH_ADJUSTMENT_MASK,65535
-1,Android.Content.MatchResults,MatchAdjustmentNormal,android/content/IntentFilter.MATCH_ADJUSTMENT_NORMAL,32768
-1,Android.Content.MatchResults,MatchCategoryEmpty,android/content/IntentFilter.MATCH_CATEGORY_EMPTY,1048576
-1,Android.Content.MatchResults,MatchCategoryHost,android/content/IntentFilter.MATCH_CATEGORY_HOST,3145728
-1,Android.Content.MatchResults,MatchCategoryMask,android/content/IntentFilter.MATCH_CATEGORY_MASK,268369920
-1,Android.Content.MatchResults,MatchCategoryPath,android/content/IntentFilter.MATCH_CATEGORY_PATH,5242880
-1,Android.Content.MatchResults,MatchCategoryPort,android/content/IntentFilter.MATCH_CATEGORY_PORT,4194304
-1,Android.Content.MatchResults,MatchCategoryScheme,android/content/IntentFilter.MATCH_CATEGORY_SCHEME,2097152
+10,Android.Content.FillInFlags,SourceBounds,android/content/Intent.FILL_IN_SOURCE_BOUNDS,32
+10,Android.Content.MatchResults,MatchAdjustmentMask,android/content/IntentFilter.MATCH_ADJUSTMENT_MASK,65535
+10,Android.Content.MatchResults,MatchAdjustmentNormal,android/content/IntentFilter.MATCH_ADJUSTMENT_NORMAL,32768
+10,Android.Content.MatchResults,MatchCategoryEmpty,android/content/IntentFilter.MATCH_CATEGORY_EMPTY,1048576
+10,Android.Content.MatchResults,MatchCategoryHost,android/content/IntentFilter.MATCH_CATEGORY_HOST,3145728
+10,Android.Content.MatchResults,MatchCategoryMask,android/content/IntentFilter.MATCH_CATEGORY_MASK,268369920
+10,Android.Content.MatchResults,MatchCategoryPath,android/content/IntentFilter.MATCH_CATEGORY_PATH,5242880
+10,Android.Content.MatchResults,MatchCategoryPort,android/content/IntentFilter.MATCH_CATEGORY_PORT,4194304
+10,Android.Content.MatchResults,MatchCategoryScheme,android/content/IntentFilter.MATCH_CATEGORY_SCHEME,2097152
 19,Android.Content.MatchResults,MatchCategorySchemeSpecificPart,android/content/IntentFilter.MATCH_CATEGORY_SCHEME_SPECIFIC_PART,5767168
-1,Android.Content.MatchResults,MatchCategoryType,android/content/IntentFilter.MATCH_CATEGORY_TYPE,6291456
-1,Android.Content.MatchResults,NoMatchAction,android/content/IntentFilter.NO_MATCH_ACTION,-3
-1,Android.Content.MatchResults,NoMatchCategory,android/content/IntentFilter.NO_MATCH_CATEGORY,-4
-1,Android.Content.MatchResults,NoMatchData,android/content/IntentFilter.NO_MATCH_DATA,-2
-1,Android.Content.MatchResults,NoMatchType,android/content/IntentFilter.NO_MATCH_TYPE,-1
+10,Android.Content.MatchResults,MatchCategoryType,android/content/IntentFilter.MATCH_CATEGORY_TYPE,6291456
+10,Android.Content.MatchResults,NoMatchAction,android/content/IntentFilter.NO_MATCH_ACTION,-3
+10,Android.Content.MatchResults,NoMatchCategory,android/content/IntentFilter.NO_MATCH_CATEGORY,-4
+10,Android.Content.MatchResults,NoMatchData,android/content/IntentFilter.NO_MATCH_DATA,-2
+10,Android.Content.MatchResults,NoMatchType,android/content/IntentFilter.NO_MATCH_TYPE,-1
 21,Android.Content.RestrictionResults,Approved,android/content/RestrictionsManager.RESULT_APPROVED,1
 21,Android.Content.RestrictionResults,Denied,android/content/RestrictionsManager.RESULT_DENIED,2
 21,Android.Content.RestrictionResults,Error,android/content/RestrictionsManager.RESULT_ERROR,5
@@ -413,89 +372,89 @@
 21,Android.Content.PM.ActivityPersistableMode,Never,android/content/pm/ActivityInfo.PERSIST_NEVER,1
 21,Android.Content.PM.ActivityPersistableMode,RootOnly,android/content/pm/ActivityInfo.PERSIST_ROOT_ONLY,0
 0,Android.Content.PM.ApplicationInfoFlags,None,,0
-8,Android.Content.PM.ApplicationInfoFlags,AllowBackup,android/content/pm/ApplicationInfo.FLAG_ALLOW_BACKUP,32768
-1,Android.Content.PM.ApplicationInfoFlags,AllowClearUserData,android/content/pm/ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA,64
-1,Android.Content.PM.ApplicationInfoFlags,AllowTaskReparenting,android/content/pm/ApplicationInfo.FLAG_ALLOW_TASK_REPARENTING,32
-1,Android.Content.PM.ApplicationInfoFlags,Debuggable,android/content/pm/ApplicationInfo.FLAG_DEBUGGABLE,2
-8,Android.Content.PM.ApplicationInfoFlags,ExternalStorage,android/content/pm/ApplicationInfo.FLAG_EXTERNAL_STORAGE,262144
+10,Android.Content.PM.ApplicationInfoFlags,AllowBackup,android/content/pm/ApplicationInfo.FLAG_ALLOW_BACKUP,32768
+10,Android.Content.PM.ApplicationInfoFlags,AllowClearUserData,android/content/pm/ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA,64
+10,Android.Content.PM.ApplicationInfoFlags,AllowTaskReparenting,android/content/pm/ApplicationInfo.FLAG_ALLOW_TASK_REPARENTING,32
+10,Android.Content.PM.ApplicationInfoFlags,Debuggable,android/content/pm/ApplicationInfo.FLAG_DEBUGGABLE,2
+10,Android.Content.PM.ApplicationInfoFlags,ExternalStorage,android/content/pm/ApplicationInfo.FLAG_EXTERNAL_STORAGE,262144
 23,Android.Content.PM.ApplicationInfoFlags,ExtractNativeLibs,android/content/pm/ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS,268435456
-1,Android.Content.PM.ApplicationInfoFlags,FactoryTest,android/content/pm/ApplicationInfo.FLAG_FACTORY_TEST,16
+10,Android.Content.PM.ApplicationInfoFlags,FactoryTest,android/content/pm/ApplicationInfo.FLAG_FACTORY_TEST,16
 21,Android.Content.PM.ApplicationInfoFlags,FullBackupOnly,android/content/pm/ApplicationInfo.FLAG_FULL_BACKUP_ONLY,67108864
 23,Android.Content.PM.ApplicationInfoFlags,HardwareAccelerated,android/content/pm/ApplicationInfo.FLAG_HARDWARE_ACCELERATED,536870912
-1,Android.Content.PM.ApplicationInfoFlags,HasCode,android/content/pm/ApplicationInfo.FLAG_HAS_CODE,4
+10,Android.Content.PM.ApplicationInfoFlags,HasCode,android/content/pm/ApplicationInfo.FLAG_HAS_CODE,4
 17,Android.Content.PM.ApplicationInfoFlags,Installed,android/content/pm/ApplicationInfo.FLAG_INSTALLED,8388608
 17,Android.Content.PM.ApplicationInfoFlags,IsDataOnly,android/content/pm/ApplicationInfo.FLAG_IS_DATA_ONLY,16777216
 21,Android.Content.PM.ApplicationInfoFlags,IsGame,android/content/pm/ApplicationInfo.FLAG_IS_GAME,33554432
-8,Android.Content.PM.ApplicationInfoFlags,KillAfterRestore,android/content/pm/ApplicationInfo.FLAG_KILL_AFTER_RESTORE,65536
-11,Android.Content.PM.ApplicationInfoFlags,LargeHeap,android/content/pm/ApplicationInfo.FLAG_LARGE_HEAP,1048576
+10,Android.Content.PM.ApplicationInfoFlags,KillAfterRestore,android/content/pm/ApplicationInfo.FLAG_KILL_AFTER_RESTORE,65536
+15,Android.Content.PM.ApplicationInfoFlags,LargeHeap,android/content/pm/ApplicationInfo.FLAG_LARGE_HEAP,1048576
 21,Android.Content.PM.ApplicationInfoFlags,Multiarch,android/content/pm/ApplicationInfo.FLAG_MULTIARCH,-2147483648
-1,Android.Content.PM.ApplicationInfoFlags,Persistent,android/content/pm/ApplicationInfo.FLAG_PERSISTENT,8
-4,Android.Content.PM.ApplicationInfoFlags,ResizeableForScreens,android/content/pm/ApplicationInfo.FLAG_RESIZEABLE_FOR_SCREENS,4096
-8,Android.Content.PM.ApplicationInfoFlags,RestoreAnyVersion,android/content/pm/ApplicationInfo.FLAG_RESTORE_ANY_VERSION,131072
-12,Android.Content.PM.ApplicationInfoFlags,Stopped,android/content/pm/ApplicationInfo.FLAG_STOPPED,2097152
-4,Android.Content.PM.ApplicationInfoFlags,SupportsLargeScreens,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_LARGE_SCREENS,2048
-4,Android.Content.PM.ApplicationInfoFlags,SupportsNormalScreens,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_NORMAL_SCREENS,1024
+10,Android.Content.PM.ApplicationInfoFlags,Persistent,android/content/pm/ApplicationInfo.FLAG_PERSISTENT,8
+10,Android.Content.PM.ApplicationInfoFlags,ResizeableForScreens,android/content/pm/ApplicationInfo.FLAG_RESIZEABLE_FOR_SCREENS,4096
+10,Android.Content.PM.ApplicationInfoFlags,RestoreAnyVersion,android/content/pm/ApplicationInfo.FLAG_RESTORE_ANY_VERSION,131072
+15,Android.Content.PM.ApplicationInfoFlags,Stopped,android/content/pm/ApplicationInfo.FLAG_STOPPED,2097152
+10,Android.Content.PM.ApplicationInfoFlags,SupportsLargeScreens,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_LARGE_SCREENS,2048
+10,Android.Content.PM.ApplicationInfoFlags,SupportsNormalScreens,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_NORMAL_SCREENS,1024
 17,Android.Content.PM.ApplicationInfoFlags,SupportsRtl,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_RTL,4194304
-4,Android.Content.PM.ApplicationInfoFlags,SupportsScreenDensities,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_SCREEN_DENSITIES,8192
-4,Android.Content.PM.ApplicationInfoFlags,SupportsSmallScreens,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_SMALL_SCREENS,512
-11,Android.Content.PM.ApplicationInfoFlags,SupportsXLargeScreens,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_XLARGE_SCREENS,524288
+10,Android.Content.PM.ApplicationInfoFlags,SupportsScreenDensities,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_SCREEN_DENSITIES,8192
+10,Android.Content.PM.ApplicationInfoFlags,SupportsSmallScreens,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_SMALL_SCREENS,512
+15,Android.Content.PM.ApplicationInfoFlags,SupportsXLargeScreens,android/content/pm/ApplicationInfo.FLAG_SUPPORTS_XLARGE_SCREENS,524288
 24,Android.Content.PM.ApplicationInfoFlags,Suspended,android/content/pm/ApplicationInfo.FLAG_SUSPENDED,1073741824
-1,Android.Content.PM.ApplicationInfoFlags,System,android/content/pm/ApplicationInfo.FLAG_SYSTEM,1
-4,Android.Content.PM.ApplicationInfoFlags,TestOnly,android/content/pm/ApplicationInfo.FLAG_TEST_ONLY,256
-4,Android.Content.PM.ApplicationInfoFlags,UpdatedSystemApp,android/content/pm/ApplicationInfo.FLAG_UPDATED_SYSTEM_APP,128
+10,Android.Content.PM.ApplicationInfoFlags,System,android/content/pm/ApplicationInfo.FLAG_SYSTEM,1
+10,Android.Content.PM.ApplicationInfoFlags,TestOnly,android/content/pm/ApplicationInfo.FLAG_TEST_ONLY,256
+10,Android.Content.PM.ApplicationInfoFlags,UpdatedSystemApp,android/content/pm/ApplicationInfo.FLAG_UPDATED_SYSTEM_APP,128
 23,Android.Content.PM.ApplicationInfoFlags,UsesCleartextTraffic,android/content/pm/ApplicationInfo.FLAG_USES_CLEARTEXT_TRAFFIC,134217728
-8,Android.Content.PM.ApplicationInfoFlags,VMSafeMode,android/content/pm/ApplicationInfo.FLAG_VM_SAFE_MODE,16384
+10,Android.Content.PM.ApplicationInfoFlags,VMSafeMode,android/content/pm/ApplicationInfo.FLAG_VM_SAFE_MODE,16384
 26,Android.Content.PM.ConfigChanges,ColorMode,android/content/pm/ActivityInfo.CONFIG_COLOR_MODE,16384
 17,Android.Content.PM.ConfigChanges,Density,android/content/pm/ActivityInfo.CONFIG_DENSITY,4096
-1,Android.Content.PM.ConfigChanges,FontScale,android/content/pm/ActivityInfo.CONFIG_FONT_SCALE,1073741824
-1,Android.Content.PM.ConfigChanges,Keyboard,android/content/pm/ActivityInfo.CONFIG_KEYBOARD,16
-1,Android.Content.PM.ConfigChanges,KeyboardHidden,android/content/pm/ActivityInfo.CONFIG_KEYBOARD_HIDDEN,32
+10,Android.Content.PM.ConfigChanges,FontScale,android/content/pm/ActivityInfo.CONFIG_FONT_SCALE,1073741824
+10,Android.Content.PM.ConfigChanges,Keyboard,android/content/pm/ActivityInfo.CONFIG_KEYBOARD,16
+10,Android.Content.PM.ConfigChanges,KeyboardHidden,android/content/pm/ActivityInfo.CONFIG_KEYBOARD_HIDDEN,32
 17,Android.Content.PM.ConfigChanges,LayoutDirection,android/content/pm/ActivityInfo.CONFIG_LAYOUT_DIRECTION,8192
-1,Android.Content.PM.ConfigChanges,Locale,android/content/pm/ActivityInfo.CONFIG_LOCALE,4
-1,Android.Content.PM.ConfigChanges,Mcc,android/content/pm/ActivityInfo.CONFIG_MCC,1
-1,Android.Content.PM.ConfigChanges,Mnc,android/content/pm/ActivityInfo.CONFIG_MNC,2
-1,Android.Content.PM.ConfigChanges,Navigation,android/content/pm/ActivityInfo.CONFIG_NAVIGATION,64
-1,Android.Content.PM.ConfigChanges,Orientation,android/content/pm/ActivityInfo.CONFIG_ORIENTATION,128
-4,Android.Content.PM.ConfigChanges,ScreenLayout,android/content/pm/ActivityInfo.CONFIG_SCREEN_LAYOUT,256
-13,Android.Content.PM.ConfigChanges,ScreenSize,android/content/pm/ActivityInfo.CONFIG_SCREEN_SIZE,1024
-13,Android.Content.PM.ConfigChanges,SmallestScreenSize,android/content/pm/ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE,2048
-1,Android.Content.PM.ConfigChanges,Touchscreen,android/content/pm/ActivityInfo.CONFIG_TOUCHSCREEN,8
-8,Android.Content.PM.ConfigChanges,UiMode,android/content/pm/ActivityInfo.CONFIG_UI_MODE,512
+10,Android.Content.PM.ConfigChanges,Locale,android/content/pm/ActivityInfo.CONFIG_LOCALE,4
+10,Android.Content.PM.ConfigChanges,Mcc,android/content/pm/ActivityInfo.CONFIG_MCC,1
+10,Android.Content.PM.ConfigChanges,Mnc,android/content/pm/ActivityInfo.CONFIG_MNC,2
+10,Android.Content.PM.ConfigChanges,Navigation,android/content/pm/ActivityInfo.CONFIG_NAVIGATION,64
+10,Android.Content.PM.ConfigChanges,Orientation,android/content/pm/ActivityInfo.CONFIG_ORIENTATION,128
+10,Android.Content.PM.ConfigChanges,ScreenLayout,android/content/pm/ActivityInfo.CONFIG_SCREEN_LAYOUT,256
+15,Android.Content.PM.ConfigChanges,ScreenSize,android/content/pm/ActivityInfo.CONFIG_SCREEN_SIZE,1024
+15,Android.Content.PM.ConfigChanges,SmallestScreenSize,android/content/pm/ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE,2048
+10,Android.Content.PM.ConfigChanges,Touchscreen,android/content/pm/ActivityInfo.CONFIG_TOUCHSCREEN,8
+10,Android.Content.PM.ConfigChanges,UiMode,android/content/pm/ActivityInfo.CONFIG_UI_MODE,512
 21,Android.Content.PM.DocumentLaunchMode,Always,android/content/pm/ActivityInfo.DOCUMENT_LAUNCH_ALWAYS,2
 21,Android.Content.PM.DocumentLaunchMode,IntoExisting,android/content/pm/ActivityInfo.DOCUMENT_LAUNCH_INTO_EXISTING,1
 21,Android.Content.PM.DocumentLaunchMode,Never,android/content/pm/ActivityInfo.DOCUMENT_LAUNCH_NEVER,3
 21,Android.Content.PM.DocumentLaunchMode,None,android/content/pm/ActivityInfo.DOCUMENT_LAUNCH_NONE,0
 0,Android.Content.PM.ActivityInfoFlags,None,,0
-1,Android.Content.PM.ActivityInfoFlags,AllowTaskReparenting,android/content/pm/ActivityInfo.FLAG_ALLOW_TASK_REPARENTING,64
-1,Android.Content.PM.ActivityInfoFlags,AlwaysRetainTaskState,android/content/pm/ActivityInfo.FLAG_ALWAYS_RETAIN_TASK_STATE,8
+10,Android.Content.PM.ActivityInfoFlags,AllowTaskReparenting,android/content/pm/ActivityInfo.FLAG_ALLOW_TASK_REPARENTING,64
+10,Android.Content.PM.ActivityInfoFlags,AlwaysRetainTaskState,android/content/pm/ActivityInfo.FLAG_ALWAYS_RETAIN_TASK_STATE,8
 21,Android.Content.PM.ActivityInfoFlags,AutoRemoveFromRecents,android/content/pm/ActivityInfo.FLAG_AUTO_REMOVE_FROM_RECENTS,8192
-1,Android.Content.PM.ActivityInfoFlags,ClearTaskOnLaunch,android/content/pm/ActivityInfo.FLAG_CLEAR_TASK_ON_LAUNCH,4
+10,Android.Content.PM.ActivityInfoFlags,ClearTaskOnLaunch,android/content/pm/ActivityInfo.FLAG_CLEAR_TASK_ON_LAUNCH,4
 24,Android.Content.PM.ActivityInfoFlags,EnableVrMode,android/content/pm/ActivityInfo.FLAG_ENABLE_VR_MODE,32768
-1,Android.Content.PM.ActivityInfoFlags,ExcludeFromRecents,android/content/pm/ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS,32
-5,Android.Content.PM.ActivityInfoFlags,FinishOnCloseSystemDialogs,android/content/pm/ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS,256
-1,Android.Content.PM.ActivityInfoFlags,FinishOnTaskLaunch,android/content/pm/ActivityInfo.FLAG_FINISH_ON_TASK_LAUNCH,2
-11,Android.Content.PM.ActivityInfoFlags,HardwareAccelerated,android/content/pm/ActivityInfo.FLAG_HARDWARE_ACCELERATED,512
+10,Android.Content.PM.ActivityInfoFlags,ExcludeFromRecents,android/content/pm/ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS,32
+10,Android.Content.PM.ActivityInfoFlags,FinishOnCloseSystemDialogs,android/content/pm/ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS,256
+10,Android.Content.PM.ActivityInfoFlags,FinishOnTaskLaunch,android/content/pm/ActivityInfo.FLAG_FINISH_ON_TASK_LAUNCH,2
+15,Android.Content.PM.ActivityInfoFlags,HardwareAccelerated,android/content/pm/ActivityInfo.FLAG_HARDWARE_ACCELERATED,512
 18,Android.Content.PM.ActivityInfoFlags,Immersive,android/content/pm/ActivityInfo.FLAG_IMMERSIVE,2048
-1,Android.Content.PM.ActivityInfoFlags,Multiprocess,android/content/pm/ActivityInfo.FLAG_MULTIPROCESS,1
-3,Android.Content.PM.ActivityInfoFlags,NoHistory,android/content/pm/ActivityInfo.FLAG_NO_HISTORY,128
+10,Android.Content.PM.ActivityInfoFlags,Multiprocess,android/content/pm/ActivityInfo.FLAG_MULTIPROCESS,1
+10,Android.Content.PM.ActivityInfoFlags,NoHistory,android/content/pm/ActivityInfo.FLAG_NO_HISTORY,128
 21,Android.Content.PM.ActivityInfoFlags,RelinquishTaskIdentity,android/content/pm/ActivityInfo.FLAG_RELINQUISH_TASK_IDENTITY,4096
 21,Android.Content.PM.ActivityInfoFlags,ResumeWhilePausing,android/content/pm/ActivityInfo.FLAG_RESUME_WHILE_PAUSING,16384
 17,Android.Content.PM.ActivityInfoFlags,SingleUser,android/content/pm/ActivityInfo.FLAG_SINGLE_USER,1073741824
-1,Android.Content.PM.ActivityInfoFlags,StateNotNeeded,android/content/pm/ActivityInfo.FLAG_STATE_NOT_NEEDED,16
-1,Android.Content.PM.ScreenOrientation,Behind,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_BEHIND,3
-9,Android.Content.PM.ScreenOrientation,FullSensor,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR,10
+10,Android.Content.PM.ActivityInfoFlags,StateNotNeeded,android/content/pm/ActivityInfo.FLAG_STATE_NOT_NEEDED,16
+10,Android.Content.PM.ScreenOrientation,Behind,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_BEHIND,3
+10,Android.Content.PM.ScreenOrientation,FullSensor,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR,10
 18,Android.Content.PM.ScreenOrientation,FullUser,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_FULL_USER,13
-1,Android.Content.PM.ScreenOrientation,Landscape,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,0
+10,Android.Content.PM.ScreenOrientation,Landscape,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,0
 18,Android.Content.PM.ScreenOrientation,Locked,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_LOCKED,14
-1,Android.Content.PM.ScreenOrientation,Nosensor,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_NOSENSOR,5
-1,Android.Content.PM.ScreenOrientation,Portrait,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,1
-9,Android.Content.PM.ScreenOrientation,ReverseLandscape,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE,8
-9,Android.Content.PM.ScreenOrientation,ReversePortrait,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,9
-1,Android.Content.PM.ScreenOrientation,Sensor,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_SENSOR,4
-9,Android.Content.PM.ScreenOrientation,SensorLandscape,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE,6
-9,Android.Content.PM.ScreenOrientation,SensorPortrait,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT,7
-1,Android.Content.PM.ScreenOrientation,Unspecified,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED,-1
-1,Android.Content.PM.ScreenOrientation,User,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_USER,2
+10,Android.Content.PM.ScreenOrientation,Nosensor,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_NOSENSOR,5
+10,Android.Content.PM.ScreenOrientation,Portrait,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,1
+10,Android.Content.PM.ScreenOrientation,ReverseLandscape,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE,8
+10,Android.Content.PM.ScreenOrientation,ReversePortrait,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,9
+10,Android.Content.PM.ScreenOrientation,Sensor,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_SENSOR,4
+10,Android.Content.PM.ScreenOrientation,SensorLandscape,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE,6
+10,Android.Content.PM.ScreenOrientation,SensorPortrait,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT,7
+10,Android.Content.PM.ScreenOrientation,Unspecified,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED,-1
+10,Android.Content.PM.ScreenOrientation,User,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_USER,2
 18,Android.Content.PM.ScreenOrientation,UserLandscape,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE,11
 18,Android.Content.PM.ScreenOrientation,UserPortrait,android/content/pm/ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT,12
 26,Android.Content.PM.ApplicationCategories,Audio,android/content/pm/ApplicationInfo.CATEGORY_AUDIO,1
@@ -526,24 +485,24 @@
 21,Android.Content.PM.PackageInstallStatus,Success,android/content/pm/PackageInstaller.STATUS_SUCCESS,0
 21,Android.Content.PM.PackageInstallMode,FullInstall,android/content/pm/PackageInstaller.SessionParams.MODE_FULL_INSTALL,1
 21,Android.Content.PM.PackageInstallMode,InheritExisting,android/content/pm/PackageInstaller.SessionParams.MODE_INHERIT_EXISTING,2
-1,Android.Content.PM.PackageInfoFlags,Activities,android/content/pm/PackageManager.GET_ACTIVITIES,1
-3,Android.Content.PM.PackageInfoFlags,Configurations,android/content/pm/PackageManager.GET_CONFIGURATIONS,16384
-1,Android.Content.PM.PackageInfoFlags,DisabledComponents,android/content/pm/PackageManager.GET_DISABLED_COMPONENTS,512
+10,Android.Content.PM.PackageInfoFlags,Activities,android/content/pm/PackageManager.GET_ACTIVITIES,1
+10,Android.Content.PM.PackageInfoFlags,Configurations,android/content/pm/PackageManager.GET_CONFIGURATIONS,16384
+10,Android.Content.PM.PackageInfoFlags,DisabledComponents,android/content/pm/PackageManager.GET_DISABLED_COMPONENTS,512
 18,Android.Content.PM.PackageInfoFlags,DisabledUntilUsedComponents,android/content/pm/PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,32768
-1,Android.Content.PM.PackageInfoFlags,Gids,android/content/pm/PackageManager.GET_GIDS,256
-1,Android.Content.PM.PackageInfoFlags,Instrumentation,android/content/pm/PackageManager.GET_INSTRUMENTATION,16
-1,Android.Content.PM.PackageInfoFlags,IntentFilters,android/content/pm/PackageManager.GET_INTENT_FILTERS,32
-1,Android.Content.PM.PackageInfoFlags,MetaData,android/content/pm/PackageManager.GET_META_DATA,128
-1,Android.Content.PM.PackageInfoFlags,Permissions,android/content/pm/PackageManager.GET_PERMISSIONS,4096
-1,Android.Content.PM.PackageInfoFlags,Providers,android/content/pm/PackageManager.GET_PROVIDERS,8
-1,Android.Content.PM.PackageInfoFlags,Receivers,android/content/pm/PackageManager.GET_RECEIVERS,2
-1,Android.Content.PM.PackageInfoFlags,ResolvedFilter,android/content/pm/PackageManager.GET_RESOLVED_FILTER,64
-1,Android.Content.PM.PackageInfoFlags,Services,android/content/pm/PackageManager.GET_SERVICES,4
-1,Android.Content.PM.PackageInfoFlags,SharedLibraryFiles,android/content/pm/PackageManager.GET_SHARED_LIBRARY_FILES,1024
-1,Android.Content.PM.PackageInfoFlags,Signatures,android/content/pm/PackageManager.GET_SIGNATURES,64
-3,Android.Content.PM.PackageInfoFlags,UninstalledPackages,android/content/pm/PackageManager.GET_UNINSTALLED_PACKAGES,8192
-1,Android.Content.PM.PackageInfoFlags,UriPermissionPatterns,android/content/pm/PackageManager.GET_URI_PERMISSION_PATTERNS,2048
-1,Android.Content.PM.PackageInfoFlags,MatchDefaultOnly,android/content/pm/PackageManager.MATCH_DEFAULT_ONLY,65536
+10,Android.Content.PM.PackageInfoFlags,Gids,android/content/pm/PackageManager.GET_GIDS,256
+10,Android.Content.PM.PackageInfoFlags,Instrumentation,android/content/pm/PackageManager.GET_INSTRUMENTATION,16
+10,Android.Content.PM.PackageInfoFlags,IntentFilters,android/content/pm/PackageManager.GET_INTENT_FILTERS,32
+10,Android.Content.PM.PackageInfoFlags,MetaData,android/content/pm/PackageManager.GET_META_DATA,128
+10,Android.Content.PM.PackageInfoFlags,Permissions,android/content/pm/PackageManager.GET_PERMISSIONS,4096
+10,Android.Content.PM.PackageInfoFlags,Providers,android/content/pm/PackageManager.GET_PROVIDERS,8
+10,Android.Content.PM.PackageInfoFlags,Receivers,android/content/pm/PackageManager.GET_RECEIVERS,2
+10,Android.Content.PM.PackageInfoFlags,ResolvedFilter,android/content/pm/PackageManager.GET_RESOLVED_FILTER,64
+10,Android.Content.PM.PackageInfoFlags,Services,android/content/pm/PackageManager.GET_SERVICES,4
+10,Android.Content.PM.PackageInfoFlags,SharedLibraryFiles,android/content/pm/PackageManager.GET_SHARED_LIBRARY_FILES,1024
+10,Android.Content.PM.PackageInfoFlags,Signatures,android/content/pm/PackageManager.GET_SIGNATURES,64
+10,Android.Content.PM.PackageInfoFlags,UninstalledPackages,android/content/pm/PackageManager.GET_UNINSTALLED_PACKAGES,8192
+10,Android.Content.PM.PackageInfoFlags,UriPermissionPatterns,android/content/pm/PackageManager.GET_URI_PERMISSION_PATTERNS,2048
+10,Android.Content.PM.PackageInfoFlags,MatchDefaultOnly,android/content/pm/PackageManager.MATCH_DEFAULT_ONLY,65536
 23,Android.Content.PM.PackageInfoFlags,MatchAll,android/content/pm/PackageManager.MATCH_ALL,131072
 24,Android.Content.PM.PackageInfoFlags,MatchDirectBootAware,android/content/pm/PackageManager.MATCH_DIRECT_BOOT_AWARE,524288
 24,Android.Content.PM.PackageInfoFlags,MatchDirectBootUnaware,android/content/pm/PackageManager.MATCH_DIRECT_BOOT_UNAWARE,262144
@@ -551,15 +510,16 @@
 24,Android.Content.PM.PackageInfoFlags,MatchDisabledUntilUsedComponents,android/content/pm/PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS,32768
 24,Android.Content.PM.PackageInfoFlags,MatchSystemOnly,android/content/pm/PackageManager.MATCH_SYSTEM_ONLY,1048576
 24,Android.Content.PM.PackageInfoFlags,MatchUninstalledPackages,android/content/pm/PackageManager.MATCH_UNINSTALLED_PACKAGES,8192
-1,Android.Content.PM.ComponentEnabledState,Default,android/content/pm/PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,0
-1,Android.Content.PM.ComponentEnabledState,Disabled,android/content/pm/PackageManager.COMPONENT_ENABLED_STATE_DISABLED,2
+10,Android.Content.PM.ComponentEnabledState,Default,android/content/pm/PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,0
+10,Android.Content.PM.ComponentEnabledState,Disabled,android/content/pm/PackageManager.COMPONENT_ENABLED_STATE_DISABLED,2
 18,Android.Content.PM.ComponentEnabledState,DisabledUntilUsed,android/content/pm/PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED,4
-14,Android.Content.PM.ComponentEnabledState,DisabledUser,android/content/pm/PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER,3
-1,Android.Content.PM.ComponentEnabledState,Enabled,android/content/pm/PackageManager.COMPONENT_ENABLED_STATE_ENABLED,1
-1,Android.Content.PM.Protection,Dangerous,android/content/pm/PermissionInfo.PROTECTION_DANGEROUS,1
+15,Android.Content.PM.ComponentEnabledState,DisabledUser,android/content/pm/PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER,3
+10,Android.Content.PM.ComponentEnabledState,Enabled,android/content/pm/PackageManager.COMPONENT_ENABLED_STATE_ENABLED,1
+10,Android.Content.PM.Protection,Dangerous,android/content/pm/PermissionInfo.PROTECTION_DANGEROUS,1
 21,Android.Content.PM.Protection,FlagAppop,android/content/pm/PermissionInfo.PROTECTION_FLAG_APPOP,64
 16,Android.Content.PM.Protection,FlagDevelopment,android/content/pm/PermissionInfo.PROTECTION_FLAG_DEVELOPMENT,32
 23,Android.Content.PM.Protection,FlagInstaller,android/content/pm/PermissionInfo.PROTECTION_FLAG_INSTALLER,256
+27,Android.Content.PM.Protection,FlagInstant,android/content/pm/PermissionInfo.PROTECTION_FLAG_INSTANT,4096
 23,Android.Content.PM.Protection,FlagPre23,android/content/pm/PermissionInfo.PROTECTION_FLAG_PRE23,128
 23,Android.Content.PM.Protection,FlagPreinstalled,android/content/pm/PermissionInfo.PROTECTION_FLAG_PREINSTALLED,1024
 23,Android.Content.PM.Protection,FlagPrivileged,android/content/pm/PermissionInfo.PROTECTION_FLAG_PRIVILEGED,16
@@ -569,116 +529,116 @@
 23,Android.Content.PM.Protection,FlagVerifier,android/content/pm/PermissionInfo.PROTECTION_FLAG_VERIFIER,512
 16,Android.Content.PM.Protection,MaskBase,android/content/pm/PermissionInfo.PROTECTION_MASK_BASE,15
 16,Android.Content.PM.Protection,MaskFlags,android/content/pm/PermissionInfo.PROTECTION_MASK_FLAGS,65520
-1,Android.Content.PM.Protection,Normal,android/content/pm/PermissionInfo.PROTECTION_NORMAL,0
-1,Android.Content.PM.Protection,Signature,android/content/pm/PermissionInfo.PROTECTION_SIGNATURE,2
-1,Android.Content.PM.Protection,SignatureOrSystem,android/content/pm/PermissionInfo.PROTECTION_SIGNATURE_OR_SYSTEM,3
+10,Android.Content.PM.Protection,Normal,android/content/pm/PermissionInfo.PROTECTION_NORMAL,0
+10,Android.Content.PM.Protection,Signature,android/content/pm/PermissionInfo.PROTECTION_SIGNATURE,2
+10,Android.Content.PM.Protection,SignatureOrSystem,android/content/pm/PermissionInfo.PROTECTION_SIGNATURE_OR_SYSTEM,3
 17,Android.Content.Res.ScreenLayout,LayoutdirLtr,android/content/res/Configuration.SCREENLAYOUT_LAYOUTDIR_LTR,64
 17,Android.Content.Res.ScreenLayout,LayoutdirMask,android/content/res/Configuration.SCREENLAYOUT_LAYOUTDIR_MASK,192
 17,Android.Content.Res.ScreenLayout,LayoutdirRtl,android/content/res/Configuration.SCREENLAYOUT_LAYOUTDIR_RTL,128
 17,Android.Content.Res.ScreenLayout,LayoutdirShift,android/content/res/Configuration.SCREENLAYOUT_LAYOUTDIR_SHIFT,6
 17,Android.Content.Res.ScreenLayout,LayoutdirUndefined,android/content/res/Configuration.SCREENLAYOUT_LAYOUTDIR_UNDEFINED,0
-4,Android.Content.Res.ScreenLayout,LongMask,android/content/res/Configuration.SCREENLAYOUT_LONG_MASK,48
-4,Android.Content.Res.ScreenLayout,LongNo,android/content/res/Configuration.SCREENLAYOUT_LONG_NO,16
-4,Android.Content.Res.ScreenLayout,LongUndefined,android/content/res/Configuration.SCREENLAYOUT_LONG_UNDEFINED,0
-4,Android.Content.Res.ScreenLayout,LongYes,android/content/res/Configuration.SCREENLAYOUT_LONG_YES,32
+10,Android.Content.Res.ScreenLayout,LongMask,android/content/res/Configuration.SCREENLAYOUT_LONG_MASK,48
+10,Android.Content.Res.ScreenLayout,LongNo,android/content/res/Configuration.SCREENLAYOUT_LONG_NO,16
+10,Android.Content.Res.ScreenLayout,LongUndefined,android/content/res/Configuration.SCREENLAYOUT_LONG_UNDEFINED,0
+10,Android.Content.Res.ScreenLayout,LongYes,android/content/res/Configuration.SCREENLAYOUT_LONG_YES,32
 23,Android.Content.Res.ScreenLayout,RoundMask,android/content/res/Configuration.SCREENLAYOUT_ROUND_MASK,768
 23,Android.Content.Res.ScreenLayout,RoundNo,android/content/res/Configuration.SCREENLAYOUT_ROUND_NO,256
 23,Android.Content.Res.ScreenLayout,RoundUndefined,android/content/res/Configuration.SCREENLAYOUT_ROUND_UNDEFINED,0
 23,Android.Content.Res.ScreenLayout,RoundYes,android/content/res/Configuration.SCREENLAYOUT_ROUND_YES,512
-4,Android.Content.Res.ScreenLayout,SizeLarge,android/content/res/Configuration.SCREENLAYOUT_SIZE_LARGE,3
-4,Android.Content.Res.ScreenLayout,SizeMask,android/content/res/Configuration.SCREENLAYOUT_SIZE_MASK,15
-4,Android.Content.Res.ScreenLayout,SizeNormal,android/content/res/Configuration.SCREENLAYOUT_SIZE_NORMAL,2
-4,Android.Content.Res.ScreenLayout,SizeSmall,android/content/res/Configuration.SCREENLAYOUT_SIZE_SMALL,1
-4,Android.Content.Res.ScreenLayout,SizeUndefined,android/content/res/Configuration.SCREENLAYOUT_SIZE_UNDEFINED,0
-9,Android.Content.Res.ScreenLayout,SizeXlarge,android/content/res/Configuration.SCREENLAYOUT_SIZE_XLARGE,4
+10,Android.Content.Res.ScreenLayout,SizeLarge,android/content/res/Configuration.SCREENLAYOUT_SIZE_LARGE,3
+10,Android.Content.Res.ScreenLayout,SizeMask,android/content/res/Configuration.SCREENLAYOUT_SIZE_MASK,15
+10,Android.Content.Res.ScreenLayout,SizeNormal,android/content/res/Configuration.SCREENLAYOUT_SIZE_NORMAL,2
+10,Android.Content.Res.ScreenLayout,SizeSmall,android/content/res/Configuration.SCREENLAYOUT_SIZE_SMALL,1
+10,Android.Content.Res.ScreenLayout,SizeUndefined,android/content/res/Configuration.SCREENLAYOUT_SIZE_UNDEFINED,0
+10,Android.Content.Res.ScreenLayout,SizeXlarge,android/content/res/Configuration.SCREENLAYOUT_SIZE_XLARGE,4
 17,Android.Content.Res.ScreenLayout,Undefined,android/content/res/Configuration.SCREENLAYOUT_UNDEFINED,0
-11,Android.Database.FieldType,Blob,I:android/database/Cursor.FIELD_TYPE_BLOB,4
-11,Android.Database.FieldType,Float,I:android/database/Cursor.FIELD_TYPE_FLOAT,2
-11,Android.Database.FieldType,Integer,I:android/database/Cursor.FIELD_TYPE_INTEGER,1
-11,Android.Database.FieldType,Null,I:android/database/Cursor.FIELD_TYPE_NULL,0
-11,Android.Database.FieldType,String,I:android/database/Cursor.FIELD_TYPE_STRING,3
-11,Android.Database.StatementType,Abort,android/database/DatabaseUtils.STATEMENT_ABORT,6
-11,Android.Database.StatementType,Attach,android/database/DatabaseUtils.STATEMENT_ATTACH,3
-11,Android.Database.StatementType,Begin,android/database/DatabaseUtils.STATEMENT_BEGIN,4
-11,Android.Database.StatementType,Commit,android/database/DatabaseUtils.STATEMENT_COMMIT,5
-11,Android.Database.StatementType,Ddl,android/database/DatabaseUtils.STATEMENT_DDL,8
-11,Android.Database.StatementType,Other,android/database/DatabaseUtils.STATEMENT_OTHER,99
-11,Android.Database.StatementType,Pragma,android/database/DatabaseUtils.STATEMENT_PRAGMA,7
-11,Android.Database.StatementType,Select,android/database/DatabaseUtils.STATEMENT_SELECT,1
-11,Android.Database.StatementType,Unprepared,android/database/DatabaseUtils.STATEMENT_UNPREPARED,9
-11,Android.Database.StatementType,Update,android/database/DatabaseUtils.STATEMENT_UPDATE,2
-11,Android.Drm.DrmInfoRequestType,RegistrationInfo,android/drm/DrmInfoRequest.TYPE_REGISTRATION_INFO,1
-11,Android.Drm.DrmInfoRequestType,RightsAcquisition,android/drm/DrmInfoRequest.TYPE_RIGHTS_ACQUISITION_INFO,3
-11,Android.Drm.DrmInfoRequestType,RightsAcquisitionProgressInfo,android/drm/DrmInfoRequest.TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO,4
-11,Android.Drm.DrmInfoRequestType,UnregistrationInfo,android/drm/DrmInfoRequest.TYPE_UNREGISTRATION_INFO,2
-4,Android.Gestures.GestureStrokeType,Multiple,android/gesture/GestureOverlayView.GESTURE_STROKE_TYPE_MULTIPLE,1
-4,Android.Gestures.GestureStrokeType,Single,android/gesture/GestureOverlayView.GESTURE_STROKE_TYPE_SINGLE,0
-1,Android.Graphics.Format,A8,android/graphics/PixelFormat.A_8,8
-1,Android.Graphics.Format,Jpeg,android/graphics/PixelFormat.JPEG,256
-1,Android.Graphics.Format,La88,android/graphics/PixelFormat.LA_88,10
-1,Android.Graphics.Format,L8,android/graphics/PixelFormat.L_8,9
-1,Android.Graphics.Format,Opaque,android/graphics/PixelFormat.OPAQUE,-1
+15,Android.Database.FieldType,Blob,I:android/database/Cursor.FIELD_TYPE_BLOB,4
+15,Android.Database.FieldType,Float,I:android/database/Cursor.FIELD_TYPE_FLOAT,2
+15,Android.Database.FieldType,Integer,I:android/database/Cursor.FIELD_TYPE_INTEGER,1
+15,Android.Database.FieldType,Null,I:android/database/Cursor.FIELD_TYPE_NULL,0
+15,Android.Database.FieldType,String,I:android/database/Cursor.FIELD_TYPE_STRING,3
+15,Android.Database.StatementType,Abort,android/database/DatabaseUtils.STATEMENT_ABORT,6
+15,Android.Database.StatementType,Attach,android/database/DatabaseUtils.STATEMENT_ATTACH,3
+15,Android.Database.StatementType,Begin,android/database/DatabaseUtils.STATEMENT_BEGIN,4
+15,Android.Database.StatementType,Commit,android/database/DatabaseUtils.STATEMENT_COMMIT,5
+15,Android.Database.StatementType,Ddl,android/database/DatabaseUtils.STATEMENT_DDL,8
+15,Android.Database.StatementType,Other,android/database/DatabaseUtils.STATEMENT_OTHER,99
+15,Android.Database.StatementType,Pragma,android/database/DatabaseUtils.STATEMENT_PRAGMA,7
+15,Android.Database.StatementType,Select,android/database/DatabaseUtils.STATEMENT_SELECT,1
+15,Android.Database.StatementType,Unprepared,android/database/DatabaseUtils.STATEMENT_UNPREPARED,9
+15,Android.Database.StatementType,Update,android/database/DatabaseUtils.STATEMENT_UPDATE,2
+15,Android.Drm.DrmInfoRequestType,RegistrationInfo,android/drm/DrmInfoRequest.TYPE_REGISTRATION_INFO,1
+15,Android.Drm.DrmInfoRequestType,RightsAcquisition,android/drm/DrmInfoRequest.TYPE_RIGHTS_ACQUISITION_INFO,3
+15,Android.Drm.DrmInfoRequestType,RightsAcquisitionProgressInfo,android/drm/DrmInfoRequest.TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO,4
+15,Android.Drm.DrmInfoRequestType,UnregistrationInfo,android/drm/DrmInfoRequest.TYPE_UNREGISTRATION_INFO,2
+10,Android.Gestures.GestureStrokeType,Multiple,android/gesture/GestureOverlayView.GESTURE_STROKE_TYPE_MULTIPLE,1
+10,Android.Gestures.GestureStrokeType,Single,android/gesture/GestureOverlayView.GESTURE_STROKE_TYPE_SINGLE,0
+10,Android.Graphics.Format,A8,android/graphics/PixelFormat.A_8,8
+10,Android.Graphics.Format,Jpeg,android/graphics/PixelFormat.JPEG,256
+10,Android.Graphics.Format,L8,android/graphics/PixelFormat.L_8,9
+10,Android.Graphics.Format,La88,android/graphics/PixelFormat.LA_88,10
+10,Android.Graphics.Format,Opaque,android/graphics/PixelFormat.OPAQUE,-1
+10,Android.Graphics.Format,Rgb332,android/graphics/PixelFormat.RGB_332,11
+10,Android.Graphics.Format,Rgb565,android/graphics/PixelFormat.RGB_565,4
+10,Android.Graphics.Format,Rgb888,android/graphics/PixelFormat.RGB_888,3
 26,Android.Graphics.Format,Rgba1010102,android/graphics/PixelFormat.RGBA_1010102,43
-1,Android.Graphics.Format,Rgba4444,android/graphics/PixelFormat.RGBA_4444,7
-1,Android.Graphics.Format,Rgba5551,android/graphics/PixelFormat.RGBA_5551,6
-1,Android.Graphics.Format,Rgba8888,android/graphics/PixelFormat.RGBA_8888,1
+10,Android.Graphics.Format,Rgba4444,android/graphics/PixelFormat.RGBA_4444,7
+10,Android.Graphics.Format,Rgba5551,android/graphics/PixelFormat.RGBA_5551,6
+10,Android.Graphics.Format,Rgba8888,android/graphics/PixelFormat.RGBA_8888,1
 26,Android.Graphics.Format,RgbaF16,android/graphics/PixelFormat.RGBA_F16,22
-1,Android.Graphics.Format,Rgbx8888,android/graphics/PixelFormat.RGBX_8888,2
-1,Android.Graphics.Format,Rgb332,android/graphics/PixelFormat.RGB_332,11
-1,Android.Graphics.Format,Rgb565,android/graphics/PixelFormat.RGB_565,4
-1,Android.Graphics.Format,Rgb888,android/graphics/PixelFormat.RGB_888,3
-1,Android.Graphics.Format,Translucent,android/graphics/PixelFormat.TRANSLUCENT,-3
-1,Android.Graphics.Format,Transparent,android/graphics/PixelFormat.TRANSPARENT,-2
-1,Android.Graphics.Format,Unknown,android/graphics/PixelFormat.UNKNOWN,0
-1,Android.Graphics.Format,Ycbcr420Sp,android/graphics/PixelFormat.YCbCr_420_SP,17
-5,Android.Graphics.Format,Ycbcr422I,android/graphics/PixelFormat.YCbCr_422_I,20
-1,Android.Graphics.Format,Ycbcr422Sp,android/graphics/PixelFormat.YCbCr_422_SP,16
-1,Android.Graphics.SaveFlags,All,android/graphics/Canvas.ALL_SAVE_FLAG,31
-1,Android.Graphics.SaveFlags,Clip,android/graphics/Canvas.CLIP_SAVE_FLAG,2
-1,Android.Graphics.SaveFlags,ClipToLayer,android/graphics/Canvas.CLIP_TO_LAYER_SAVE_FLAG,16
-1,Android.Graphics.SaveFlags,FullColorLayer,android/graphics/Canvas.FULL_COLOR_LAYER_SAVE_FLAG,8
-1,Android.Graphics.SaveFlags,HasAlphaLayer,android/graphics/Canvas.HAS_ALPHA_LAYER_SAVE_FLAG,4
-1,Android.Graphics.SaveFlags,Matrix,android/graphics/Canvas.MATRIX_SAVE_FLAG,1
+10,Android.Graphics.Format,Rgbx8888,android/graphics/PixelFormat.RGBX_8888,2
+10,Android.Graphics.Format,Translucent,android/graphics/PixelFormat.TRANSLUCENT,-3
+10,Android.Graphics.Format,Transparent,android/graphics/PixelFormat.TRANSPARENT,-2
+10,Android.Graphics.Format,Unknown,android/graphics/PixelFormat.UNKNOWN,0
+10,Android.Graphics.Format,Ycbcr420Sp,android/graphics/PixelFormat.YCbCr_420_SP,17
+10,Android.Graphics.Format,Ycbcr422I,android/graphics/PixelFormat.YCbCr_422_I,20
+10,Android.Graphics.Format,Ycbcr422Sp,android/graphics/PixelFormat.YCbCr_422_SP,16
+10,Android.Graphics.SaveFlags,All,android/graphics/Canvas.ALL_SAVE_FLAG,31
+10,Android.Graphics.SaveFlags,Clip,android/graphics/Canvas.CLIP_SAVE_FLAG,2
+10,Android.Graphics.SaveFlags,ClipToLayer,android/graphics/Canvas.CLIP_TO_LAYER_SAVE_FLAG,16
+10,Android.Graphics.SaveFlags,FullColorLayer,android/graphics/Canvas.FULL_COLOR_LAYER_SAVE_FLAG,8
+10,Android.Graphics.SaveFlags,HasAlphaLayer,android/graphics/Canvas.HAS_ALPHA_LAYER_SAVE_FLAG,4
+10,Android.Graphics.SaveFlags,Matrix,android/graphics/Canvas.MATRIX_SAVE_FLAG,1
+26,Android.Hardware.HardwareBufferFormat,Rgb565,android/hardware/HardwareBuffer.RGB_565,4
+26,Android.Hardware.HardwareBufferFormat,Rgb888,android/hardware/HardwareBuffer.RGB_888,3
 26,Android.Hardware.HardwareBufferFormat,Rgba1010102,android/hardware/HardwareBuffer.RGBA_1010102,43
 26,Android.Hardware.HardwareBufferFormat,Rgba8888,android/hardware/HardwareBuffer.RGBA_8888,1
 26,Android.Hardware.HardwareBufferFormat,RgbaFp16,android/hardware/HardwareBuffer.RGBA_FP16,22
 26,Android.Hardware.HardwareBufferFormat,Rgbx8888,android/hardware/HardwareBuffer.RGBX_8888,2
-26,Android.Hardware.HardwareBufferFormat,Rgb565,android/hardware/HardwareBuffer.RGB_565,4
-26,Android.Hardware.HardwareBufferFormat,Rgb888,android/hardware/HardwareBuffer.RGB_888,3
 26,Android.Hardware.HardwareBufferFormat,Blob,android/hardware/HardwareBuffer.BLOB,33
 21,Android.Hardware.ReportingMode,Continuous,android/hardware/Sensor.REPORTING_MODE_CONTINUOUS,0
-21,Android.Hardware.ReportingMode,OneShot,android/hardware/Sensor.REPORTING_MODE_ONE_SHOT,2
 21,Android.Hardware.ReportingMode,OnChange,android/hardware/Sensor.REPORTING_MODE_ON_CHANGE,1
+21,Android.Hardware.ReportingMode,OneShot,android/hardware/Sensor.REPORTING_MODE_ONE_SHOT,2
 21,Android.Hardware.ReportingMode,SpecialTrigger,android/hardware/Sensor.REPORTING_MODE_SPECIAL_TRIGGER,3
-3,Android.Hardware.SensorType,Accelerometer,android/hardware/Sensor.TYPE_ACCELEROMETER,1
+10,Android.Hardware.SensorType,Accelerometer,android/hardware/Sensor.TYPE_ACCELEROMETER,1
 26,Android.Hardware.SensorType,AccelerometerUncalibrated,android/hardware/Sensor.TYPE_ACCELEROMETER_UNCALIBRATED,35
-3,Android.Hardware.SensorType,All,android/hardware/Sensor.TYPE_ALL,-1
-14,Android.Hardware.SensorType,AmbientTemperature,android/hardware/Sensor.TYPE_AMBIENT_TEMPERATURE,13
+10,Android.Hardware.SensorType,All,android/hardware/Sensor.TYPE_ALL,-1
+15,Android.Hardware.SensorType,AmbientTemperature,android/hardware/Sensor.TYPE_AMBIENT_TEMPERATURE,13
 24,Android.Hardware.SensorType,DevicePrivateBase,android/hardware/Sensor.TYPE_DEVICE_PRIVATE_BASE,65536
 18,Android.Hardware.SensorType,GameRotationVector,android/hardware/Sensor.TYPE_GAME_ROTATION_VECTOR,15
 19,Android.Hardware.SensorType,GeomagneticRotationVector,android/hardware/Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR,20
-9,Android.Hardware.SensorType,Gravity,android/hardware/Sensor.TYPE_GRAVITY,9
-3,Android.Hardware.SensorType,Gyroscope,android/hardware/Sensor.TYPE_GYROSCOPE,4
+10,Android.Hardware.SensorType,Gravity,android/hardware/Sensor.TYPE_GRAVITY,9
+10,Android.Hardware.SensorType,Gyroscope,android/hardware/Sensor.TYPE_GYROSCOPE,4
 18,Android.Hardware.SensorType,GyroscopeUncalibrated,android/hardware/Sensor.TYPE_GYROSCOPE_UNCALIBRATED,16
 24,Android.Hardware.SensorType,HeartBeat,android/hardware/Sensor.TYPE_HEART_BEAT,31
 20,Android.Hardware.SensorType,HeartRate,android/hardware/Sensor.TYPE_HEART_RATE,21
-3,Android.Hardware.SensorType,Light,android/hardware/Sensor.TYPE_LIGHT,5
-9,Android.Hardware.SensorType,LinearAcceleration,android/hardware/Sensor.TYPE_LINEAR_ACCELERATION,10
+10,Android.Hardware.SensorType,Light,android/hardware/Sensor.TYPE_LIGHT,5
+10,Android.Hardware.SensorType,LinearAcceleration,android/hardware/Sensor.TYPE_LINEAR_ACCELERATION,10
 26,Android.Hardware.SensorType,LowLatencyOffbodyDetect,android/hardware/Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT,34
-3,Android.Hardware.SensorType,MagneticField,android/hardware/Sensor.TYPE_MAGNETIC_FIELD,2
+10,Android.Hardware.SensorType,MagneticField,android/hardware/Sensor.TYPE_MAGNETIC_FIELD,2
 18,Android.Hardware.SensorType,MagneticFieldUncalibrated,android/hardware/Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED,14
 24,Android.Hardware.SensorType,MotionDetect,android/hardware/Sensor.TYPE_MOTION_DETECT,30
-3,Android.Hardware.SensorType,Orientation,android/hardware/Sensor.TYPE_ORIENTATION,3
+10,Android.Hardware.SensorType,Orientation,android/hardware/Sensor.TYPE_ORIENTATION,3
 24,Android.Hardware.SensorType,Pose6dof,android/hardware/Sensor.TYPE_POSE_6DOF,28
-3,Android.Hardware.SensorType,Pressure,android/hardware/Sensor.TYPE_PRESSURE,6
-3,Android.Hardware.SensorType,Proximity,android/hardware/Sensor.TYPE_PROXIMITY,8
-14,Android.Hardware.SensorType,RelativeHumidity,android/hardware/Sensor.TYPE_RELATIVE_HUMIDITY,12
-9,Android.Hardware.SensorType,RotationVector,android/hardware/Sensor.TYPE_ROTATION_VECTOR,11
+10,Android.Hardware.SensorType,Pressure,android/hardware/Sensor.TYPE_PRESSURE,6
+10,Android.Hardware.SensorType,Proximity,android/hardware/Sensor.TYPE_PROXIMITY,8
+15,Android.Hardware.SensorType,RelativeHumidity,android/hardware/Sensor.TYPE_RELATIVE_HUMIDITY,12
+10,Android.Hardware.SensorType,RotationVector,android/hardware/Sensor.TYPE_ROTATION_VECTOR,11
 18,Android.Hardware.SensorType,SignificantMotion,android/hardware/Sensor.TYPE_SIGNIFICANT_MOTION,17
 24,Android.Hardware.SensorType,StationaryDetect,android/hardware/Sensor.TYPE_STATIONARY_DETECT,29
 19,Android.Hardware.SensorType,StepCounter,android/hardware/Sensor.TYPE_STEP_COUNTER,19
 19,Android.Hardware.SensorType,StepDetector,android/hardware/Sensor.TYPE_STEP_DETECTOR,18
-3,Android.Hardware.SensorType,Temperature,android/hardware/Sensor.TYPE_TEMPERATURE,7
+10,Android.Hardware.SensorType,Temperature,android/hardware/Sensor.TYPE_TEMPERATURE,7
 26,Android.Hardware.SensorDirectRateLevel,Fast,android/hardware/SensorDirectChannel.RATE_FAST,2
 26,Android.Hardware.SensorDirectRateLevel,Normal,android/hardware/SensorDirectChannel.RATE_NORMAL,1
 26,Android.Hardware.SensorDirectRateLevel,Stop,android/hardware/SensorDirectChannel.RATE_STOP,0
@@ -853,9 +813,9 @@
 21,Android.Hardware.Camera2.SensorReferenceIlluminant1,D55,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_D55,20
 21,Android.Hardware.Camera2.SensorReferenceIlluminant1,D65,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_D65,21
 21,Android.Hardware.Camera2.SensorReferenceIlluminant1,D75,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_D75,22
+21,Android.Hardware.Camera2.SensorReferenceIlluminant1,DayWhiteFluorescent,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_DAY_WHITE_FLUORESCENT,13
 21,Android.Hardware.Camera2.SensorReferenceIlluminant1,Daylight,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_DAYLIGHT,1
 21,Android.Hardware.Camera2.SensorReferenceIlluminant1,DaylightFluorescent,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_DAYLIGHT_FLUORESCENT,12
-21,Android.Hardware.Camera2.SensorReferenceIlluminant1,DayWhiteFluorescent,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_DAY_WHITE_FLUORESCENT,13
 21,Android.Hardware.Camera2.SensorReferenceIlluminant1,FineWeather,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_FINE_WEATHER,9
 21,Android.Hardware.Camera2.SensorReferenceIlluminant1,Flash,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_FLASH,4
 21,Android.Hardware.Camera2.SensorReferenceIlluminant1,Fluorescent,android/hardware/camera2/CameraMetadata.SENSOR_REFERENCE_ILLUMINANT1_FLUORESCENT,2
@@ -895,69 +855,69 @@
 21,Android.Hardware.Camera2.Params.TonemapCurveChannel,Blue,android/hardware/camera2/params/TonemapCurve.CHANNEL_BLUE,2
 21,Android.Hardware.Camera2.Params.TonemapCurveChannel,Green,android/hardware/camera2/params/TonemapCurve.CHANNEL_GREEN,1
 21,Android.Hardware.Camera2.Params.TonemapCurveChannel,Red,android/hardware/camera2/params/TonemapCurve.CHANNEL_RED,0
-12,Android.Hardware.Usb.UsbClass,AppSpec,android/hardware/usb/UsbConstants.USB_CLASS_APP_SPEC,254
-12,Android.Hardware.Usb.UsbClass,Audio,android/hardware/usb/UsbConstants.USB_CLASS_AUDIO,1
-12,Android.Hardware.Usb.UsbClass,CdcData,android/hardware/usb/UsbConstants.USB_CLASS_CDC_DATA,10
-12,Android.Hardware.Usb.UsbClass,Comm,android/hardware/usb/UsbConstants.USB_CLASS_COMM,2
-12,Android.Hardware.Usb.UsbClass,ContentSec,android/hardware/usb/UsbConstants.USB_CLASS_CONTENT_SEC,13
-12,Android.Hardware.Usb.UsbClass,CscId,android/hardware/usb/UsbConstants.USB_CLASS_CSCID,11
-12,Android.Hardware.Usb.UsbClass,Hid,android/hardware/usb/UsbConstants.USB_CLASS_HID,3
-12,Android.Hardware.Usb.UsbClass,Hub,android/hardware/usb/UsbConstants.USB_CLASS_HUB,9
-12,Android.Hardware.Usb.UsbClass,MassStorage,android/hardware/usb/UsbConstants.USB_CLASS_MASS_STORAGE,8
-12,Android.Hardware.Usb.UsbClass,Misc,android/hardware/usb/UsbConstants.USB_CLASS_MISC,239
-12,Android.Hardware.Usb.UsbClass,PerInterface,android/hardware/usb/UsbConstants.USB_CLASS_PER_INTERFACE,0
-12,Android.Hardware.Usb.UsbClass,Physica,android/hardware/usb/UsbConstants.USB_CLASS_PHYSICA,5
-12,Android.Hardware.Usb.UsbClass,Printer,android/hardware/usb/UsbConstants.USB_CLASS_PRINTER,7
-12,Android.Hardware.Usb.UsbClass,StillImage,android/hardware/usb/UsbConstants.USB_CLASS_STILL_IMAGE,6
-12,Android.Hardware.Usb.UsbClass,VendorSpec,android/hardware/usb/UsbConstants.USB_CLASS_VENDOR_SPEC,255
-12,Android.Hardware.Usb.UsbClass,Video,android/hardware/usb/UsbConstants.USB_CLASS_VIDEO,14
-12,Android.Hardware.Usb.UsbClass,WirelessController,android/hardware/usb/UsbConstants.USB_CLASS_WIRELESS_CONTROLLER,224
-12,Android.Hardware.Usb.UsbAddressing,In,android/hardware/usb/UsbConstants.USB_DIR_IN,128
-12,Android.Hardware.Usb.UsbAddressing,Out,android/hardware/usb/UsbConstants.USB_DIR_OUT,0
-12,Android.Hardware.Usb.UsbAddressing,DirMask,android/hardware/usb/UsbConstants.USB_ENDPOINT_DIR_MASK,128
-12,Android.Hardware.Usb.UsbAddressing,NumberMask,android/hardware/usb/UsbConstants.USB_ENDPOINT_NUMBER_MASK,15
-12,Android.Hardware.Usb.UsbAddressing,XferTypeMask,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFERTYPE_MASK,3
-12,Android.Hardware.Usb.UsbAddressing,XferBulk,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFER_BULK,2
-12,Android.Hardware.Usb.UsbAddressing,XferControl,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFER_CONTROL,0
-12,Android.Hardware.Usb.UsbAddressing,XferInterrupt,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFER_INT,3
-12,Android.Hardware.Usb.UsbAddressing,XferIsochronous,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFER_ISOC,1
-11,Android.InputMethodServices.BackDisposition,Default,android/inputmethodservice/InputMethodService.BACK_DISPOSITION_DEFAULT,0
-11,Android.InputMethodServices.BackDisposition,WillDismiss,android/inputmethodservice/InputMethodService.BACK_DISPOSITION_WILL_DISMISS,2
-11,Android.InputMethodServices.BackDisposition,WillNotDismiss,android/inputmethodservice/InputMethodService.BACK_DISPOSITION_WILL_NOT_DISMISS,1
-3,Android.InputMethodServices.TouchableInsets,Content,android/inputmethodservice/InputMethodService$Insets.TOUCHABLE_INSETS_CONTENT,1
-3,Android.InputMethodServices.TouchableInsets,Frame,android/inputmethodservice/InputMethodService$Insets.TOUCHABLE_INSETS_FRAME,0
-11,Android.InputMethodServices.TouchableInsets,Region,android/inputmethodservice/InputMethodService$Insets.TOUCHABLE_INSETS_REGION,3
-3,Android.InputMethodServices.TouchableInsets,Visible,android/inputmethodservice/InputMethodService$Insets.TOUCHABLE_INSETS_VISIBLE,2
-3,Android.InputMethodServices.Edge,Bottom,android/inputmethodservice/Keyboard.EDGE_BOTTOM,8
-3,Android.InputMethodServices.Edge,Left,android/inputmethodservice/Keyboard.EDGE_LEFT,1
-3,Android.InputMethodServices.Edge,Right,android/inputmethodservice/Keyboard.EDGE_RIGHT,2
-3,Android.InputMethodServices.Edge,Top,android/inputmethodservice/Keyboard.EDGE_TOP,4
-3,Android.InputMethodServices.Keycode,Alt,android/inputmethodservice/Keyboard.KEYCODE_ALT,-6
-3,Android.InputMethodServices.Keycode,Cancel,android/inputmethodservice/Keyboard.KEYCODE_CANCEL,-3
-3,Android.InputMethodServices.Keycode,Delete,android/inputmethodservice/Keyboard.KEYCODE_DELETE,-5
-3,Android.InputMethodServices.Keycode,Done,android/inputmethodservice/Keyboard.KEYCODE_DONE,-4
-3,Android.InputMethodServices.Keycode,ModeChange,android/inputmethodservice/Keyboard.KEYCODE_MODE_CHANGE,-2
-3,Android.InputMethodServices.Keycode,Shift,android/inputmethodservice/Keyboard.KEYCODE_SHIFT,-1
+15,Android.Hardware.Usb.UsbClass,AppSpec,android/hardware/usb/UsbConstants.USB_CLASS_APP_SPEC,254
+15,Android.Hardware.Usb.UsbClass,Audio,android/hardware/usb/UsbConstants.USB_CLASS_AUDIO,1
+15,Android.Hardware.Usb.UsbClass,CdcData,android/hardware/usb/UsbConstants.USB_CLASS_CDC_DATA,10
+15,Android.Hardware.Usb.UsbClass,Comm,android/hardware/usb/UsbConstants.USB_CLASS_COMM,2
+15,Android.Hardware.Usb.UsbClass,ContentSec,android/hardware/usb/UsbConstants.USB_CLASS_CONTENT_SEC,13
+15,Android.Hardware.Usb.UsbClass,CscId,android/hardware/usb/UsbConstants.USB_CLASS_CSCID,11
+15,Android.Hardware.Usb.UsbClass,Hid,android/hardware/usb/UsbConstants.USB_CLASS_HID,3
+15,Android.Hardware.Usb.UsbClass,Hub,android/hardware/usb/UsbConstants.USB_CLASS_HUB,9
+15,Android.Hardware.Usb.UsbClass,MassStorage,android/hardware/usb/UsbConstants.USB_CLASS_MASS_STORAGE,8
+15,Android.Hardware.Usb.UsbClass,Misc,android/hardware/usb/UsbConstants.USB_CLASS_MISC,239
+15,Android.Hardware.Usb.UsbClass,PerInterface,android/hardware/usb/UsbConstants.USB_CLASS_PER_INTERFACE,0
+15,Android.Hardware.Usb.UsbClass,Physica,android/hardware/usb/UsbConstants.USB_CLASS_PHYSICA,5
+15,Android.Hardware.Usb.UsbClass,Printer,android/hardware/usb/UsbConstants.USB_CLASS_PRINTER,7
+15,Android.Hardware.Usb.UsbClass,StillImage,android/hardware/usb/UsbConstants.USB_CLASS_STILL_IMAGE,6
+15,Android.Hardware.Usb.UsbClass,VendorSpec,android/hardware/usb/UsbConstants.USB_CLASS_VENDOR_SPEC,255
+15,Android.Hardware.Usb.UsbClass,Video,android/hardware/usb/UsbConstants.USB_CLASS_VIDEO,14
+15,Android.Hardware.Usb.UsbClass,WirelessController,android/hardware/usb/UsbConstants.USB_CLASS_WIRELESS_CONTROLLER,224
+15,Android.Hardware.Usb.UsbAddressing,In,android/hardware/usb/UsbConstants.USB_DIR_IN,128
+15,Android.Hardware.Usb.UsbAddressing,Out,android/hardware/usb/UsbConstants.USB_DIR_OUT,0
+15,Android.Hardware.Usb.UsbAddressing,DirMask,android/hardware/usb/UsbConstants.USB_ENDPOINT_DIR_MASK,128
+15,Android.Hardware.Usb.UsbAddressing,NumberMask,android/hardware/usb/UsbConstants.USB_ENDPOINT_NUMBER_MASK,15
+15,Android.Hardware.Usb.UsbAddressing,XferBulk,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFER_BULK,2
+15,Android.Hardware.Usb.UsbAddressing,XferControl,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFER_CONTROL,0
+15,Android.Hardware.Usb.UsbAddressing,XferInterrupt,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFER_INT,3
+15,Android.Hardware.Usb.UsbAddressing,XferIsochronous,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFER_ISOC,1
+15,Android.Hardware.Usb.UsbAddressing,XferTypeMask,android/hardware/usb/UsbConstants.USB_ENDPOINT_XFERTYPE_MASK,3
+15,Android.InputMethodServices.BackDisposition,Default,android/inputmethodservice/InputMethodService.BACK_DISPOSITION_DEFAULT,0
+15,Android.InputMethodServices.BackDisposition,WillDismiss,android/inputmethodservice/InputMethodService.BACK_DISPOSITION_WILL_DISMISS,2
+15,Android.InputMethodServices.BackDisposition,WillNotDismiss,android/inputmethodservice/InputMethodService.BACK_DISPOSITION_WILL_NOT_DISMISS,1
+10,Android.InputMethodServices.TouchableInsets,Content,android/inputmethodservice/InputMethodService$Insets.TOUCHABLE_INSETS_CONTENT,1
+10,Android.InputMethodServices.TouchableInsets,Frame,android/inputmethodservice/InputMethodService$Insets.TOUCHABLE_INSETS_FRAME,0
+15,Android.InputMethodServices.TouchableInsets,Region,android/inputmethodservice/InputMethodService$Insets.TOUCHABLE_INSETS_REGION,3
+10,Android.InputMethodServices.TouchableInsets,Visible,android/inputmethodservice/InputMethodService$Insets.TOUCHABLE_INSETS_VISIBLE,2
+10,Android.InputMethodServices.Edge,Bottom,android/inputmethodservice/Keyboard.EDGE_BOTTOM,8
+10,Android.InputMethodServices.Edge,Left,android/inputmethodservice/Keyboard.EDGE_LEFT,1
+10,Android.InputMethodServices.Edge,Right,android/inputmethodservice/Keyboard.EDGE_RIGHT,2
+10,Android.InputMethodServices.Edge,Top,android/inputmethodservice/Keyboard.EDGE_TOP,4
+10,Android.InputMethodServices.Keycode,Alt,android/inputmethodservice/Keyboard.KEYCODE_ALT,-6
+10,Android.InputMethodServices.Keycode,Cancel,android/inputmethodservice/Keyboard.KEYCODE_CANCEL,-3
+10,Android.InputMethodServices.Keycode,Delete,android/inputmethodservice/Keyboard.KEYCODE_DELETE,-5
+10,Android.InputMethodServices.Keycode,Done,android/inputmethodservice/Keyboard.KEYCODE_DONE,-4
+10,Android.InputMethodServices.Keycode,ModeChange,android/inputmethodservice/Keyboard.KEYCODE_MODE_CHANGE,-2
+10,Android.InputMethodServices.Keycode,Shift,android/inputmethodservice/Keyboard.KEYCODE_SHIFT,-1
 0,Android.Locations.Accuracy,NoRequirement,android/location/Criteria.ACCURACY_NO_REQUIREMENT,0
-1,Android.Locations.Accuracy,Coarse,android/location/Criteria.ACCURACY_COARSE,2
-1,Android.Locations.Accuracy,Fine,android/location/Criteria.ACCURACY_FINE,1
-9,Android.Locations.Accuracy,High,android/location/Criteria.ACCURACY_HIGH,3
-9,Android.Locations.Accuracy,Low,android/location/Criteria.ACCURACY_LOW,1
-9,Android.Locations.Accuracy,Medium,android/location/Criteria.ACCURACY_MEDIUM,2
+10,Android.Locations.Accuracy,Coarse,android/location/Criteria.ACCURACY_COARSE,2
+10,Android.Locations.Accuracy,Fine,android/location/Criteria.ACCURACY_FINE,1
+10,Android.Locations.Accuracy,High,android/location/Criteria.ACCURACY_HIGH,3
+10,Android.Locations.Accuracy,Low,android/location/Criteria.ACCURACY_LOW,1
+10,Android.Locations.Accuracy,Medium,android/location/Criteria.ACCURACY_MEDIUM,2
 0,Android.Locations.Power,NoRequirement,android/location/Criteria.POWER_NO_REQUIREMENT,0
-1,Android.Locations.Power,High,android/location/Criteria.POWER_HIGH,3
-1,Android.Locations.Power,Low,android/location/Criteria.POWER_LOW,1
-1,Android.Locations.Power,Medium,android/location/Criteria.POWER_MEDIUM,2
-3,Android.Locations.GpsEvent,FirstFix,android/location/GpsStatus.GPS_EVENT_FIRST_FIX,3
-3,Android.Locations.GpsEvent,SatelliteStatus,android/location/GpsStatus.GPS_EVENT_SATELLITE_STATUS,4
-3,Android.Locations.GpsEvent,Started,android/location/GpsStatus.GPS_EVENT_STARTED,1
-3,Android.Locations.GpsEvent,Stopped,android/location/GpsStatus.GPS_EVENT_STOPPED,2
-1,Android.Locations.Format,Degrees,android/location/Location.FORMAT_DEGREES,0
-1,Android.Locations.Format,Minutes,android/location/Location.FORMAT_MINUTES,1
-1,Android.Locations.Format,Seconds,android/location/Location.FORMAT_SECONDS,2
-1,Android.Locations.Availability,Available,android/location/LocationProvider.AVAILABLE,2
-1,Android.Locations.Availability,OutOfService,android/location/LocationProvider.OUT_OF_SERVICE,0
-1,Android.Locations.Availability,TemporarilyUnavailable,android/location/LocationProvider.TEMPORARILY_UNAVAILABLE,1
+10,Android.Locations.Power,High,android/location/Criteria.POWER_HIGH,3
+10,Android.Locations.Power,Low,android/location/Criteria.POWER_LOW,1
+10,Android.Locations.Power,Medium,android/location/Criteria.POWER_MEDIUM,2
+10,Android.Locations.GpsEvent,FirstFix,android/location/GpsStatus.GPS_EVENT_FIRST_FIX,3
+10,Android.Locations.GpsEvent,SatelliteStatus,android/location/GpsStatus.GPS_EVENT_SATELLITE_STATUS,4
+10,Android.Locations.GpsEvent,Started,android/location/GpsStatus.GPS_EVENT_STARTED,1
+10,Android.Locations.GpsEvent,Stopped,android/location/GpsStatus.GPS_EVENT_STOPPED,2
+10,Android.Locations.Format,Degrees,android/location/Location.FORMAT_DEGREES,0
+10,Android.Locations.Format,Minutes,android/location/Location.FORMAT_MINUTES,1
+10,Android.Locations.Format,Seconds,android/location/Location.FORMAT_SECONDS,2
+10,Android.Locations.Availability,Available,android/location/LocationProvider.AVAILABLE,2
+10,Android.Locations.Availability,OutOfService,android/location/LocationProvider.OUT_OF_SERVICE,0
+10,Android.Locations.Availability,TemporarilyUnavailable,android/location/LocationProvider.TEMPORARILY_UNAVAILABLE,1
 21,Android.Media.AudioContentType,Movie,android/media/AudioAttributes.CONTENT_TYPE_MOVIE,3
 21,Android.Media.AudioContentType,Music,android/media/AudioAttributes.CONTENT_TYPE_MUSIC,2
 21,Android.Media.AudioContentType,Sonification,android/media/AudioAttributes.CONTENT_TYPE_SONIFICATION,4
@@ -983,161 +943,161 @@
 21,Android.Media.AudioUsageKind,Unknown,android/media/AudioAttributes.USAGE_UNKNOWN,0
 21,Android.Media.AudioUsageKind,VoiceCommunication,android/media/AudioAttributes.USAGE_VOICE_COMMUNICATION,2
 21,Android.Media.AudioUsageKind,VoiceCommunicationSignalling,android/media/AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING,3
-3,Android.Media.ChannelConfiguration,Default,android/media/AudioFormat.CHANNEL_CONFIGURATION_DEFAULT,1
-3,Android.Media.ChannelConfiguration,Invalid,android/media/AudioFormat.CHANNEL_CONFIGURATION_INVALID,0
-3,Android.Media.ChannelConfiguration,Mono,android/media/AudioFormat.CHANNEL_CONFIGURATION_MONO,2
-3,Android.Media.ChannelConfiguration,Stereo,android/media/AudioFormat.CHANNEL_CONFIGURATION_STEREO,3
+10,Android.Media.ChannelConfiguration,Default,android/media/AudioFormat.CHANNEL_CONFIGURATION_DEFAULT,1
+10,Android.Media.ChannelConfiguration,Invalid,android/media/AudioFormat.CHANNEL_CONFIGURATION_INVALID,0
+10,Android.Media.ChannelConfiguration,Mono,android/media/AudioFormat.CHANNEL_CONFIGURATION_MONO,2
+10,Android.Media.ChannelConfiguration,Stereo,android/media/AudioFormat.CHANNEL_CONFIGURATION_STEREO,3
 0,Android.Media.ChannelIn,None,,0
-5,Android.Media.ChannelIn,Back,android/media/AudioFormat.CHANNEL_IN_BACK,32
-5,Android.Media.ChannelIn,BackProcessed,android/media/AudioFormat.CHANNEL_IN_BACK_PROCESSED,512
-5,Android.Media.ChannelIn,Default,android/media/AudioFormat.CHANNEL_IN_DEFAULT,1
-5,Android.Media.ChannelIn,Front,android/media/AudioFormat.CHANNEL_IN_FRONT,16
-5,Android.Media.ChannelIn,FrontProcessed,android/media/AudioFormat.CHANNEL_IN_FRONT_PROCESSED,256
-5,Android.Media.ChannelIn,Left,android/media/AudioFormat.CHANNEL_IN_LEFT,4
-5,Android.Media.ChannelIn,LeftProcessed,android/media/AudioFormat.CHANNEL_IN_LEFT_PROCESSED,64
-5,Android.Media.ChannelIn,Mono,android/media/AudioFormat.CHANNEL_IN_MONO,16
-5,Android.Media.ChannelIn,Pressure,android/media/AudioFormat.CHANNEL_IN_PRESSURE,1024
-5,Android.Media.ChannelIn,Right,android/media/AudioFormat.CHANNEL_IN_RIGHT,8
-5,Android.Media.ChannelIn,RightProcessed,android/media/AudioFormat.CHANNEL_IN_RIGHT_PROCESSED,128
-5,Android.Media.ChannelIn,Stereo,android/media/AudioFormat.CHANNEL_IN_STEREO,12
-5,Android.Media.ChannelIn,VoiceDnlink,android/media/AudioFormat.CHANNEL_IN_VOICE_DNLINK,32768
-5,Android.Media.ChannelIn,VoiceUplink,android/media/AudioFormat.CHANNEL_IN_VOICE_UPLINK,16384
-5,Android.Media.ChannelIn,XAxis,android/media/AudioFormat.CHANNEL_IN_X_AXIS,2048
-5,Android.Media.ChannelIn,YAxis,android/media/AudioFormat.CHANNEL_IN_Y_AXIS,4096
-5,Android.Media.ChannelIn,ZAxis,android/media/AudioFormat.CHANNEL_IN_Z_AXIS,8192
+10,Android.Media.ChannelIn,Back,android/media/AudioFormat.CHANNEL_IN_BACK,32
+10,Android.Media.ChannelIn,BackProcessed,android/media/AudioFormat.CHANNEL_IN_BACK_PROCESSED,512
+10,Android.Media.ChannelIn,Default,android/media/AudioFormat.CHANNEL_IN_DEFAULT,1
+10,Android.Media.ChannelIn,Front,android/media/AudioFormat.CHANNEL_IN_FRONT,16
+10,Android.Media.ChannelIn,FrontProcessed,android/media/AudioFormat.CHANNEL_IN_FRONT_PROCESSED,256
+10,Android.Media.ChannelIn,Left,android/media/AudioFormat.CHANNEL_IN_LEFT,4
+10,Android.Media.ChannelIn,LeftProcessed,android/media/AudioFormat.CHANNEL_IN_LEFT_PROCESSED,64
+10,Android.Media.ChannelIn,Mono,android/media/AudioFormat.CHANNEL_IN_MONO,16
+10,Android.Media.ChannelIn,Pressure,android/media/AudioFormat.CHANNEL_IN_PRESSURE,1024
+10,Android.Media.ChannelIn,Right,android/media/AudioFormat.CHANNEL_IN_RIGHT,8
+10,Android.Media.ChannelIn,RightProcessed,android/media/AudioFormat.CHANNEL_IN_RIGHT_PROCESSED,128
+10,Android.Media.ChannelIn,Stereo,android/media/AudioFormat.CHANNEL_IN_STEREO,12
+10,Android.Media.ChannelIn,VoiceDnlink,android/media/AudioFormat.CHANNEL_IN_VOICE_DNLINK,32768
+10,Android.Media.ChannelIn,VoiceUplink,android/media/AudioFormat.CHANNEL_IN_VOICE_UPLINK,16384
+10,Android.Media.ChannelIn,XAxis,android/media/AudioFormat.CHANNEL_IN_X_AXIS,2048
+10,Android.Media.ChannelIn,YAxis,android/media/AudioFormat.CHANNEL_IN_Y_AXIS,4096
+10,Android.Media.ChannelIn,ZAxis,android/media/AudioFormat.CHANNEL_IN_Z_AXIS,8192
 0,Android.Media.ChannelOut,None,,0
-5,Android.Media.ChannelOut,FivePointOne,android/media/AudioFormat.CHANNEL_OUT_5POINT1,252
-5,Android.Media.ChannelOut,SevenPointOne,android/media/AudioFormat.CHANNEL_OUT_7POINT1,1020
+10,Android.Media.ChannelOut,FivePointOne,android/media/AudioFormat.CHANNEL_OUT_5POINT1,252
+10,Android.Media.ChannelOut,SevenPointOne,android/media/AudioFormat.CHANNEL_OUT_7POINT1,1020
 23,Android.Media.ChannelOut,C7point1Surround,android/media/AudioFormat.CHANNEL_OUT_7POINT1_SURROUND,6396
-5,Android.Media.ChannelOut,BackCenter,android/media/AudioFormat.CHANNEL_OUT_BACK_CENTER,1024
-5,Android.Media.ChannelOut,BackLeft,android/media/AudioFormat.CHANNEL_OUT_BACK_LEFT,64
-5,Android.Media.ChannelOut,BackRight,android/media/AudioFormat.CHANNEL_OUT_BACK_RIGHT,128
-5,Android.Media.ChannelOut,Default,android/media/AudioFormat.CHANNEL_OUT_DEFAULT,1
-5,Android.Media.ChannelOut,FrontCenter,android/media/AudioFormat.CHANNEL_OUT_FRONT_CENTER,16
-5,Android.Media.ChannelOut,FrontLeft,android/media/AudioFormat.CHANNEL_OUT_FRONT_LEFT,4
-5,Android.Media.ChannelOut,FrontLeftOfCenter,android/media/AudioFormat.CHANNEL_OUT_FRONT_LEFT_OF_CENTER,256
-5,Android.Media.ChannelOut,FrontRight,android/media/AudioFormat.CHANNEL_OUT_FRONT_RIGHT,8
-5,Android.Media.ChannelOut,FrontRightOfCenter,android/media/AudioFormat.CHANNEL_OUT_FRONT_RIGHT_OF_CENTER,512
-5,Android.Media.ChannelOut,LowFrequency,android/media/AudioFormat.CHANNEL_OUT_LOW_FREQUENCY,32
-5,Android.Media.ChannelOut,Mono,android/media/AudioFormat.CHANNEL_OUT_MONO,4
-5,Android.Media.ChannelOut,Quad,android/media/AudioFormat.CHANNEL_OUT_QUAD,204
+10,Android.Media.ChannelOut,BackCenter,android/media/AudioFormat.CHANNEL_OUT_BACK_CENTER,1024
+10,Android.Media.ChannelOut,BackLeft,android/media/AudioFormat.CHANNEL_OUT_BACK_LEFT,64
+10,Android.Media.ChannelOut,BackRight,android/media/AudioFormat.CHANNEL_OUT_BACK_RIGHT,128
+10,Android.Media.ChannelOut,Default,android/media/AudioFormat.CHANNEL_OUT_DEFAULT,1
+10,Android.Media.ChannelOut,FrontCenter,android/media/AudioFormat.CHANNEL_OUT_FRONT_CENTER,16
+10,Android.Media.ChannelOut,FrontLeft,android/media/AudioFormat.CHANNEL_OUT_FRONT_LEFT,4
+10,Android.Media.ChannelOut,FrontLeftOfCenter,android/media/AudioFormat.CHANNEL_OUT_FRONT_LEFT_OF_CENTER,256
+10,Android.Media.ChannelOut,FrontRight,android/media/AudioFormat.CHANNEL_OUT_FRONT_RIGHT,8
+10,Android.Media.ChannelOut,FrontRightOfCenter,android/media/AudioFormat.CHANNEL_OUT_FRONT_RIGHT_OF_CENTER,512
+10,Android.Media.ChannelOut,LowFrequency,android/media/AudioFormat.CHANNEL_OUT_LOW_FREQUENCY,32
+10,Android.Media.ChannelOut,Mono,android/media/AudioFormat.CHANNEL_OUT_MONO,4
+10,Android.Media.ChannelOut,Quad,android/media/AudioFormat.CHANNEL_OUT_QUAD,204
 21,Android.Media.ChannelOut,SideLeft,android/media/AudioFormat.CHANNEL_OUT_SIDE_LEFT,2048
 21,Android.Media.ChannelOut,SideRight,android/media/AudioFormat.CHANNEL_OUT_SIDE_RIGHT,4096
-5,Android.Media.ChannelOut,Stereo,android/media/AudioFormat.CHANNEL_OUT_STEREO,12
-5,Android.Media.ChannelOut,Surround,android/media/AudioFormat.CHANNEL_OUT_SURROUND,1052
+10,Android.Media.ChannelOut,Stereo,android/media/AudioFormat.CHANNEL_OUT_STEREO,12
+10,Android.Media.ChannelOut,Surround,android/media/AudioFormat.CHANNEL_OUT_SURROUND,1052
 21,Android.Media.Encoding,Ac3,android/media/AudioFormat.ENCODING_AC3,5
-3,Android.Media.Encoding,Default,android/media/AudioFormat.ENCODING_DEFAULT,1
+10,Android.Media.Encoding,Default,android/media/AudioFormat.ENCODING_DEFAULT,1
 25,Android.Media.Encoding,DolbyTruehd,android/media/AudioFormat.ENCODING_DOLBY_TRUEHD,14
 23,Android.Media.Encoding,Dts,android/media/AudioFormat.ENCODING_DTS,7
 23,Android.Media.Encoding,DtsHd,android/media/AudioFormat.ENCODING_DTS_HD,8
 21,Android.Media.Encoding,EAc3,android/media/AudioFormat.ENCODING_E_AC3,6
 24,Android.Media.Encoding,Iec61937,android/media/AudioFormat.ENCODING_IEC61937,13
-3,Android.Media.Encoding,Invalid,android/media/AudioFormat.ENCODING_INVALID,0
-3,Android.Media.Encoding,Pcm16bit,android/media/AudioFormat.ENCODING_PCM_16BIT,2
-3,Android.Media.Encoding,Pcm8bit,android/media/AudioFormat.ENCODING_PCM_8BIT,3
+10,Android.Media.Encoding,Invalid,android/media/AudioFormat.ENCODING_INVALID,0
+10,Android.Media.Encoding,Pcm16bit,android/media/AudioFormat.ENCODING_PCM_16BIT,2
+10,Android.Media.Encoding,Pcm8bit,android/media/AudioFormat.ENCODING_PCM_8BIT,3
 21,Android.Media.Encoding,PcmFloat,android/media/AudioFormat.ENCODING_PCM_FLOAT,4
-1,Android.Media.Adjust,Lower,android/media/AudioManager.ADJUST_LOWER,-1
+10,Android.Media.Adjust,Lower,android/media/AudioManager.ADJUST_LOWER,-1
 23,Android.Media.Adjust,Mute,android/media/AudioManager.ADJUST_MUTE,-100
-1,Android.Media.Adjust,Raise,android/media/AudioManager.ADJUST_RAISE,1
-1,Android.Media.Adjust,Same,android/media/AudioManager.ADJUST_SAME,0
+10,Android.Media.Adjust,Raise,android/media/AudioManager.ADJUST_RAISE,1
+10,Android.Media.Adjust,Same,android/media/AudioManager.ADJUST_SAME,0
 23,Android.Media.Adjust,ToggleMute,android/media/AudioManager.ADJUST_TOGGLE_MUTE,101
 23,Android.Media.Adjust,Unmute,android/media/AudioManager.ADJUST_UNMUTE,100
-1,Android.Media.VolumeNotificationFlags,AllowRingerModes,android/media/AudioManager.FLAG_ALLOW_RINGER_MODES,2
-1,Android.Media.VolumeNotificationFlags,PlaySound,android/media/AudioManager.FLAG_PLAY_SOUND,4
-1,Android.Media.VolumeNotificationFlags,RemoveSoundAndVibrate,android/media/AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE,8
-1,Android.Media.VolumeNotificationFlags,ShowUi,android/media/AudioManager.FLAG_SHOW_UI,1
-1,Android.Media.VolumeNotificationFlags,Vibrate,android/media/AudioManager.FLAG_VIBRATE,16
-1,Android.Media.SoundEffect,NavigationDown,android/media/AudioManager.FX_FOCUS_NAVIGATION_DOWN,2
-1,Android.Media.SoundEffect,NavigationLeft,android/media/AudioManager.FX_FOCUS_NAVIGATION_LEFT,3
-1,Android.Media.SoundEffect,NavigationRight,android/media/AudioManager.FX_FOCUS_NAVIGATION_RIGHT,4
-1,Android.Media.SoundEffect,NavigationUp,android/media/AudioManager.FX_FOCUS_NAVIGATION_UP,1
-3,Android.Media.SoundEffect,Delete,android/media/AudioManager.FX_KEYPRESS_DELETE,7
+10,Android.Media.VolumeNotificationFlags,AllowRingerModes,android/media/AudioManager.FLAG_ALLOW_RINGER_MODES,2
+10,Android.Media.VolumeNotificationFlags,PlaySound,android/media/AudioManager.FLAG_PLAY_SOUND,4
+10,Android.Media.VolumeNotificationFlags,RemoveSoundAndVibrate,android/media/AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE,8
+10,Android.Media.VolumeNotificationFlags,ShowUi,android/media/AudioManager.FLAG_SHOW_UI,1
+10,Android.Media.VolumeNotificationFlags,Vibrate,android/media/AudioManager.FLAG_VIBRATE,16
+10,Android.Media.SoundEffect,NavigationDown,android/media/AudioManager.FX_FOCUS_NAVIGATION_DOWN,2
+10,Android.Media.SoundEffect,NavigationLeft,android/media/AudioManager.FX_FOCUS_NAVIGATION_LEFT,3
+10,Android.Media.SoundEffect,NavigationRight,android/media/AudioManager.FX_FOCUS_NAVIGATION_RIGHT,4
+10,Android.Media.SoundEffect,NavigationUp,android/media/AudioManager.FX_FOCUS_NAVIGATION_UP,1
+10,Android.Media.SoundEffect,Delete,android/media/AudioManager.FX_KEYPRESS_DELETE,7
 19,Android.Media.SoundEffect,Invalid,android/media/AudioManager.FX_KEYPRESS_INVALID,9
-3,Android.Media.SoundEffect,Return,android/media/AudioManager.FX_KEYPRESS_RETURN,8
-3,Android.Media.SoundEffect,Spacebar,android/media/AudioManager.FX_KEYPRESS_SPACEBAR,6
-3,Android.Media.SoundEffect,Standard,android/media/AudioManager.FX_KEYPRESS_STANDARD,5
-1,Android.Media.SoundEffect,KeyClick,android/media/AudioManager.FX_KEY_CLICK,0
-1,Android.Media.Mode,Current,android/media/AudioManager.MODE_CURRENT,-1
-1,Android.Media.Mode,Invalid,android/media/AudioManager.MODE_INVALID,-2
-1,Android.Media.Mode,InCall,android/media/AudioManager.MODE_IN_CALL,2
-11,Android.Media.Mode,InCommunication,android/media/AudioManager.MODE_IN_COMMUNICATION,3
-1,Android.Media.Mode,Normal,android/media/AudioManager.MODE_NORMAL,0
-1,Android.Media.Mode,Ringtone,android/media/AudioManager.MODE_RINGTONE,1
-1,Android.Media.RingerMode,Normal,android/media/AudioManager.RINGER_MODE_NORMAL,2
-1,Android.Media.RingerMode,Silent,android/media/AudioManager.RINGER_MODE_SILENT,0
-1,Android.Media.RingerMode,Vibrate,android/media/AudioManager.RINGER_MODE_VIBRATE,1
-1,Android.Media.Route,All,android/media/AudioManager.ROUTE_ALL,-1
-1,Android.Media.Route,Bluetooth,android/media/AudioManager.ROUTE_BLUETOOTH,4
-3,Android.Media.Route,BluetoothA2dp,android/media/AudioManager.ROUTE_BLUETOOTH_A2DP,16
-3,Android.Media.Route,BluetoothSco,android/media/AudioManager.ROUTE_BLUETOOTH_SCO,4
-1,Android.Media.Route,Earpiece,android/media/AudioManager.ROUTE_EARPIECE,1
-1,Android.Media.Route,Headset,android/media/AudioManager.ROUTE_HEADSET,8
-1,Android.Media.Route,Speaker,android/media/AudioManager.ROUTE_SPEAKER,2
-1,Android.Media.VibrateSetting,Off,android/media/AudioManager.VIBRATE_SETTING_OFF,0
-1,Android.Media.VibrateSetting,On,android/media/AudioManager.VIBRATE_SETTING_ON,1
-1,Android.Media.VibrateSetting,OnlySilent,android/media/AudioManager.VIBRATE_SETTING_ONLY_SILENT,2
-1,Android.Media.VibrateType,Notification,android/media/AudioManager.VIBRATE_TYPE_NOTIFICATION,1
-1,Android.Media.VibrateType,Ringer,android/media/AudioManager.VIBRATE_TYPE_RINGER,0
-3,Android.Media.RecordStatus,Error,android/media/AudioRecord.ERROR,-1
-3,Android.Media.RecordStatus,ErrorBadValue,android/media/AudioRecord.ERROR_BAD_VALUE,-2
+10,Android.Media.SoundEffect,Return,android/media/AudioManager.FX_KEYPRESS_RETURN,8
+10,Android.Media.SoundEffect,Spacebar,android/media/AudioManager.FX_KEYPRESS_SPACEBAR,6
+10,Android.Media.SoundEffect,Standard,android/media/AudioManager.FX_KEYPRESS_STANDARD,5
+10,Android.Media.SoundEffect,KeyClick,android/media/AudioManager.FX_KEY_CLICK,0
+10,Android.Media.Mode,Current,android/media/AudioManager.MODE_CURRENT,-1
+10,Android.Media.Mode,InCall,android/media/AudioManager.MODE_IN_CALL,2
+15,Android.Media.Mode,InCommunication,android/media/AudioManager.MODE_IN_COMMUNICATION,3
+10,Android.Media.Mode,Invalid,android/media/AudioManager.MODE_INVALID,-2
+10,Android.Media.Mode,Normal,android/media/AudioManager.MODE_NORMAL,0
+10,Android.Media.Mode,Ringtone,android/media/AudioManager.MODE_RINGTONE,1
+10,Android.Media.RingerMode,Normal,android/media/AudioManager.RINGER_MODE_NORMAL,2
+10,Android.Media.RingerMode,Silent,android/media/AudioManager.RINGER_MODE_SILENT,0
+10,Android.Media.RingerMode,Vibrate,android/media/AudioManager.RINGER_MODE_VIBRATE,1
+10,Android.Media.Route,All,android/media/AudioManager.ROUTE_ALL,-1
+10,Android.Media.Route,Bluetooth,android/media/AudioManager.ROUTE_BLUETOOTH,4
+10,Android.Media.Route,BluetoothA2dp,android/media/AudioManager.ROUTE_BLUETOOTH_A2DP,16
+10,Android.Media.Route,BluetoothSco,android/media/AudioManager.ROUTE_BLUETOOTH_SCO,4
+10,Android.Media.Route,Earpiece,android/media/AudioManager.ROUTE_EARPIECE,1
+10,Android.Media.Route,Headset,android/media/AudioManager.ROUTE_HEADSET,8
+10,Android.Media.Route,Speaker,android/media/AudioManager.ROUTE_SPEAKER,2
+10,Android.Media.VibrateSetting,Off,android/media/AudioManager.VIBRATE_SETTING_OFF,0
+10,Android.Media.VibrateSetting,On,android/media/AudioManager.VIBRATE_SETTING_ON,1
+10,Android.Media.VibrateSetting,OnlySilent,android/media/AudioManager.VIBRATE_SETTING_ONLY_SILENT,2
+10,Android.Media.VibrateType,Notification,android/media/AudioManager.VIBRATE_TYPE_NOTIFICATION,1
+10,Android.Media.VibrateType,Ringer,android/media/AudioManager.VIBRATE_TYPE_RINGER,0
+10,Android.Media.RecordStatus,Error,android/media/AudioRecord.ERROR,-1
+10,Android.Media.RecordStatus,ErrorBadValue,android/media/AudioRecord.ERROR_BAD_VALUE,-2
 24,Android.Media.RecordStatus,ErrorDeadObject,android/media/AudioRecord.ERROR_DEAD_OBJECT,-6
-3,Android.Media.RecordStatus,ErrorInvalidOperation,android/media/AudioRecord.ERROR_INVALID_OPERATION,-3
-3,Android.Media.RecordStatus,Success,android/media/AudioRecord.SUCCESS,0
-3,Android.Media.RecordState,Recording,android/media/AudioRecord.RECORDSTATE_RECORDING,3
-3,Android.Media.RecordState,Stopped,android/media/AudioRecord.RECORDSTATE_STOPPED,1
-3,Android.Media.State,Initialized,android/media/AudioRecord.STATE_INITIALIZED,1
-3,Android.Media.State,Uninitialized,android/media/AudioRecord.STATE_UNINITIALIZED,0
-3,Android.Media.AudioTrackMode,Static,android/media/AudioTrack.MODE_STATIC,0
-3,Android.Media.AudioTrackMode,Stream,android/media/AudioTrack.MODE_STREAM,1
+10,Android.Media.RecordStatus,ErrorInvalidOperation,android/media/AudioRecord.ERROR_INVALID_OPERATION,-3
+10,Android.Media.RecordStatus,Success,android/media/AudioRecord.SUCCESS,0
+10,Android.Media.RecordState,Recording,android/media/AudioRecord.RECORDSTATE_RECORDING,3
+10,Android.Media.RecordState,Stopped,android/media/AudioRecord.RECORDSTATE_STOPPED,1
+10,Android.Media.State,Initialized,android/media/AudioRecord.STATE_INITIALIZED,1
+10,Android.Media.State,Uninitialized,android/media/AudioRecord.STATE_UNINITIALIZED,0
+10,Android.Media.AudioTrackMode,Static,android/media/AudioTrack.MODE_STATIC,0
+10,Android.Media.AudioTrackMode,Stream,android/media/AudioTrack.MODE_STREAM,1
 26,Android.Media.AudioTrackPerformanceMode,LowLatency,android/media/AudioTrack.PERFORMANCE_MODE_LOW_LATENCY,1
 26,Android.Media.AudioTrackPerformanceMode,None,android/media/AudioTrack.PERFORMANCE_MODE_NONE,0
 26,Android.Media.AudioTrackPerformanceMode,PowerSaving,android/media/AudioTrack.PERFORMANCE_MODE_POWER_SAVING,2
-3,Android.Media.PlayState,Paused,android/media/AudioTrack.PLAYSTATE_PAUSED,2
-3,Android.Media.PlayState,Playing,android/media/AudioTrack.PLAYSTATE_PLAYING,3
-3,Android.Media.PlayState,Stopped,android/media/AudioTrack.PLAYSTATE_STOPPED,1
-3,Android.Media.AudioTrackState,Initialized,android/media/AudioTrack.STATE_INITIALIZED,1
-3,Android.Media.AudioTrackState,NoStaticData,android/media/AudioTrack.STATE_NO_STATIC_DATA,2
-3,Android.Media.AudioTrackState,Uninitialized,android/media/AudioTrack.STATE_UNINITIALIZED,0
+10,Android.Media.PlayState,Paused,android/media/AudioTrack.PLAYSTATE_PAUSED,2
+10,Android.Media.PlayState,Playing,android/media/AudioTrack.PLAYSTATE_PLAYING,3
+10,Android.Media.PlayState,Stopped,android/media/AudioTrack.PLAYSTATE_STOPPED,1
+10,Android.Media.AudioTrackState,Initialized,android/media/AudioTrack.STATE_INITIALIZED,1
+10,Android.Media.AudioTrackState,NoStaticData,android/media/AudioTrack.STATE_NO_STATIC_DATA,2
+10,Android.Media.AudioTrackState,Uninitialized,android/media/AudioTrack.STATE_UNINITIALIZED,0
 21,Android.Media.WriteMode,Blocking,android/media/AudioTrack.WRITE_BLOCKING,0
 21,Android.Media.WriteMode,NonBlocking,android/media/AudioTrack.WRITE_NON_BLOCKING,1
-11,Android.Media.CamcorderQuality,Q1080p,android/media/CamcorderProfile.QUALITY_1080P,6
+15,Android.Media.CamcorderQuality,Q1080p,android/media/CamcorderProfile.QUALITY_1080P,6
 21,Android.Media.CamcorderQuality,Q2160p,android/media/CamcorderProfile.QUALITY_2160P,8
-11,Android.Media.CamcorderQuality,Q480p,android/media/CamcorderProfile.QUALITY_480P,4
-11,Android.Media.CamcorderQuality,Q720p,android/media/CamcorderProfile.QUALITY_720P,5
-11,Android.Media.CamcorderQuality,Cif,android/media/CamcorderProfile.QUALITY_CIF,3
-8,Android.Media.CamcorderQuality,High,android/media/CamcorderProfile.QUALITY_HIGH,1
+15,Android.Media.CamcorderQuality,Q480p,android/media/CamcorderProfile.QUALITY_480P,4
+15,Android.Media.CamcorderQuality,Q720p,android/media/CamcorderProfile.QUALITY_720P,5
+15,Android.Media.CamcorderQuality,Cif,android/media/CamcorderProfile.QUALITY_CIF,3
+10,Android.Media.CamcorderQuality,High,android/media/CamcorderProfile.QUALITY_HIGH,1
 21,Android.Media.CamcorderQuality,HighSpeed1080p,android/media/CamcorderProfile.QUALITY_HIGH_SPEED_1080P,2004
 21,Android.Media.CamcorderQuality,HighSpeed2160p,android/media/CamcorderProfile.QUALITY_HIGH_SPEED_2160P,2005
 21,Android.Media.CamcorderQuality,HighSpeed480p,android/media/CamcorderProfile.QUALITY_HIGH_SPEED_480P,2002
 21,Android.Media.CamcorderQuality,HighSpeed720p,android/media/CamcorderProfile.QUALITY_HIGH_SPEED_720P,2003
 21,Android.Media.CamcorderQuality,HighSpeedHigh,android/media/CamcorderProfile.QUALITY_HIGH_SPEED_HIGH,2001
 21,Android.Media.CamcorderQuality,HighSpeedLow,android/media/CamcorderProfile.QUALITY_HIGH_SPEED_LOW,2000
-8,Android.Media.CamcorderQuality,Low,android/media/CamcorderProfile.QUALITY_LOW,0
-11,Android.Media.CamcorderQuality,Qcif,android/media/CamcorderProfile.QUALITY_QCIF,2
+10,Android.Media.CamcorderQuality,Low,android/media/CamcorderProfile.QUALITY_LOW,0
+15,Android.Media.CamcorderQuality,Qcif,android/media/CamcorderProfile.QUALITY_QCIF,2
 15,Android.Media.CamcorderQuality,Qvga,android/media/CamcorderProfile.QUALITY_QVGA,7
-11,Android.Media.CamcorderQuality,TimeLapse1080p,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_1080P,1006
+15,Android.Media.CamcorderQuality,TimeLapse1080p,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_1080P,1006
 21,Android.Media.CamcorderQuality,TimeLapse2160p,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_2160P,1008
-11,Android.Media.CamcorderQuality,TimeLapse480p,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_480P,1004
-11,Android.Media.CamcorderQuality,TimeLapse720p,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_720P,1005
-11,Android.Media.CamcorderQuality,TimeLapseCif,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_CIF,1003
-11,Android.Media.CamcorderQuality,TimeLapseHigh,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_HIGH,1001
-11,Android.Media.CamcorderQuality,TimeLapseLow,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_LOW,1000
-11,Android.Media.CamcorderQuality,TimeLapseQcif,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_QCIF,1002
+15,Android.Media.CamcorderQuality,TimeLapse480p,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_480P,1004
+15,Android.Media.CamcorderQuality,TimeLapse720p,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_720P,1005
+15,Android.Media.CamcorderQuality,TimeLapseCif,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_CIF,1003
+15,Android.Media.CamcorderQuality,TimeLapseHigh,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_HIGH,1001
+15,Android.Media.CamcorderQuality,TimeLapseLow,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_LOW,1000
+15,Android.Media.CamcorderQuality,TimeLapseQcif,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_QCIF,1002
 15,Android.Media.CamcorderQuality,TimeLapseQvga,android/media/CamcorderProfile.QUALITY_TIME_LAPSE_QVGA,1007
-5,Android.Media.Orientation,FlipHorizontal,android/media/ExifInterface.ORIENTATION_FLIP_HORIZONTAL,2
-5,Android.Media.Orientation,FlipVertical,android/media/ExifInterface.ORIENTATION_FLIP_VERTICAL,4
-5,Android.Media.Orientation,Normal,android/media/ExifInterface.ORIENTATION_NORMAL,1
-5,Android.Media.Orientation,Rotate180,android/media/ExifInterface.ORIENTATION_ROTATE_180,3
-5,Android.Media.Orientation,Rotate270,android/media/ExifInterface.ORIENTATION_ROTATE_270,8
-5,Android.Media.Orientation,Rotate90,android/media/ExifInterface.ORIENTATION_ROTATE_90,6
-5,Android.Media.Orientation,Transpose,android/media/ExifInterface.ORIENTATION_TRANSPOSE,5
-5,Android.Media.Orientation,Transverse,android/media/ExifInterface.ORIENTATION_TRANSVERSE,7
-5,Android.Media.Orientation,Undefined,android/media/ExifInterface.ORIENTATION_UNDEFINED,0
-5,Android.Media.WhiteBalance,Auto,android/media/ExifInterface.WHITEBALANCE_AUTO,0
-5,Android.Media.WhiteBalance,Manual,android/media/ExifInterface.WHITEBALANCE_MANUAL,1
-1,Android.Media.Euler,X,android/media/FaceDetector$Face.EULER_X,0
-1,Android.Media.Euler,Y,android/media/FaceDetector$Face.EULER_Y,1
-1,Android.Media.Euler,Z,android/media/FaceDetector$Face.EULER_Z,2
+10,Android.Media.Orientation,FlipHorizontal,android/media/ExifInterface.ORIENTATION_FLIP_HORIZONTAL,2
+10,Android.Media.Orientation,FlipVertical,android/media/ExifInterface.ORIENTATION_FLIP_VERTICAL,4
+10,Android.Media.Orientation,Normal,android/media/ExifInterface.ORIENTATION_NORMAL,1
+10,Android.Media.Orientation,Rotate180,android/media/ExifInterface.ORIENTATION_ROTATE_180,3
+10,Android.Media.Orientation,Rotate270,android/media/ExifInterface.ORIENTATION_ROTATE_270,8
+10,Android.Media.Orientation,Rotate90,android/media/ExifInterface.ORIENTATION_ROTATE_90,6
+10,Android.Media.Orientation,Transpose,android/media/ExifInterface.ORIENTATION_TRANSPOSE,5
+10,Android.Media.Orientation,Transverse,android/media/ExifInterface.ORIENTATION_TRANSVERSE,7
+10,Android.Media.Orientation,Undefined,android/media/ExifInterface.ORIENTATION_UNDEFINED,0
+10,Android.Media.WhiteBalance,Auto,android/media/ExifInterface.WHITEBALANCE_AUTO,0
+10,Android.Media.WhiteBalance,Manual,android/media/ExifInterface.WHITEBALANCE_MANUAL,1
+10,Android.Media.Euler,X,android/media/FaceDetector$Face.EULER_X,0
+10,Android.Media.Euler,Y,android/media/FaceDetector$Face.EULER_Y,1
+10,Android.Media.Euler,Z,android/media/FaceDetector$Face.EULER_Z,2
 21,Android.Media.BitrateMode,Cbr,android/media/MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR,2
 21,Android.Media.BitrateMode,Cq,android/media/MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CQ,0
 21,Android.Media.BitrateMode,Vbr,android/media/MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR,1
@@ -1149,163 +1109,163 @@
 26,Android.Media.PrepareDrmStatus,Success,android/media/MediaPlayer.PREPARE_DRM_STATUS_SUCCESS,0
 17,Android.Media.MediaError,Io,android/media/MediaPlayer.MEDIA_ERROR_IO,-1004
 17,Android.Media.MediaError,Malformed,android/media/MediaPlayer.MEDIA_ERROR_MALFORMED,-1007
-3,Android.Media.MediaError,NotValidForProgressivePlayback,android/media/MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK,200
-1,Android.Media.MediaError,ServerDied,android/media/MediaPlayer.MEDIA_ERROR_SERVER_DIED,100
+10,Android.Media.MediaError,NotValidForProgressivePlayback,android/media/MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK,200
+10,Android.Media.MediaError,ServerDied,android/media/MediaPlayer.MEDIA_ERROR_SERVER_DIED,100
 17,Android.Media.MediaError,TimedOut,android/media/MediaPlayer.MEDIA_ERROR_TIMED_OUT,-110
-1,Android.Media.MediaError,Unknown,android/media/MediaPlayer.MEDIA_ERROR_UNKNOWN,1
+10,Android.Media.MediaError,Unknown,android/media/MediaPlayer.MEDIA_ERROR_UNKNOWN,1
 17,Android.Media.MediaError,Unsupported,android/media/MediaPlayer.MEDIA_ERROR_UNSUPPORTED,-1010
 26,Android.Media.MediaInfo,AudioNotPlaying,android/media/MediaPlayer.MEDIA_INFO_AUDIO_NOT_PLAYING,804
-3,Android.Media.MediaInfo,BadInterleaving,android/media/MediaPlayer.MEDIA_INFO_BAD_INTERLEAVING,800
-9,Android.Media.MediaInfo,BufferingEnd,android/media/MediaPlayer.MEDIA_INFO_BUFFERING_END,702
-9,Android.Media.MediaInfo,BufferingStart,android/media/MediaPlayer.MEDIA_INFO_BUFFERING_START,701
-5,Android.Media.MediaInfo,MetadataUpdate,android/media/MediaPlayer.MEDIA_INFO_METADATA_UPDATE,802
-3,Android.Media.MediaInfo,NotSeekable,android/media/MediaPlayer.MEDIA_INFO_NOT_SEEKABLE,801
+10,Android.Media.MediaInfo,BadInterleaving,android/media/MediaPlayer.MEDIA_INFO_BAD_INTERLEAVING,800
+10,Android.Media.MediaInfo,BufferingEnd,android/media/MediaPlayer.MEDIA_INFO_BUFFERING_END,702
+10,Android.Media.MediaInfo,BufferingStart,android/media/MediaPlayer.MEDIA_INFO_BUFFERING_START,701
+10,Android.Media.MediaInfo,MetadataUpdate,android/media/MediaPlayer.MEDIA_INFO_METADATA_UPDATE,802
+10,Android.Media.MediaInfo,NotSeekable,android/media/MediaPlayer.MEDIA_INFO_NOT_SEEKABLE,801
 19,Android.Media.MediaInfo,SubtitleTimedOut,android/media/MediaPlayer.MEDIA_INFO_SUBTITLE_TIMED_OUT,902
-3,Android.Media.MediaInfo,Unknown,android/media/MediaPlayer.MEDIA_INFO_UNKNOWN,1
+10,Android.Media.MediaInfo,Unknown,android/media/MediaPlayer.MEDIA_INFO_UNKNOWN,1
 19,Android.Media.MediaInfo,UnsupportedSubtitle,android/media/MediaPlayer.MEDIA_INFO_UNSUPPORTED_SUBTITLE,901
 26,Android.Media.MediaInfo,VideoNotPlaying,android/media/MediaPlayer.MEDIA_INFO_VIDEO_NOT_PLAYING,805
 17,Android.Media.MediaInfo,VideoRenderingStart,android/media/MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START,3
-3,Android.Media.MediaInfo,VideoTrackLagging,android/media/MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING,700
+10,Android.Media.MediaInfo,VideoTrackLagging,android/media/MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING,700
 26,Android.Media.MediaPlayerSeekMode,Closest,android/media/MediaPlayer.SEEK_CLOSEST,3
 26,Android.Media.MediaPlayerSeekMode,ClosestSync,android/media/MediaPlayer.SEEK_CLOSEST_SYNC,2
 26,Android.Media.MediaPlayerSeekMode,NextSync,android/media/MediaPlayer.SEEK_NEXT_SYNC,1
 26,Android.Media.MediaPlayerSeekMode,PreviousSync,android/media/MediaPlayer.SEEK_PREVIOUS_SYNC,0
-3,Android.Media.MediaRecorderInfo,MaxDurationReached,android/media/MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED,800
+10,Android.Media.MediaRecorderInfo,MaxDurationReached,android/media/MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED,800
 26,Android.Media.MediaRecorderInfo,MaxFilesizeApproaching,android/media/MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_APPROACHING,802
-3,Android.Media.MediaRecorderInfo,MaxFilesizeReached,android/media/MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED,801
+10,Android.Media.MediaRecorderInfo,MaxFilesizeReached,android/media/MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED,801
 26,Android.Media.MediaRecorderInfo,NextOutputFileStarted,android/media/MediaRecorder.MEDIA_RECORDER_INFO_NEXT_OUTPUT_FILE_STARTED,803
-3,Android.Media.MediaRecorderInfo,Unknown,android/media/MediaRecorder.MEDIA_RECORDER_INFO_UNKNOWN,1
+10,Android.Media.MediaRecorderInfo,Unknown,android/media/MediaRecorder.MEDIA_RECORDER_INFO_UNKNOWN,1
 10,Android.Media.AudioEncoder,Aac,android/media/MediaRecorder$AudioEncoder.AAC,3
 16,Android.Media.AudioEncoder,AacEld,android/media/MediaRecorder$AudioEncoder.AAC_ELD,5
-1,Android.Media.AudioEncoder,AmrNb,android/media/MediaRecorder$AudioEncoder.AMR_NB,1
+10,Android.Media.AudioEncoder,AmrNb,android/media/MediaRecorder$AudioEncoder.AMR_NB,1
 10,Android.Media.AudioEncoder,AmrWb,android/media/MediaRecorder$AudioEncoder.AMR_WB,2
-1,Android.Media.AudioEncoder,Default,android/media/MediaRecorder$AudioEncoder.DEFAULT,0
+10,Android.Media.AudioEncoder,Default,android/media/MediaRecorder$AudioEncoder.DEFAULT,0
 16,Android.Media.AudioEncoder,HeAac,android/media/MediaRecorder$AudioEncoder.HE_AAC,4
 21,Android.Media.AudioEncoder,Vorbis,android/media/MediaRecorder$AudioEncoder.VORBIS,6
-7,Android.Media.AudioSource,Camcorder,android/media/MediaRecorder$AudioSource.CAMCORDER,5
-1,Android.Media.AudioSource,Default,android/media/MediaRecorder$AudioSource.DEFAULT,0
-1,Android.Media.AudioSource,Mic,android/media/MediaRecorder$AudioSource.MIC,1
+10,Android.Media.AudioSource,Camcorder,android/media/MediaRecorder$AudioSource.CAMCORDER,5
+10,Android.Media.AudioSource,Default,android/media/MediaRecorder$AudioSource.DEFAULT,0
+10,Android.Media.AudioSource,Mic,android/media/MediaRecorder$AudioSource.MIC,1
 19,Android.Media.AudioSource,RemoteSubmix,android/media/MediaRecorder$AudioSource.REMOTE_SUBMIX,8
 24,Android.Media.AudioSource,Unprocessed,android/media/MediaRecorder$AudioSource.UNPROCESSED,9
-4,Android.Media.AudioSource,VoiceCall,android/media/MediaRecorder$AudioSource.VOICE_CALL,4
-11,Android.Media.AudioSource,VoiceCommunication,android/media/MediaRecorder$AudioSource.VOICE_COMMUNICATION,7
-4,Android.Media.AudioSource,VoiceDownlink,android/media/MediaRecorder$AudioSource.VOICE_DOWNLINK,3
-7,Android.Media.AudioSource,VoiceRecognition,android/media/MediaRecorder$AudioSource.VOICE_RECOGNITION,6
-4,Android.Media.AudioSource,VoiceUplink,android/media/MediaRecorder$AudioSource.VOICE_UPLINK,2
+10,Android.Media.AudioSource,VoiceCall,android/media/MediaRecorder$AudioSource.VOICE_CALL,4
+15,Android.Media.AudioSource,VoiceCommunication,android/media/MediaRecorder$AudioSource.VOICE_COMMUNICATION,7
+10,Android.Media.AudioSource,VoiceDownlink,android/media/MediaRecorder$AudioSource.VOICE_DOWNLINK,3
+10,Android.Media.AudioSource,VoiceRecognition,android/media/MediaRecorder$AudioSource.VOICE_RECOGNITION,6
+10,Android.Media.AudioSource,VoiceUplink,android/media/MediaRecorder$AudioSource.VOICE_UPLINK,2
 16,Android.Media.OutputFormat,AacAdts,android/media/MediaRecorder$OutputFormat.AAC_ADTS,6
 10,Android.Media.OutputFormat,AmrNb,android/media/MediaRecorder$OutputFormat.AMR_NB,3
 10,Android.Media.OutputFormat,AmrWb,android/media/MediaRecorder$OutputFormat.AMR_WB,4
-1,Android.Media.OutputFormat,Default,android/media/MediaRecorder$OutputFormat.DEFAULT,0
+10,Android.Media.OutputFormat,Default,android/media/MediaRecorder$OutputFormat.DEFAULT,0
 26,Android.Media.OutputFormat,Mpeg2Ts,android/media/MediaRecorder$OutputFormat.MPEG_2_TS,8
-1,Android.Media.OutputFormat,Mpeg4,android/media/MediaRecorder$OutputFormat.MPEG_4,2
-3,Android.Media.OutputFormat,RawAmr,android/media/MediaRecorder$OutputFormat.RAW_AMR,3
-1,Android.Media.OutputFormat,ThreeGpp,android/media/MediaRecorder$OutputFormat.THREE_GPP,1
+10,Android.Media.OutputFormat,Mpeg4,android/media/MediaRecorder$OutputFormat.MPEG_4,2
+10,Android.Media.OutputFormat,RawAmr,android/media/MediaRecorder$OutputFormat.RAW_AMR,3
+10,Android.Media.OutputFormat,ThreeGpp,android/media/MediaRecorder$OutputFormat.THREE_GPP,1
 21,Android.Media.OutputFormat,Webm,android/media/MediaRecorder$OutputFormat.WEBM,9
 21,Android.Media.Session.MediaPlaybackType,Local,android/media/session/MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL,1
 21,Android.Media.Session.MediaPlaybackType,Remote,android/media/session/MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE,2
-1,Android.Media.RingtoneType,Alarm,android/media/RingtoneManager.TYPE_ALARM,4
-1,Android.Media.RingtoneType,All,android/media/RingtoneManager.TYPE_ALL,7
-1,Android.Media.RingtoneType,Notification,android/media/RingtoneManager.TYPE_NOTIFICATION,2
-1,Android.Media.RingtoneType,Ringtone,android/media/RingtoneManager.TYPE_RINGTONE,1
-4,Android.Media.Tone,CdmaAbbrAlert,android/media/ToneGenerator.TONE_CDMA_ABBR_ALERT,97
-4,Android.Media.Tone,CdmaAbbrIntercept,android/media/ToneGenerator.TONE_CDMA_ABBR_INTERCEPT,37
-4,Android.Media.Tone,CdmaAbbrReorder,android/media/ToneGenerator.TONE_CDMA_ABBR_REORDER,39
-4,Android.Media.Tone,CdmaAlertAutoredialLite,android/media/ToneGenerator.TONE_CDMA_ALERT_AUTOREDIAL_LITE,87
-4,Android.Media.Tone,CdmaAlertCallGuard,android/media/ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD,93
-4,Android.Media.Tone,CdmaAlertIncallLite,android/media/ToneGenerator.TONE_CDMA_ALERT_INCALL_LITE,91
-4,Android.Media.Tone,CdmaAlertNetworkLite,android/media/ToneGenerator.TONE_CDMA_ALERT_NETWORK_LITE,86
-4,Android.Media.Tone,CdmaAnswer,android/media/ToneGenerator.TONE_CDMA_ANSWER,42
-4,Android.Media.Tone,CdmaCalldropLite,android/media/ToneGenerator.TONE_CDMA_CALLDROP_LITE,95
-4,Android.Media.Tone,CdmaCallSignalIsdnIntergroup,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_INTERGROUP,46
-4,Android.Media.Tone,CdmaCallSignalIsdnNormal,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_NORMAL,45
-4,Android.Media.Tone,CdmaCallSignalIsdnPat3,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT3,48
-4,Android.Media.Tone,CdmaCallSignalIsdnPat5,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT5,50
-4,Android.Media.Tone,CdmaCallSignalIsdnPat6,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT6,51
-4,Android.Media.Tone,CdmaCallSignalIsdnPat7,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT7,52
-4,Android.Media.Tone,CdmaCallSignalIsdnPingRing,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PING_RING,49
-4,Android.Media.Tone,CdmaCallSignalIsdnSpPri,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_SP_PRI,47
-4,Android.Media.Tone,CdmaConfirm,android/media/ToneGenerator.TONE_CDMA_CONFIRM,41
-4,Android.Media.Tone,CdmaDialToneLite,android/media/ToneGenerator.TONE_CDMA_DIAL_TONE_LITE,34
-4,Android.Media.Tone,CdmaEmergencyRingback,android/media/ToneGenerator.TONE_CDMA_EMERGENCY_RINGBACK,92
-4,Android.Media.Tone,CdmaHighL,android/media/ToneGenerator.TONE_CDMA_HIGH_L,53
-4,Android.Media.Tone,CdmaHighPbxL,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_L,71
-4,Android.Media.Tone,CdmaHighPbxSls,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_SLS,80
-4,Android.Media.Tone,CdmaHighPbxSs,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_SS,74
-4,Android.Media.Tone,CdmaHighPbxSsl,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_SSL,77
-4,Android.Media.Tone,CdmaHighPbxSX4,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_S_X4,83
-4,Android.Media.Tone,CdmaHighSls,android/media/ToneGenerator.TONE_CDMA_HIGH_SLS,65
-4,Android.Media.Tone,CdmaHighSs,android/media/ToneGenerator.TONE_CDMA_HIGH_SS,56
-4,Android.Media.Tone,CdmaHighSsl,android/media/ToneGenerator.TONE_CDMA_HIGH_SSL,59
-4,Android.Media.Tone,CdmaHighSs2,android/media/ToneGenerator.TONE_CDMA_HIGH_SS_2,62
-4,Android.Media.Tone,CdmaHighSX4,android/media/ToneGenerator.TONE_CDMA_HIGH_S_X4,68
-4,Android.Media.Tone,CdmaIntercept,android/media/ToneGenerator.TONE_CDMA_INTERCEPT,36
-4,Android.Media.Tone,CdmaKeypadVolumeKeyLite,android/media/ToneGenerator.TONE_CDMA_KEYPAD_VOLUME_KEY_LITE,89
-4,Android.Media.Tone,CdmaLowL,android/media/ToneGenerator.TONE_CDMA_LOW_L,55
-4,Android.Media.Tone,CdmaLowPbxL,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_L,73
-4,Android.Media.Tone,CdmaLowPbxSls,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_SLS,82
-4,Android.Media.Tone,CdmaLowPbxSs,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_SS,76
-4,Android.Media.Tone,CdmaLowPbxSsl,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_SSL,79
-4,Android.Media.Tone,CdmaLowPbxSX4,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_S_X4,85
-4,Android.Media.Tone,CdmaLowSls,android/media/ToneGenerator.TONE_CDMA_LOW_SLS,67
-4,Android.Media.Tone,CdmaLowSs,android/media/ToneGenerator.TONE_CDMA_LOW_SS,58
-4,Android.Media.Tone,CdmaLowSsl,android/media/ToneGenerator.TONE_CDMA_LOW_SSL,61
-4,Android.Media.Tone,CdmaLowSs2,android/media/ToneGenerator.TONE_CDMA_LOW_SS_2,64
-4,Android.Media.Tone,CdmaLowSX4,android/media/ToneGenerator.TONE_CDMA_LOW_S_X4,70
-4,Android.Media.Tone,CdmaMedL,android/media/ToneGenerator.TONE_CDMA_MED_L,54
-4,Android.Media.Tone,CdmaMedPbxL,android/media/ToneGenerator.TONE_CDMA_MED_PBX_L,72
-4,Android.Media.Tone,CdmaMedPbxSls,android/media/ToneGenerator.TONE_CDMA_MED_PBX_SLS,81
-4,Android.Media.Tone,CdmaMedPbxSs,android/media/ToneGenerator.TONE_CDMA_MED_PBX_SS,75
-4,Android.Media.Tone,CdmaMedPbxSsl,android/media/ToneGenerator.TONE_CDMA_MED_PBX_SSL,78
-4,Android.Media.Tone,CdmaMedPbxSX4,android/media/ToneGenerator.TONE_CDMA_MED_PBX_S_X4,84
-4,Android.Media.Tone,CdmaMedSls,android/media/ToneGenerator.TONE_CDMA_MED_SLS,66
-4,Android.Media.Tone,CdmaMedSs,android/media/ToneGenerator.TONE_CDMA_MED_SS,57
-4,Android.Media.Tone,CdmaMedSsl,android/media/ToneGenerator.TONE_CDMA_MED_SSL,60
-4,Android.Media.Tone,CdmaMedSs2,android/media/ToneGenerator.TONE_CDMA_MED_SS_2,63
-4,Android.Media.Tone,CdmaMedSX4,android/media/ToneGenerator.TONE_CDMA_MED_S_X4,69
-4,Android.Media.Tone,CdmaNetworkBusy,android/media/ToneGenerator.TONE_CDMA_NETWORK_BUSY,40
-4,Android.Media.Tone,CdmaNetworkBusyOneShot,android/media/ToneGenerator.TONE_CDMA_NETWORK_BUSY_ONE_SHOT,96
-4,Android.Media.Tone,CdmaNetworkCallwaiting,android/media/ToneGenerator.TONE_CDMA_NETWORK_CALLWAITING,43
-4,Android.Media.Tone,CdmaNetworkUsaRingback,android/media/ToneGenerator.TONE_CDMA_NETWORK_USA_RINGBACK,35
-4,Android.Media.Tone,CdmaOneMinBeep,android/media/ToneGenerator.TONE_CDMA_ONE_MIN_BEEP,88
-4,Android.Media.Tone,CdmaPip,android/media/ToneGenerator.TONE_CDMA_PIP,44
-4,Android.Media.Tone,CdmaPressholdkeyLite,android/media/ToneGenerator.TONE_CDMA_PRESSHOLDKEY_LITE,90
-4,Android.Media.Tone,CdmaReorder,android/media/ToneGenerator.TONE_CDMA_REORDER,38
-4,Android.Media.Tone,CdmaSignalOff,android/media/ToneGenerator.TONE_CDMA_SIGNAL_OFF,98
-4,Android.Media.Tone,CdmaSoftErrorLite,android/media/ToneGenerator.TONE_CDMA_SOFT_ERROR_LITE,94
-1,Android.Media.Tone,Dtmf0,android/media/ToneGenerator.TONE_DTMF_0,0
-1,Android.Media.Tone,Dtmf1,android/media/ToneGenerator.TONE_DTMF_1,1
-1,Android.Media.Tone,Dtmf2,android/media/ToneGenerator.TONE_DTMF_2,2
-1,Android.Media.Tone,Dtmf3,android/media/ToneGenerator.TONE_DTMF_3,3
-1,Android.Media.Tone,Dtmf4,android/media/ToneGenerator.TONE_DTMF_4,4
-1,Android.Media.Tone,Dtmf5,android/media/ToneGenerator.TONE_DTMF_5,5
-1,Android.Media.Tone,Dtmf6,android/media/ToneGenerator.TONE_DTMF_6,6
-1,Android.Media.Tone,Dtmf7,android/media/ToneGenerator.TONE_DTMF_7,7
-1,Android.Media.Tone,Dtmf8,android/media/ToneGenerator.TONE_DTMF_8,8
-1,Android.Media.Tone,Dtmf9,android/media/ToneGenerator.TONE_DTMF_9,9
-1,Android.Media.Tone,DtmfA,android/media/ToneGenerator.TONE_DTMF_A,12
-1,Android.Media.Tone,DtmfB,android/media/ToneGenerator.TONE_DTMF_B,13
-1,Android.Media.Tone,DtmfC,android/media/ToneGenerator.TONE_DTMF_C,14
-1,Android.Media.Tone,DtmfD,android/media/ToneGenerator.TONE_DTMF_D,15
-1,Android.Media.Tone,DtmfP,android/media/ToneGenerator.TONE_DTMF_P,11
-1,Android.Media.Tone,DtmfS,android/media/ToneGenerator.TONE_DTMF_S,10
-1,Android.Media.Tone,PropAck,android/media/ToneGenerator.TONE_PROP_ACK,25
-1,Android.Media.Tone,PropBeep,android/media/ToneGenerator.TONE_PROP_BEEP,24
-1,Android.Media.Tone,PropBeep2,android/media/ToneGenerator.TONE_PROP_BEEP2,28
-1,Android.Media.Tone,PropNack,android/media/ToneGenerator.TONE_PROP_NACK,26
-1,Android.Media.Tone,PropPrompt,android/media/ToneGenerator.TONE_PROP_PROMPT,27
-1,Android.Media.Tone,SupBusy,android/media/ToneGenerator.TONE_SUP_BUSY,17
-1,Android.Media.Tone,SupCallWaiting,android/media/ToneGenerator.TONE_SUP_CALL_WAITING,22
-4,Android.Media.Tone,SupConfirm,android/media/ToneGenerator.TONE_SUP_CONFIRM,32
-1,Android.Media.Tone,SupCongestion,android/media/ToneGenerator.TONE_SUP_CONGESTION,18
-4,Android.Media.Tone,SupCongestionAbbrev,android/media/ToneGenerator.TONE_SUP_CONGESTION_ABBREV,31
-1,Android.Media.Tone,SupDial,android/media/ToneGenerator.TONE_SUP_DIAL,16
-1,Android.Media.Tone,SupError,android/media/ToneGenerator.TONE_SUP_ERROR,21
-4,Android.Media.Tone,SupIntercept,android/media/ToneGenerator.TONE_SUP_INTERCEPT,29
-4,Android.Media.Tone,SupInterceptAbbrev,android/media/ToneGenerator.TONE_SUP_INTERCEPT_ABBREV,30
-4,Android.Media.Tone,SupPip,android/media/ToneGenerator.TONE_SUP_PIP,33
-1,Android.Media.Tone,SupRadioAck,android/media/ToneGenerator.TONE_SUP_RADIO_ACK,19
-1,Android.Media.Tone,SupRadioNotavail,android/media/ToneGenerator.TONE_SUP_RADIO_NOTAVAIL,20
-1,Android.Media.Tone,SupRingtone,android/media/ToneGenerator.TONE_SUP_RINGTONE,23
+10,Android.Media.RingtoneType,Alarm,android/media/RingtoneManager.TYPE_ALARM,4
+10,Android.Media.RingtoneType,All,android/media/RingtoneManager.TYPE_ALL,7
+10,Android.Media.RingtoneType,Notification,android/media/RingtoneManager.TYPE_NOTIFICATION,2
+10,Android.Media.RingtoneType,Ringtone,android/media/RingtoneManager.TYPE_RINGTONE,1
+10,Android.Media.Tone,CdmaAbbrAlert,android/media/ToneGenerator.TONE_CDMA_ABBR_ALERT,97
+10,Android.Media.Tone,CdmaAbbrIntercept,android/media/ToneGenerator.TONE_CDMA_ABBR_INTERCEPT,37
+10,Android.Media.Tone,CdmaAbbrReorder,android/media/ToneGenerator.TONE_CDMA_ABBR_REORDER,39
+10,Android.Media.Tone,CdmaAlertAutoredialLite,android/media/ToneGenerator.TONE_CDMA_ALERT_AUTOREDIAL_LITE,87
+10,Android.Media.Tone,CdmaAlertCallGuard,android/media/ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD,93
+10,Android.Media.Tone,CdmaAlertIncallLite,android/media/ToneGenerator.TONE_CDMA_ALERT_INCALL_LITE,91
+10,Android.Media.Tone,CdmaAlertNetworkLite,android/media/ToneGenerator.TONE_CDMA_ALERT_NETWORK_LITE,86
+10,Android.Media.Tone,CdmaAnswer,android/media/ToneGenerator.TONE_CDMA_ANSWER,42
+10,Android.Media.Tone,CdmaCallSignalIsdnIntergroup,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_INTERGROUP,46
+10,Android.Media.Tone,CdmaCallSignalIsdnNormal,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_NORMAL,45
+10,Android.Media.Tone,CdmaCallSignalIsdnPat3,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT3,48
+10,Android.Media.Tone,CdmaCallSignalIsdnPat5,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT5,50
+10,Android.Media.Tone,CdmaCallSignalIsdnPat6,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT6,51
+10,Android.Media.Tone,CdmaCallSignalIsdnPat7,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT7,52
+10,Android.Media.Tone,CdmaCallSignalIsdnPingRing,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PING_RING,49
+10,Android.Media.Tone,CdmaCallSignalIsdnSpPri,android/media/ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_SP_PRI,47
+10,Android.Media.Tone,CdmaCalldropLite,android/media/ToneGenerator.TONE_CDMA_CALLDROP_LITE,95
+10,Android.Media.Tone,CdmaConfirm,android/media/ToneGenerator.TONE_CDMA_CONFIRM,41
+10,Android.Media.Tone,CdmaDialToneLite,android/media/ToneGenerator.TONE_CDMA_DIAL_TONE_LITE,34
+10,Android.Media.Tone,CdmaEmergencyRingback,android/media/ToneGenerator.TONE_CDMA_EMERGENCY_RINGBACK,92
+10,Android.Media.Tone,CdmaHighL,android/media/ToneGenerator.TONE_CDMA_HIGH_L,53
+10,Android.Media.Tone,CdmaHighPbxL,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_L,71
+10,Android.Media.Tone,CdmaHighPbxSX4,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_S_X4,83
+10,Android.Media.Tone,CdmaHighPbxSls,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_SLS,80
+10,Android.Media.Tone,CdmaHighPbxSs,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_SS,74
+10,Android.Media.Tone,CdmaHighPbxSsl,android/media/ToneGenerator.TONE_CDMA_HIGH_PBX_SSL,77
+10,Android.Media.Tone,CdmaHighSX4,android/media/ToneGenerator.TONE_CDMA_HIGH_S_X4,68
+10,Android.Media.Tone,CdmaHighSls,android/media/ToneGenerator.TONE_CDMA_HIGH_SLS,65
+10,Android.Media.Tone,CdmaHighSs,android/media/ToneGenerator.TONE_CDMA_HIGH_SS,56
+10,Android.Media.Tone,CdmaHighSs2,android/media/ToneGenerator.TONE_CDMA_HIGH_SS_2,62
+10,Android.Media.Tone,CdmaHighSsl,android/media/ToneGenerator.TONE_CDMA_HIGH_SSL,59
+10,Android.Media.Tone,CdmaIntercept,android/media/ToneGenerator.TONE_CDMA_INTERCEPT,36
+10,Android.Media.Tone,CdmaKeypadVolumeKeyLite,android/media/ToneGenerator.TONE_CDMA_KEYPAD_VOLUME_KEY_LITE,89
+10,Android.Media.Tone,CdmaLowL,android/media/ToneGenerator.TONE_CDMA_LOW_L,55
+10,Android.Media.Tone,CdmaLowPbxL,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_L,73
+10,Android.Media.Tone,CdmaLowPbxSX4,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_S_X4,85
+10,Android.Media.Tone,CdmaLowPbxSls,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_SLS,82
+10,Android.Media.Tone,CdmaLowPbxSs,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_SS,76
+10,Android.Media.Tone,CdmaLowPbxSsl,android/media/ToneGenerator.TONE_CDMA_LOW_PBX_SSL,79
+10,Android.Media.Tone,CdmaLowSX4,android/media/ToneGenerator.TONE_CDMA_LOW_S_X4,70
+10,Android.Media.Tone,CdmaLowSls,android/media/ToneGenerator.TONE_CDMA_LOW_SLS,67
+10,Android.Media.Tone,CdmaLowSs,android/media/ToneGenerator.TONE_CDMA_LOW_SS,58
+10,Android.Media.Tone,CdmaLowSs2,android/media/ToneGenerator.TONE_CDMA_LOW_SS_2,64
+10,Android.Media.Tone,CdmaLowSsl,android/media/ToneGenerator.TONE_CDMA_LOW_SSL,61
+10,Android.Media.Tone,CdmaMedL,android/media/ToneGenerator.TONE_CDMA_MED_L,54
+10,Android.Media.Tone,CdmaMedPbxL,android/media/ToneGenerator.TONE_CDMA_MED_PBX_L,72
+10,Android.Media.Tone,CdmaMedPbxSX4,android/media/ToneGenerator.TONE_CDMA_MED_PBX_S_X4,84
+10,Android.Media.Tone,CdmaMedPbxSls,android/media/ToneGenerator.TONE_CDMA_MED_PBX_SLS,81
+10,Android.Media.Tone,CdmaMedPbxSs,android/media/ToneGenerator.TONE_CDMA_MED_PBX_SS,75
+10,Android.Media.Tone,CdmaMedPbxSsl,android/media/ToneGenerator.TONE_CDMA_MED_PBX_SSL,78
+10,Android.Media.Tone,CdmaMedSX4,android/media/ToneGenerator.TONE_CDMA_MED_S_X4,69
+10,Android.Media.Tone,CdmaMedSls,android/media/ToneGenerator.TONE_CDMA_MED_SLS,66
+10,Android.Media.Tone,CdmaMedSs,android/media/ToneGenerator.TONE_CDMA_MED_SS,57
+10,Android.Media.Tone,CdmaMedSs2,android/media/ToneGenerator.TONE_CDMA_MED_SS_2,63
+10,Android.Media.Tone,CdmaMedSsl,android/media/ToneGenerator.TONE_CDMA_MED_SSL,60
+10,Android.Media.Tone,CdmaNetworkBusy,android/media/ToneGenerator.TONE_CDMA_NETWORK_BUSY,40
+10,Android.Media.Tone,CdmaNetworkBusyOneShot,android/media/ToneGenerator.TONE_CDMA_NETWORK_BUSY_ONE_SHOT,96
+10,Android.Media.Tone,CdmaNetworkCallwaiting,android/media/ToneGenerator.TONE_CDMA_NETWORK_CALLWAITING,43
+10,Android.Media.Tone,CdmaNetworkUsaRingback,android/media/ToneGenerator.TONE_CDMA_NETWORK_USA_RINGBACK,35
+10,Android.Media.Tone,CdmaOneMinBeep,android/media/ToneGenerator.TONE_CDMA_ONE_MIN_BEEP,88
+10,Android.Media.Tone,CdmaPip,android/media/ToneGenerator.TONE_CDMA_PIP,44
+10,Android.Media.Tone,CdmaPressholdkeyLite,android/media/ToneGenerator.TONE_CDMA_PRESSHOLDKEY_LITE,90
+10,Android.Media.Tone,CdmaReorder,android/media/ToneGenerator.TONE_CDMA_REORDER,38
+10,Android.Media.Tone,CdmaSignalOff,android/media/ToneGenerator.TONE_CDMA_SIGNAL_OFF,98
+10,Android.Media.Tone,CdmaSoftErrorLite,android/media/ToneGenerator.TONE_CDMA_SOFT_ERROR_LITE,94
+10,Android.Media.Tone,Dtmf0,android/media/ToneGenerator.TONE_DTMF_0,0
+10,Android.Media.Tone,Dtmf1,android/media/ToneGenerator.TONE_DTMF_1,1
+10,Android.Media.Tone,Dtmf2,android/media/ToneGenerator.TONE_DTMF_2,2
+10,Android.Media.Tone,Dtmf3,android/media/ToneGenerator.TONE_DTMF_3,3
+10,Android.Media.Tone,Dtmf4,android/media/ToneGenerator.TONE_DTMF_4,4
+10,Android.Media.Tone,Dtmf5,android/media/ToneGenerator.TONE_DTMF_5,5
+10,Android.Media.Tone,Dtmf6,android/media/ToneGenerator.TONE_DTMF_6,6
+10,Android.Media.Tone,Dtmf7,android/media/ToneGenerator.TONE_DTMF_7,7
+10,Android.Media.Tone,Dtmf8,android/media/ToneGenerator.TONE_DTMF_8,8
+10,Android.Media.Tone,Dtmf9,android/media/ToneGenerator.TONE_DTMF_9,9
+10,Android.Media.Tone,DtmfA,android/media/ToneGenerator.TONE_DTMF_A,12
+10,Android.Media.Tone,DtmfB,android/media/ToneGenerator.TONE_DTMF_B,13
+10,Android.Media.Tone,DtmfC,android/media/ToneGenerator.TONE_DTMF_C,14
+10,Android.Media.Tone,DtmfD,android/media/ToneGenerator.TONE_DTMF_D,15
+10,Android.Media.Tone,DtmfP,android/media/ToneGenerator.TONE_DTMF_P,11
+10,Android.Media.Tone,DtmfS,android/media/ToneGenerator.TONE_DTMF_S,10
+10,Android.Media.Tone,PropAck,android/media/ToneGenerator.TONE_PROP_ACK,25
+10,Android.Media.Tone,PropBeep,android/media/ToneGenerator.TONE_PROP_BEEP,24
+10,Android.Media.Tone,PropBeep2,android/media/ToneGenerator.TONE_PROP_BEEP2,28
+10,Android.Media.Tone,PropNack,android/media/ToneGenerator.TONE_PROP_NACK,26
+10,Android.Media.Tone,PropPrompt,android/media/ToneGenerator.TONE_PROP_PROMPT,27
+10,Android.Media.Tone,SupBusy,android/media/ToneGenerator.TONE_SUP_BUSY,17
+10,Android.Media.Tone,SupCallWaiting,android/media/ToneGenerator.TONE_SUP_CALL_WAITING,22
+10,Android.Media.Tone,SupConfirm,android/media/ToneGenerator.TONE_SUP_CONFIRM,32
+10,Android.Media.Tone,SupCongestion,android/media/ToneGenerator.TONE_SUP_CONGESTION,18
+10,Android.Media.Tone,SupCongestionAbbrev,android/media/ToneGenerator.TONE_SUP_CONGESTION_ABBREV,31
+10,Android.Media.Tone,SupDial,android/media/ToneGenerator.TONE_SUP_DIAL,16
+10,Android.Media.Tone,SupError,android/media/ToneGenerator.TONE_SUP_ERROR,21
+10,Android.Media.Tone,SupIntercept,android/media/ToneGenerator.TONE_SUP_INTERCEPT,29
+10,Android.Media.Tone,SupInterceptAbbrev,android/media/ToneGenerator.TONE_SUP_INTERCEPT_ABBREV,30
+10,Android.Media.Tone,SupPip,android/media/ToneGenerator.TONE_SUP_PIP,33
+10,Android.Media.Tone,SupRadioAck,android/media/ToneGenerator.TONE_SUP_RADIO_ACK,19
+10,Android.Media.Tone,SupRadioNotavail,android/media/ToneGenerator.TONE_SUP_RADIO_NOTAVAIL,20
+10,Android.Media.Tone,SupRingtone,android/media/ToneGenerator.TONE_SUP_RINGTONE,23
 21,Android.Media.VolumeControl,Absolute,android/media/VolumeProvider.VOLUME_CONTROL_ABSOLUTE,2
 21,Android.Media.VolumeControl,Fixed,android/media/VolumeProvider.VOLUME_CONTROL_FIXED,0
 21,Android.Media.VolumeControl,Relative,android/media/VolumeProvider.VOLUME_CONTROL_RELATIVE,1
@@ -1323,8 +1283,8 @@
 26,Android.Media.TV.ReviewRatingStyle,Percentage,android/media/tv/TvContract.Programs.REVIEW_RATING_STYLE_PERCENTAGE,2
 26,Android.Media.TV.ReviewRatingStyle,Stars,android/media/tv/TvContract.Programs.REVIEW_RATING_STYLE_STARS,0
 26,Android.Media.TV.ReviewRatingStyle,ThumbsUpDown,android/media/tv/TvContract.Programs.REVIEW_RATING_STYLE_THUMBS_UP_DOWN,1
-26,Android.Media.TV.PreviewAspectRatio,A169,android/media/tv/TvContract.PreviewPrograms.ASPECT_RATIO_16_9,0
 26,Android.Media.TV.PreviewAspectRatio,A11,android/media/tv/TvContract.PreviewPrograms.ASPECT_RATIO_1_1,3
+26,Android.Media.TV.PreviewAspectRatio,A169,android/media/tv/TvContract.PreviewPrograms.ASPECT_RATIO_16_9,0
 26,Android.Media.TV.PreviewAspectRatio,A23,android/media/tv/TvContract.PreviewPrograms.ASPECT_RATIO_2_3,4
 26,Android.Media.TV.PreviewAspectRatio,A32,android/media/tv/TvContract.PreviewPrograms.ASPECT_RATIO_3_2,1
 26,Android.Media.TV.PreviewAspectRatio,A43,android/media/tv/TvContract.PreviewPrograms.ASPECT_RATIO_4_3,2
@@ -1356,8 +1316,8 @@
 26,Android.Media.TV.RecordedReviewRatingStyle,Percentage,android/media/tv/TvContract.RecordedPrograms.REVIEW_RATING_STYLE_PERCENTAGE,2
 26,Android.Media.TV.RecordedReviewRatingStyle,Stars,android/media/tv/TvContract.RecordedPrograms.REVIEW_RATING_STYLE_STARS,0
 26,Android.Media.TV.RecordedReviewRatingStyle,ThumbsUpDown,android/media/tv/TvContract.RecordedPrograms.REVIEW_RATING_STYLE_THUMBS_UP_DOWN,1
-26,Android.Media.TV.WatchNextAspectRatio,A169,android/media/tv/TvContract.WatchNextPrograms.ASPECT_RATIO_16_9,0
 26,Android.Media.TV.WatchNextAspectRatio,A11,android/media/tv/TvContract.WatchNextPrograms.ASPECT_RATIO_1_1,3
+26,Android.Media.TV.WatchNextAspectRatio,A169,android/media/tv/TvContract.WatchNextPrograms.ASPECT_RATIO_16_9,0
 26,Android.Media.TV.WatchNextAspectRatio,A23,android/media/tv/TvContract.WatchNextPrograms.ASPECT_RATIO_2_3,4
 26,Android.Media.TV.WatchNextAspectRatio,A32,android/media/tv/TvContract.WatchNextPrograms.ASPECT_RATIO_3_2,1
 26,Android.Media.TV.WatchNextAspectRatio,A43,android/media/tv/TvContract.WatchNextPrograms.ASPECT_RATIO_4_3,2
@@ -1411,104 +1371,104 @@
 21,Android.Media.TV.TvTrackInfoType,Audio,android/media/tv/TvTrackInfo.TYPE_AUDIO,0
 21,Android.Media.TV.TvTrackInfoType,Subtitle,android/media/tv/TvTrackInfo.TYPE_SUBTITLE,2
 21,Android.Media.TV.TvTrackInfoType,Video,android/media/tv/TvTrackInfo.TYPE_VIDEO,1
-12,Android.Mtp.MtpFormat,F3gpContainer,android/mtp/MtpConstants.FORMAT_3GP_CONTAINER,47492
-12,Android.Mtp.MtpFormat,Aac,android/mtp/MtpConstants.FORMAT_AAC,47363
-12,Android.Mtp.MtpFormat,AbstractAudioAlbum,android/mtp/MtpConstants.FORMAT_ABSTRACT_AUDIO_ALBUM,47619
-12,Android.Mtp.MtpFormat,AbstractAudioPlaylist,android/mtp/MtpConstants.FORMAT_ABSTRACT_AUDIO_PLAYLIST,47625
-12,Android.Mtp.MtpFormat,AbstractAvPlaylist,android/mtp/MtpConstants.FORMAT_ABSTRACT_AV_PLAYLIST,47621
-12,Android.Mtp.MtpFormat,AbstractDocument,android/mtp/MtpConstants.FORMAT_ABSTRACT_DOCUMENT,47745
-12,Android.Mtp.MtpFormat,AbstractImageAlbum,android/mtp/MtpConstants.FORMAT_ABSTRACT_IMAGE_ALBUM,47618
-12,Android.Mtp.MtpFormat,AbstractMediacast,android/mtp/MtpConstants.FORMAT_ABSTRACT_MEDIACAST,47627
-12,Android.Mtp.MtpFormat,AbstractMultimediaAlbum,android/mtp/MtpConstants.FORMAT_ABSTRACT_MULTIMEDIA_ALBUM,47617
-12,Android.Mtp.MtpFormat,AbstractVideoAlbum,android/mtp/MtpConstants.FORMAT_ABSTRACT_VIDEO_ALBUM,47620
-12,Android.Mtp.MtpFormat,AbstractVideoPlaylist,android/mtp/MtpConstants.FORMAT_ABSTRACT_VIDEO_PLAYLIST,47626
-12,Android.Mtp.MtpFormat,Aiff,android/mtp/MtpConstants.FORMAT_AIFF,12295
-12,Android.Mtp.MtpFormat,Asf,android/mtp/MtpConstants.FORMAT_ASF,12300
-12,Android.Mtp.MtpFormat,Association,android/mtp/MtpConstants.FORMAT_ASSOCIATION,12289
-12,Android.Mtp.MtpFormat,AsxPlaylist,android/mtp/MtpConstants.FORMAT_ASX_PLAYLIST,47635
-12,Android.Mtp.MtpFormat,Audible,android/mtp/MtpConstants.FORMAT_AUDIBLE,47364
-12,Android.Mtp.MtpFormat,Avi,android/mtp/MtpConstants.FORMAT_AVI,12298
-12,Android.Mtp.MtpFormat,Bmp,android/mtp/MtpConstants.FORMAT_BMP,14340
+15,Android.Mtp.MtpFormat,F3gpContainer,android/mtp/MtpConstants.FORMAT_3GP_CONTAINER,47492
+15,Android.Mtp.MtpFormat,Aac,android/mtp/MtpConstants.FORMAT_AAC,47363
+15,Android.Mtp.MtpFormat,AbstractAudioAlbum,android/mtp/MtpConstants.FORMAT_ABSTRACT_AUDIO_ALBUM,47619
+15,Android.Mtp.MtpFormat,AbstractAudioPlaylist,android/mtp/MtpConstants.FORMAT_ABSTRACT_AUDIO_PLAYLIST,47625
+15,Android.Mtp.MtpFormat,AbstractAvPlaylist,android/mtp/MtpConstants.FORMAT_ABSTRACT_AV_PLAYLIST,47621
+15,Android.Mtp.MtpFormat,AbstractDocument,android/mtp/MtpConstants.FORMAT_ABSTRACT_DOCUMENT,47745
+15,Android.Mtp.MtpFormat,AbstractImageAlbum,android/mtp/MtpConstants.FORMAT_ABSTRACT_IMAGE_ALBUM,47618
+15,Android.Mtp.MtpFormat,AbstractMediacast,android/mtp/MtpConstants.FORMAT_ABSTRACT_MEDIACAST,47627
+15,Android.Mtp.MtpFormat,AbstractMultimediaAlbum,android/mtp/MtpConstants.FORMAT_ABSTRACT_MULTIMEDIA_ALBUM,47617
+15,Android.Mtp.MtpFormat,AbstractVideoAlbum,android/mtp/MtpConstants.FORMAT_ABSTRACT_VIDEO_ALBUM,47620
+15,Android.Mtp.MtpFormat,AbstractVideoPlaylist,android/mtp/MtpConstants.FORMAT_ABSTRACT_VIDEO_PLAYLIST,47626
+15,Android.Mtp.MtpFormat,Aiff,android/mtp/MtpConstants.FORMAT_AIFF,12295
+15,Android.Mtp.MtpFormat,Asf,android/mtp/MtpConstants.FORMAT_ASF,12300
+15,Android.Mtp.MtpFormat,Association,android/mtp/MtpConstants.FORMAT_ASSOCIATION,12289
+15,Android.Mtp.MtpFormat,AsxPlaylist,android/mtp/MtpConstants.FORMAT_ASX_PLAYLIST,47635
+15,Android.Mtp.MtpFormat,Audible,android/mtp/MtpConstants.FORMAT_AUDIBLE,47364
+15,Android.Mtp.MtpFormat,Avi,android/mtp/MtpConstants.FORMAT_AVI,12298
+15,Android.Mtp.MtpFormat,Bmp,android/mtp/MtpConstants.FORMAT_BMP,14340
 24,Android.Mtp.MtpFormat,Defined,android/mtp/MtpConstants.FORMAT_DEFINED,14336
 24,Android.Mtp.MtpFormat,Dng,android/mtp/MtpConstants.FORMAT_DNG,14353
-12,Android.Mtp.MtpFormat,Dpof,android/mtp/MtpConstants.FORMAT_DPOF,12294
-12,Android.Mtp.MtpFormat,Executable,android/mtp/MtpConstants.FORMAT_EXECUTABLE,12291
-12,Android.Mtp.MtpFormat,ExifJpeg,android/mtp/MtpConstants.FORMAT_EXIF_JPEG,14337
-12,Android.Mtp.MtpFormat,Flac,android/mtp/MtpConstants.FORMAT_FLAC,47366
-12,Android.Mtp.MtpFormat,Gif,android/mtp/MtpConstants.FORMAT_GIF,14343
-12,Android.Mtp.MtpFormat,Html,android/mtp/MtpConstants.FORMAT_HTML,12293
-12,Android.Mtp.MtpFormat,Jfif,android/mtp/MtpConstants.FORMAT_JFIF,14344
-12,Android.Mtp.MtpFormat,Jp2,android/mtp/MtpConstants.FORMAT_JP2,14351
-12,Android.Mtp.MtpFormat,Jpx,android/mtp/MtpConstants.FORMAT_JPX,14352
-12,Android.Mtp.MtpFormat,M3uPlaylist,android/mtp/MtpConstants.FORMAT_M3U_PLAYLIST,47633
-12,Android.Mtp.MtpFormat,Mp2,android/mtp/MtpConstants.FORMAT_MP2,47491
-12,Android.Mtp.MtpFormat,Mp3,android/mtp/MtpConstants.FORMAT_MP3,12297
-12,Android.Mtp.MtpFormat,Mp4Container,android/mtp/MtpConstants.FORMAT_MP4_CONTAINER,47490
-12,Android.Mtp.MtpFormat,Mpeg,android/mtp/MtpConstants.FORMAT_MPEG,12299
-12,Android.Mtp.MtpFormat,MplPlaylist,android/mtp/MtpConstants.FORMAT_MPL_PLAYLIST,47634
-12,Android.Mtp.MtpFormat,MsExcelSpreadsheet,android/mtp/MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET,47749
-12,Android.Mtp.MtpFormat,MsPowerpointPresentation,android/mtp/MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION,47750
-12,Android.Mtp.MtpFormat,MsWordDocument,android/mtp/MtpConstants.FORMAT_MS_WORD_DOCUMENT,47747
-12,Android.Mtp.MtpFormat,Ogg,android/mtp/MtpConstants.FORMAT_OGG,47362
-12,Android.Mtp.MtpFormat,Pict,android/mtp/MtpConstants.FORMAT_PICT,14346
-12,Android.Mtp.MtpFormat,PlsPlaylist,android/mtp/MtpConstants.FORMAT_PLS_PLAYLIST,47636
-12,Android.Mtp.MtpFormat,Png,android/mtp/MtpConstants.FORMAT_PNG,14347
-12,Android.Mtp.MtpFormat,Script,android/mtp/MtpConstants.FORMAT_SCRIPT,12290
-12,Android.Mtp.MtpFormat,Text,android/mtp/MtpConstants.FORMAT_TEXT,12292
-12,Android.Mtp.MtpFormat,Tiff,android/mtp/MtpConstants.FORMAT_TIFF,14349
-12,Android.Mtp.MtpFormat,TiffEp,android/mtp/MtpConstants.FORMAT_TIFF_EP,14338
-12,Android.Mtp.MtpFormat,Undefined,android/mtp/MtpConstants.FORMAT_UNDEFINED,12288
-12,Android.Mtp.MtpFormat,UndefinedAudio,android/mtp/MtpConstants.FORMAT_UNDEFINED_AUDIO,47360
-12,Android.Mtp.MtpFormat,UndefinedCollection,android/mtp/MtpConstants.FORMAT_UNDEFINED_COLLECTION,47616
-12,Android.Mtp.MtpFormat,UndefinedDocument,android/mtp/MtpConstants.FORMAT_UNDEFINED_DOCUMENT,47744
-12,Android.Mtp.MtpFormat,UndefinedFirmware,android/mtp/MtpConstants.FORMAT_UNDEFINED_FIRMWARE,47106
-12,Android.Mtp.MtpFormat,UndefinedVideo,android/mtp/MtpConstants.FORMAT_UNDEFINED_VIDEO,47488
-12,Android.Mtp.MtpFormat,Wav,android/mtp/MtpConstants.FORMAT_WAV,12296
-12,Android.Mtp.MtpFormat,WindowsImageFormat,android/mtp/MtpConstants.FORMAT_WINDOWS_IMAGE_FORMAT,47233
-12,Android.Mtp.MtpFormat,Wma,android/mtp/MtpConstants.FORMAT_WMA,47361
-12,Android.Mtp.MtpFormat,Wmv,android/mtp/MtpConstants.FORMAT_WMV,47489
-12,Android.Mtp.MtpFormat,WplPlaylist,android/mtp/MtpConstants.FORMAT_WPL_PLAYLIST,47632
-12,Android.Mtp.MtpFormat,XmlDocument,android/mtp/MtpConstants.FORMAT_XML_DOCUMENT,47746
-12,Android.Mtp.ProtectionStatus,None,android/mtp/MtpConstants.PROTECTION_STATUS_NONE,0
-12,Android.Mtp.ProtectionStatus,NonTransferableData,android/mtp/MtpConstants.PROTECTION_STATUS_NON_TRANSFERABLE_DATA,32771
-12,Android.Mtp.ProtectionStatus,ReadOnly,android/mtp/MtpConstants.PROTECTION_STATUS_READ_ONLY,32769
-12,Android.Mtp.ProtectionStatus,ReadOnlyData,android/mtp/MtpConstants.PROTECTION_STATUS_READ_ONLY_DATA,32770
-13,Android.Net.ConnectivityType,Bluetooth,android/net/ConnectivityManager.TYPE_BLUETOOTH,7
-14,Android.Net.ConnectivityType,Dummy,android/net/ConnectivityManager.TYPE_DUMMY,8
-13,Android.Net.ConnectivityType,Ethernet,android/net/ConnectivityManager.TYPE_ETHERNET,9
-1,Android.Net.ConnectivityType,Mobile,android/net/ConnectivityManager.TYPE_MOBILE,0
-8,Android.Net.ConnectivityType,MobileDun,android/net/ConnectivityManager.TYPE_MOBILE_DUN,4
-8,Android.Net.ConnectivityType,MobileHipri,android/net/ConnectivityManager.TYPE_MOBILE_HIPRI,5
-8,Android.Net.ConnectivityType,MobileMms,android/net/ConnectivityManager.TYPE_MOBILE_MMS,2
-8,Android.Net.ConnectivityType,MobileSupl,android/net/ConnectivityManager.TYPE_MOBILE_SUPL,3
+15,Android.Mtp.MtpFormat,Dpof,android/mtp/MtpConstants.FORMAT_DPOF,12294
+15,Android.Mtp.MtpFormat,Executable,android/mtp/MtpConstants.FORMAT_EXECUTABLE,12291
+15,Android.Mtp.MtpFormat,ExifJpeg,android/mtp/MtpConstants.FORMAT_EXIF_JPEG,14337
+15,Android.Mtp.MtpFormat,Flac,android/mtp/MtpConstants.FORMAT_FLAC,47366
+15,Android.Mtp.MtpFormat,Gif,android/mtp/MtpConstants.FORMAT_GIF,14343
+15,Android.Mtp.MtpFormat,Html,android/mtp/MtpConstants.FORMAT_HTML,12293
+15,Android.Mtp.MtpFormat,Jfif,android/mtp/MtpConstants.FORMAT_JFIF,14344
+15,Android.Mtp.MtpFormat,Jp2,android/mtp/MtpConstants.FORMAT_JP2,14351
+15,Android.Mtp.MtpFormat,Jpx,android/mtp/MtpConstants.FORMAT_JPX,14352
+15,Android.Mtp.MtpFormat,M3uPlaylist,android/mtp/MtpConstants.FORMAT_M3U_PLAYLIST,47633
+15,Android.Mtp.MtpFormat,Mp2,android/mtp/MtpConstants.FORMAT_MP2,47491
+15,Android.Mtp.MtpFormat,Mp3,android/mtp/MtpConstants.FORMAT_MP3,12297
+15,Android.Mtp.MtpFormat,Mp4Container,android/mtp/MtpConstants.FORMAT_MP4_CONTAINER,47490
+15,Android.Mtp.MtpFormat,Mpeg,android/mtp/MtpConstants.FORMAT_MPEG,12299
+15,Android.Mtp.MtpFormat,MplPlaylist,android/mtp/MtpConstants.FORMAT_MPL_PLAYLIST,47634
+15,Android.Mtp.MtpFormat,MsExcelSpreadsheet,android/mtp/MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET,47749
+15,Android.Mtp.MtpFormat,MsPowerpointPresentation,android/mtp/MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION,47750
+15,Android.Mtp.MtpFormat,MsWordDocument,android/mtp/MtpConstants.FORMAT_MS_WORD_DOCUMENT,47747
+15,Android.Mtp.MtpFormat,Ogg,android/mtp/MtpConstants.FORMAT_OGG,47362
+15,Android.Mtp.MtpFormat,Pict,android/mtp/MtpConstants.FORMAT_PICT,14346
+15,Android.Mtp.MtpFormat,PlsPlaylist,android/mtp/MtpConstants.FORMAT_PLS_PLAYLIST,47636
+15,Android.Mtp.MtpFormat,Png,android/mtp/MtpConstants.FORMAT_PNG,14347
+15,Android.Mtp.MtpFormat,Script,android/mtp/MtpConstants.FORMAT_SCRIPT,12290
+15,Android.Mtp.MtpFormat,Text,android/mtp/MtpConstants.FORMAT_TEXT,12292
+15,Android.Mtp.MtpFormat,Tiff,android/mtp/MtpConstants.FORMAT_TIFF,14349
+15,Android.Mtp.MtpFormat,TiffEp,android/mtp/MtpConstants.FORMAT_TIFF_EP,14338
+15,Android.Mtp.MtpFormat,Undefined,android/mtp/MtpConstants.FORMAT_UNDEFINED,12288
+15,Android.Mtp.MtpFormat,UndefinedAudio,android/mtp/MtpConstants.FORMAT_UNDEFINED_AUDIO,47360
+15,Android.Mtp.MtpFormat,UndefinedCollection,android/mtp/MtpConstants.FORMAT_UNDEFINED_COLLECTION,47616
+15,Android.Mtp.MtpFormat,UndefinedDocument,android/mtp/MtpConstants.FORMAT_UNDEFINED_DOCUMENT,47744
+15,Android.Mtp.MtpFormat,UndefinedFirmware,android/mtp/MtpConstants.FORMAT_UNDEFINED_FIRMWARE,47106
+15,Android.Mtp.MtpFormat,UndefinedVideo,android/mtp/MtpConstants.FORMAT_UNDEFINED_VIDEO,47488
+15,Android.Mtp.MtpFormat,Wav,android/mtp/MtpConstants.FORMAT_WAV,12296
+15,Android.Mtp.MtpFormat,WindowsImageFormat,android/mtp/MtpConstants.FORMAT_WINDOWS_IMAGE_FORMAT,47233
+15,Android.Mtp.MtpFormat,Wma,android/mtp/MtpConstants.FORMAT_WMA,47361
+15,Android.Mtp.MtpFormat,Wmv,android/mtp/MtpConstants.FORMAT_WMV,47489
+15,Android.Mtp.MtpFormat,WplPlaylist,android/mtp/MtpConstants.FORMAT_WPL_PLAYLIST,47632
+15,Android.Mtp.MtpFormat,XmlDocument,android/mtp/MtpConstants.FORMAT_XML_DOCUMENT,47746
+15,Android.Mtp.ProtectionStatus,NonTransferableData,android/mtp/MtpConstants.PROTECTION_STATUS_NON_TRANSFERABLE_DATA,32771
+15,Android.Mtp.ProtectionStatus,None,android/mtp/MtpConstants.PROTECTION_STATUS_NONE,0
+15,Android.Mtp.ProtectionStatus,ReadOnly,android/mtp/MtpConstants.PROTECTION_STATUS_READ_ONLY,32769
+15,Android.Mtp.ProtectionStatus,ReadOnlyData,android/mtp/MtpConstants.PROTECTION_STATUS_READ_ONLY_DATA,32770
+15,Android.Net.ConnectivityType,Bluetooth,android/net/ConnectivityManager.TYPE_BLUETOOTH,7
+15,Android.Net.ConnectivityType,Dummy,android/net/ConnectivityManager.TYPE_DUMMY,8
+15,Android.Net.ConnectivityType,Ethernet,android/net/ConnectivityManager.TYPE_ETHERNET,9
+10,Android.Net.ConnectivityType,Mobile,android/net/ConnectivityManager.TYPE_MOBILE,0
+10,Android.Net.ConnectivityType,MobileDun,android/net/ConnectivityManager.TYPE_MOBILE_DUN,4
+10,Android.Net.ConnectivityType,MobileHipri,android/net/ConnectivityManager.TYPE_MOBILE_HIPRI,5
+10,Android.Net.ConnectivityType,MobileMms,android/net/ConnectivityManager.TYPE_MOBILE_MMS,2
+10,Android.Net.ConnectivityType,MobileSupl,android/net/ConnectivityManager.TYPE_MOBILE_SUPL,3
 21,Android.Net.ConnectivityType,Vpn,android/net/ConnectivityManager.TYPE_VPN,17
-1,Android.Net.ConnectivityType,Wifi,android/net/ConnectivityManager.TYPE_WIFI,1
-8,Android.Net.ConnectivityType,Wimax,android/net/ConnectivityManager.TYPE_WIMAX,6
+10,Android.Net.ConnectivityType,Wifi,android/net/ConnectivityManager.TYPE_WIFI,1
+10,Android.Net.ConnectivityType,Wimax,android/net/ConnectivityManager.TYPE_WIMAX,6
 26,Android.Net.MultipathPreference,Handover,android/net/ConnectivityManager.MULTIPATH_PREFERENCE_HANDOVER,1
 26,Android.Net.MultipathPreference,Performance,android/net/ConnectivityManager.MULTIPATH_PREFERENCE_PERFORMANCE,4
 26,Android.Net.MultipathPreference,Reliability,android/net/ConnectivityManager.MULTIPATH_PREFERENCE_RELIABILITY,2
-1,Android.Net.IllegalCharacterFlags,AllButNulAndAngleBracketsLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_BUT_NUL_AND_ANGLE_BRACKETS_LEGAL,1439
-1,Android.Net.IllegalCharacterFlags,AllButNulLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_BUT_NUL_LEGAL,1535
-1,Android.Net.IllegalCharacterFlags,AllButWhitespaceLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_BUT_WHITESPACE_LEGAL,1532
-1,Android.Net.IllegalCharacterFlags,AllIllegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_ILLEGAL,0
-1,Android.Net.IllegalCharacterFlags,AllOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_OK,2047
-1,Android.Net.IllegalCharacterFlags,AllWhitespaceOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_WHITESPACE_OK,3
-1,Android.Net.IllegalCharacterFlags,AmpAndSpaceLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.AMP_AND_SPACE_LEGAL,129
-1,Android.Net.IllegalCharacterFlags,AmpLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.AMP_LEGAL,128
-1,Android.Net.IllegalCharacterFlags,AmpOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.AMP_OK,128
-1,Android.Net.IllegalCharacterFlags,DquoteOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.DQUOTE_OK,8
-1,Android.Net.IllegalCharacterFlags,GtOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.GT_OK,64
-1,Android.Net.IllegalCharacterFlags,LtOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.LT_OK,32
-1,Android.Net.IllegalCharacterFlags,Non7BitAsciiOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.NON_7_BIT_ASCII_OK,4
-1,Android.Net.IllegalCharacterFlags,NulOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.NUL_OK,512
-1,Android.Net.IllegalCharacterFlags,OtherWhitespaceOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.OTHER_WHITESPACE_OK,2
-1,Android.Net.IllegalCharacterFlags,PctOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.PCT_OK,256
-1,Android.Net.IllegalCharacterFlags,ScriptUrlOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.SCRIPT_URL_OK,1024
-1,Android.Net.IllegalCharacterFlags,SpaceLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.SPACE_LEGAL,1
-1,Android.Net.IllegalCharacterFlags,SpaceOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.SPACE_OK,1
-1,Android.Net.IllegalCharacterFlags,SquoteOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.SQUOTE_OK,16
-1,Android.Net.IllegalCharacterFlags,UrlAndSpaceLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.URL_AND_SPACE_LEGAL,405
-1,Android.Net.IllegalCharacterFlags,UrlLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.URL_LEGAL,404
+10,Android.Net.IllegalCharacterFlags,AllButNulAndAngleBracketsLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_BUT_NUL_AND_ANGLE_BRACKETS_LEGAL,1439
+10,Android.Net.IllegalCharacterFlags,AllButNulLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_BUT_NUL_LEGAL,1535
+10,Android.Net.IllegalCharacterFlags,AllButWhitespaceLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_BUT_WHITESPACE_LEGAL,1532
+10,Android.Net.IllegalCharacterFlags,AllIllegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_ILLEGAL,0
+10,Android.Net.IllegalCharacterFlags,AllOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_OK,2047
+10,Android.Net.IllegalCharacterFlags,AllWhitespaceOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.ALL_WHITESPACE_OK,3
+10,Android.Net.IllegalCharacterFlags,AmpAndSpaceLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.AMP_AND_SPACE_LEGAL,129
+10,Android.Net.IllegalCharacterFlags,AmpLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.AMP_LEGAL,128
+10,Android.Net.IllegalCharacterFlags,AmpOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.AMP_OK,128
+10,Android.Net.IllegalCharacterFlags,DquoteOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.DQUOTE_OK,8
+10,Android.Net.IllegalCharacterFlags,GtOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.GT_OK,64
+10,Android.Net.IllegalCharacterFlags,LtOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.LT_OK,32
+10,Android.Net.IllegalCharacterFlags,Non7BitAsciiOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.NON_7_BIT_ASCII_OK,4
+10,Android.Net.IllegalCharacterFlags,NulOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.NUL_OK,512
+10,Android.Net.IllegalCharacterFlags,OtherWhitespaceOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.OTHER_WHITESPACE_OK,2
+10,Android.Net.IllegalCharacterFlags,PctOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.PCT_OK,256
+10,Android.Net.IllegalCharacterFlags,ScriptUrlOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.SCRIPT_URL_OK,1024
+10,Android.Net.IllegalCharacterFlags,SpaceLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.SPACE_LEGAL,1
+10,Android.Net.IllegalCharacterFlags,SpaceOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.SPACE_OK,1
+10,Android.Net.IllegalCharacterFlags,SquoteOk,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.SQUOTE_OK,16
+10,Android.Net.IllegalCharacterFlags,UrlAndSpaceLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.URL_AND_SPACE_LEGAL,405
+10,Android.Net.IllegalCharacterFlags,UrlLegal,android/net/UrlQuerySanitizer$IllegalCharacterValueSanitizer.URL_LEGAL,404
 26,Android.Net.Wifi.LocalOnlyHotspotCallbackErrorCode,Generic,android/net/wifi/WifiManager.LocalOnlyHotspotCallback.ERROR_GENERIC,2
 26,Android.Net.Wifi.LocalOnlyHotspotCallbackErrorCode,IncompatibleMode,android/net/wifi/WifiManager.LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE,3
 26,Android.Net.Wifi.LocalOnlyHotspotCallbackErrorCode,NoChannel,android/net/wifi/WifiManager.LocalOnlyHotspotCallback.ERROR_NO_CHANNEL,1
@@ -1524,171 +1484,171 @@
 21,Android.Net.Wifi.WpsFailureReason,TimedOut,android/net/wifi/WifiManager.WPS_TIMED_OUT,7
 21,Android.Net.Wifi.WpsFailureReason,TkipOnlyProhibited,android/net/wifi/WifiManager.WPS_TKIP_ONLY_PROHIBITED,5
 21,Android.Net.Wifi.WpsFailureReason,WepProhibited,android/net/wifi/WifiManager.WPS_WEP_PROHIBITED,4
-1,Android.OS.FileObserverEvents,Access,android/os/FileObserver.ACCESS,1
-1,Android.OS.FileObserverEvents,AllEvents,android/os/FileObserver.ALL_EVENTS,4095
-1,Android.OS.FileObserverEvents,Attrib,android/os/FileObserver.ATTRIB,4
-1,Android.OS.FileObserverEvents,CloseNowrite,android/os/FileObserver.CLOSE_NOWRITE,16
-1,Android.OS.FileObserverEvents,CloseWrite,android/os/FileObserver.CLOSE_WRITE,8
-1,Android.OS.FileObserverEvents,Create,android/os/FileObserver.CREATE,256
-1,Android.OS.FileObserverEvents,Delete,android/os/FileObserver.DELETE,512
-1,Android.OS.FileObserverEvents,DeleteSelf,android/os/FileObserver.DELETE_SELF,1024
-1,Android.OS.FileObserverEvents,Modify,android/os/FileObserver.MODIFY,2
-1,Android.OS.FileObserverEvents,MovedFrom,android/os/FileObserver.MOVED_FROM,64
-1,Android.OS.FileObserverEvents,MovedTo,android/os/FileObserver.MOVED_TO,128
-1,Android.OS.FileObserverEvents,MoveSelf,android/os/FileObserver.MOVE_SELF,2048
-1,Android.OS.FileObserverEvents,Open,android/os/FileObserver.OPEN,32
-3,Android.OS.ParcelFileMode,Append,android/os/ParcelFileDescriptor.MODE_APPEND,33554432
-1,Android.OS.ParcelFileMode,Create,android/os/ParcelFileDescriptor.MODE_CREATE,134217728
-1,Android.OS.ParcelFileMode,ReadOnly,android/os/ParcelFileDescriptor.MODE_READ_ONLY,268435456
-1,Android.OS.ParcelFileMode,ReadWrite,android/os/ParcelFileDescriptor.MODE_READ_WRITE,805306368
-1,Android.OS.ParcelFileMode,Truncate,android/os/ParcelFileDescriptor.MODE_TRUNCATE,67108864
-1,Android.OS.ParcelFileMode,WorldReadable,android/os/ParcelFileDescriptor.MODE_WORLD_READABLE,1
-1,Android.OS.ParcelFileMode,WorldWriteable,android/os/ParcelFileDescriptor.MODE_WORLD_WRITEABLE,2
-1,Android.OS.ParcelFileMode,WriteOnly,android/os/ParcelFileDescriptor.MODE_WRITE_ONLY,536870912
+10,Android.OS.FileObserverEvents,Access,android/os/FileObserver.ACCESS,1
+10,Android.OS.FileObserverEvents,AllEvents,android/os/FileObserver.ALL_EVENTS,4095
+10,Android.OS.FileObserverEvents,Attrib,android/os/FileObserver.ATTRIB,4
+10,Android.OS.FileObserverEvents,CloseNowrite,android/os/FileObserver.CLOSE_NOWRITE,16
+10,Android.OS.FileObserverEvents,CloseWrite,android/os/FileObserver.CLOSE_WRITE,8
+10,Android.OS.FileObserverEvents,Create,android/os/FileObserver.CREATE,256
+10,Android.OS.FileObserverEvents,Delete,android/os/FileObserver.DELETE,512
+10,Android.OS.FileObserverEvents,DeleteSelf,android/os/FileObserver.DELETE_SELF,1024
+10,Android.OS.FileObserverEvents,Modify,android/os/FileObserver.MODIFY,2
+10,Android.OS.FileObserverEvents,MoveSelf,android/os/FileObserver.MOVE_SELF,2048
+10,Android.OS.FileObserverEvents,MovedFrom,android/os/FileObserver.MOVED_FROM,64
+10,Android.OS.FileObserverEvents,MovedTo,android/os/FileObserver.MOVED_TO,128
+10,Android.OS.FileObserverEvents,Open,android/os/FileObserver.OPEN,32
+10,Android.OS.ParcelFileMode,Append,android/os/ParcelFileDescriptor.MODE_APPEND,33554432
+10,Android.OS.ParcelFileMode,Create,android/os/ParcelFileDescriptor.MODE_CREATE,134217728
+10,Android.OS.ParcelFileMode,ReadOnly,android/os/ParcelFileDescriptor.MODE_READ_ONLY,268435456
+10,Android.OS.ParcelFileMode,ReadWrite,android/os/ParcelFileDescriptor.MODE_READ_WRITE,805306368
+10,Android.OS.ParcelFileMode,Truncate,android/os/ParcelFileDescriptor.MODE_TRUNCATE,67108864
+10,Android.OS.ParcelFileMode,WorldReadable,android/os/ParcelFileDescriptor.MODE_WORLD_READABLE,1
+10,Android.OS.ParcelFileMode,WorldWriteable,android/os/ParcelFileDescriptor.MODE_WORLD_WRITEABLE,2
+10,Android.OS.ParcelFileMode,WriteOnly,android/os/ParcelFileDescriptor.MODE_WRITE_ONLY,536870912
 26,Android.OS.Pattern,AdvancedGlob,android/os/PatternMatcher.PATTERN_ADVANCED_GLOB,3
-1,Android.OS.Pattern,Literal,android/os/PatternMatcher.PATTERN_LITERAL,0
-1,Android.OS.Pattern,Prefix,android/os/PatternMatcher.PATTERN_PREFIX,1
-1,Android.OS.Pattern,SimpleGlob,android/os/PatternMatcher.PATTERN_SIMPLE_GLOB,2
-1,Android.OS.WakeLockFlags,AcquireCausesWakeup,android/os/PowerManager.ACQUIRE_CAUSES_WAKEUP,268435456
-1,Android.OS.WakeLockFlags,OnAfterRelease,android/os/PowerManager.ON_AFTER_RELEASE,536870912
+10,Android.OS.Pattern,Literal,android/os/PatternMatcher.PATTERN_LITERAL,0
+10,Android.OS.Pattern,Prefix,android/os/PatternMatcher.PATTERN_PREFIX,1
+10,Android.OS.Pattern,SimpleGlob,android/os/PatternMatcher.PATTERN_SIMPLE_GLOB,2
+10,Android.OS.WakeLockFlags,AcquireCausesWakeup,android/os/PowerManager.ACQUIRE_CAUSES_WAKEUP,268435456
+10,Android.OS.WakeLockFlags,OnAfterRelease,android/os/PowerManager.ON_AFTER_RELEASE,536870912
 21,Android.OS.WakeLockFlags,ReleaseFlagWaitForNoProximity,android/os/PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY,1
-1,Android.OS.WakeLockFlags,Full,android/os/PowerManager.FULL_WAKE_LOCK,26
-1,Android.OS.WakeLockFlags,Partial,android/os/PowerManager.PARTIAL_WAKE_LOCK,1
+10,Android.OS.WakeLockFlags,Full,android/os/PowerManager.FULL_WAKE_LOCK,26
+10,Android.OS.WakeLockFlags,Partial,android/os/PowerManager.PARTIAL_WAKE_LOCK,1
 21,Android.OS.WakeLockFlags,ProximityScreenOff,android/os/PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,32
-1,Android.OS.WakeLockFlags,ScreenBright,android/os/PowerManager.SCREEN_BRIGHT_WAKE_LOCK,10
-1,Android.OS.WakeLockFlags,ScreenDim,android/os/PowerManager.SCREEN_DIM_WAKE_LOCK,6
-1,Android.OS.Signal,Kill,android/os/Process.SIGNAL_KILL,9
-1,Android.OS.Signal,Quit,android/os/Process.SIGNAL_QUIT,3
-1,Android.OS.Signal,Usr1,android/os/Process.SIGNAL_USR1,10
-1,Android.OS.ThreadPriority,Audio,android/os/Process.THREAD_PRIORITY_AUDIO,-16
-1,Android.OS.ThreadPriority,Background,android/os/Process.THREAD_PRIORITY_BACKGROUND,10
-1,Android.OS.ThreadPriority,Default,android/os/Process.THREAD_PRIORITY_DEFAULT,0
-1,Android.OS.ThreadPriority,Display,android/os/Process.THREAD_PRIORITY_DISPLAY,-4
-1,Android.OS.ThreadPriority,Foreground,android/os/Process.THREAD_PRIORITY_FOREGROUND,-2
-1,Android.OS.ThreadPriority,LessFavorable,android/os/Process.THREAD_PRIORITY_LESS_FAVORABLE,1
-1,Android.OS.ThreadPriority,Lowest,android/os/Process.THREAD_PRIORITY_LOWEST,19
-1,Android.OS.ThreadPriority,MoreFavorable,android/os/Process.THREAD_PRIORITY_MORE_FAVORABLE,-1
-1,Android.OS.ThreadPriority,UrgentAudio,android/os/Process.THREAD_PRIORITY_URGENT_AUDIO,-19
-1,Android.OS.ThreadPriority,UrgentDisplay,android/os/Process.THREAD_PRIORITY_URGENT_DISPLAY,-8
-1,Android.Provider.ContactKind,Email,android/provider/Contacts.KIND_EMAIL,1
-1,Android.Provider.ContactKind,Im,android/provider/Contacts.KIND_IM,3
-1,Android.Provider.ContactKind,Organization,android/provider/Contacts.KIND_ORGANIZATION,4
-1,Android.Provider.ContactKind,Phone,android/provider/Contacts.KIND_PHONE,5
-1,Android.Provider.ContactKind,Postal,android/provider/Contacts.KIND_POSTAL,2
-1,Android.Provider.ContactProtocol,Aim,android/provider/Contacts$ContactMethods.PROTOCOL_AIM,0
-1,Android.Provider.ContactProtocol,GoogleTalk,android/provider/Contacts$ContactMethods.PROTOCOL_GOOGLE_TALK,5
-1,Android.Provider.ContactProtocol,Icq,android/provider/Contacts$ContactMethods.PROTOCOL_ICQ,6
-1,Android.Provider.ContactProtocol,Jabber,android/provider/Contacts$ContactMethods.PROTOCOL_JABBER,7
-1,Android.Provider.ContactProtocol,Msn,android/provider/Contacts$ContactMethods.PROTOCOL_MSN,1
-1,Android.Provider.ContactProtocol,Qq,android/provider/Contacts$ContactMethods.PROTOCOL_QQ,4
-1,Android.Provider.ContactProtocol,Skype,android/provider/Contacts$ContactMethods.PROTOCOL_SKYPE,3
-1,Android.Provider.ContactProtocol,Yahoo,android/provider/Contacts$ContactMethods.PROTOCOL_YAHOO,2
-1,Android.Provider.ContactMethodColumn,Custom,I:android/provider/Contacts$ContactMethodsColumns.TYPE_CUSTOM,0
-1,Android.Provider.ContactMethodColumn,Home,I:android/provider/Contacts$ContactMethodsColumns.TYPE_HOME,1
-1,Android.Provider.ContactMethodColumn,Other,I:android/provider/Contacts$ContactMethodsColumns.TYPE_OTHER,3
-1,Android.Provider.ContactMethodColumn,Work,I:android/provider/Contacts$ContactMethodsColumns.TYPE_WORK,2
-1,Android.Provider.ContactOrganizationColumn,Custom,I:android/provider/Contacts$OrganizationColumns.TYPE_CUSTOM,0
-1,Android.Provider.ContactOrganizationColumn,Other,I:android/provider/Contacts$OrganizationColumns.TYPE_OTHER,2
-1,Android.Provider.ContactOrganizationColumn,Work,I:android/provider/Contacts$OrganizationColumns.TYPE_WORK,1
-1,Android.Provider.ContactPhoneColumn,Custom,I:android/provider/Contacts$PhonesColumns.TYPE_CUSTOM,0
-1,Android.Provider.ContactPhoneColumn,FaxHome,I:android/provider/Contacts$PhonesColumns.TYPE_FAX_HOME,5
-1,Android.Provider.ContactPhoneColumn,FaxWork,I:android/provider/Contacts$PhonesColumns.TYPE_FAX_WORK,4
-1,Android.Provider.ContactPhoneColumn,Home,I:android/provider/Contacts$PhonesColumns.TYPE_HOME,1
-1,Android.Provider.ContactPhoneColumn,Mobile,I:android/provider/Contacts$PhonesColumns.TYPE_MOBILE,2
-1,Android.Provider.ContactPhoneColumn,Other,I:android/provider/Contacts$PhonesColumns.TYPE_OTHER,7
-1,Android.Provider.ContactPhoneColumn,Pager,I:android/provider/Contacts$PhonesColumns.TYPE_PAGER,6
-1,Android.Provider.ContactPhoneColumn,Work,I:android/provider/Contacts$PhonesColumns.TYPE_WORK,3
-5,Android.Provider.AggregateException,Automatic,android/provider/ContactsContract$AggregationExceptions.TYPE_AUTOMATIC,0
-5,Android.Provider.AggregateException,KeepSeparate,android/provider/ContactsContract$AggregationExceptions.TYPE_KEEP_SEPARATE,2
-5,Android.Provider.AggregateException,KeepTogether,android/provider/ContactsContract$AggregationExceptions.TYPE_KEEP_TOGETHER,1
+10,Android.OS.WakeLockFlags,ScreenBright,android/os/PowerManager.SCREEN_BRIGHT_WAKE_LOCK,10
+10,Android.OS.WakeLockFlags,ScreenDim,android/os/PowerManager.SCREEN_DIM_WAKE_LOCK,6
+10,Android.OS.Signal,Kill,android/os/Process.SIGNAL_KILL,9
+10,Android.OS.Signal,Quit,android/os/Process.SIGNAL_QUIT,3
+10,Android.OS.Signal,Usr1,android/os/Process.SIGNAL_USR1,10
+10,Android.OS.ThreadPriority,Audio,android/os/Process.THREAD_PRIORITY_AUDIO,-16
+10,Android.OS.ThreadPriority,Background,android/os/Process.THREAD_PRIORITY_BACKGROUND,10
+10,Android.OS.ThreadPriority,Default,android/os/Process.THREAD_PRIORITY_DEFAULT,0
+10,Android.OS.ThreadPriority,Display,android/os/Process.THREAD_PRIORITY_DISPLAY,-4
+10,Android.OS.ThreadPriority,Foreground,android/os/Process.THREAD_PRIORITY_FOREGROUND,-2
+10,Android.OS.ThreadPriority,LessFavorable,android/os/Process.THREAD_PRIORITY_LESS_FAVORABLE,1
+10,Android.OS.ThreadPriority,Lowest,android/os/Process.THREAD_PRIORITY_LOWEST,19
+10,Android.OS.ThreadPriority,MoreFavorable,android/os/Process.THREAD_PRIORITY_MORE_FAVORABLE,-1
+10,Android.OS.ThreadPriority,UrgentAudio,android/os/Process.THREAD_PRIORITY_URGENT_AUDIO,-19
+10,Android.OS.ThreadPriority,UrgentDisplay,android/os/Process.THREAD_PRIORITY_URGENT_DISPLAY,-8
+10,Android.Provider.ContactKind,Email,android/provider/Contacts.KIND_EMAIL,1
+10,Android.Provider.ContactKind,Im,android/provider/Contacts.KIND_IM,3
+10,Android.Provider.ContactKind,Organization,android/provider/Contacts.KIND_ORGANIZATION,4
+10,Android.Provider.ContactKind,Phone,android/provider/Contacts.KIND_PHONE,5
+10,Android.Provider.ContactKind,Postal,android/provider/Contacts.KIND_POSTAL,2
+10,Android.Provider.ContactProtocol,Aim,android/provider/Contacts$ContactMethods.PROTOCOL_AIM,0
+10,Android.Provider.ContactProtocol,GoogleTalk,android/provider/Contacts$ContactMethods.PROTOCOL_GOOGLE_TALK,5
+10,Android.Provider.ContactProtocol,Icq,android/provider/Contacts$ContactMethods.PROTOCOL_ICQ,6
+10,Android.Provider.ContactProtocol,Jabber,android/provider/Contacts$ContactMethods.PROTOCOL_JABBER,7
+10,Android.Provider.ContactProtocol,Msn,android/provider/Contacts$ContactMethods.PROTOCOL_MSN,1
+10,Android.Provider.ContactProtocol,Qq,android/provider/Contacts$ContactMethods.PROTOCOL_QQ,4
+10,Android.Provider.ContactProtocol,Skype,android/provider/Contacts$ContactMethods.PROTOCOL_SKYPE,3
+10,Android.Provider.ContactProtocol,Yahoo,android/provider/Contacts$ContactMethods.PROTOCOL_YAHOO,2
+10,Android.Provider.ContactMethodColumn,Custom,I:android/provider/Contacts$ContactMethodsColumns.TYPE_CUSTOM,0
+10,Android.Provider.ContactMethodColumn,Home,I:android/provider/Contacts$ContactMethodsColumns.TYPE_HOME,1
+10,Android.Provider.ContactMethodColumn,Other,I:android/provider/Contacts$ContactMethodsColumns.TYPE_OTHER,3
+10,Android.Provider.ContactMethodColumn,Work,I:android/provider/Contacts$ContactMethodsColumns.TYPE_WORK,2
+10,Android.Provider.ContactOrganizationColumn,Custom,I:android/provider/Contacts$OrganizationColumns.TYPE_CUSTOM,0
+10,Android.Provider.ContactOrganizationColumn,Other,I:android/provider/Contacts$OrganizationColumns.TYPE_OTHER,2
+10,Android.Provider.ContactOrganizationColumn,Work,I:android/provider/Contacts$OrganizationColumns.TYPE_WORK,1
+10,Android.Provider.ContactPhoneColumn,Custom,I:android/provider/Contacts$PhonesColumns.TYPE_CUSTOM,0
+10,Android.Provider.ContactPhoneColumn,FaxHome,I:android/provider/Contacts$PhonesColumns.TYPE_FAX_HOME,5
+10,Android.Provider.ContactPhoneColumn,FaxWork,I:android/provider/Contacts$PhonesColumns.TYPE_FAX_WORK,4
+10,Android.Provider.ContactPhoneColumn,Home,I:android/provider/Contacts$PhonesColumns.TYPE_HOME,1
+10,Android.Provider.ContactPhoneColumn,Mobile,I:android/provider/Contacts$PhonesColumns.TYPE_MOBILE,2
+10,Android.Provider.ContactPhoneColumn,Other,I:android/provider/Contacts$PhonesColumns.TYPE_OTHER,7
+10,Android.Provider.ContactPhoneColumn,Pager,I:android/provider/Contacts$PhonesColumns.TYPE_PAGER,6
+10,Android.Provider.ContactPhoneColumn,Work,I:android/provider/Contacts$PhonesColumns.TYPE_WORK,3
+10,Android.Provider.AggregateException,Automatic,android/provider/ContactsContract$AggregationExceptions.TYPE_AUTOMATIC,0
+10,Android.Provider.AggregateException,KeepSeparate,android/provider/ContactsContract$AggregationExceptions.TYPE_KEEP_SEPARATE,2
+10,Android.Provider.AggregateException,KeepTogether,android/provider/ContactsContract$AggregationExceptions.TYPE_KEEP_TOGETHER,1
 0,Android.Provider.EmailDataKind,Custom,,0
-5,Android.Provider.EmailDataKind,Home,android/provider/ContactsContract$CommonDataKinds$Email.TYPE_HOME,1
-5,Android.Provider.EmailDataKind,Mobile,android/provider/ContactsContract$CommonDataKinds$Email.TYPE_MOBILE,4
-5,Android.Provider.EmailDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Email.TYPE_OTHER,3
-5,Android.Provider.EmailDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Email.TYPE_WORK,2
+10,Android.Provider.EmailDataKind,Home,android/provider/ContactsContract$CommonDataKinds$Email.TYPE_HOME,1
+10,Android.Provider.EmailDataKind,Mobile,android/provider/ContactsContract$CommonDataKinds$Email.TYPE_MOBILE,4
+10,Android.Provider.EmailDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Email.TYPE_OTHER,3
+10,Android.Provider.EmailDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Email.TYPE_WORK,2
 0,Android.Provider.EventDataKind,Custom,,0
-5,Android.Provider.EventDataKind,Anniversary,android/provider/ContactsContract$CommonDataKinds$Event.TYPE_ANNIVERSARY,1
-5,Android.Provider.EventDataKind,Birthday,android/provider/ContactsContract$CommonDataKinds$Event.TYPE_BIRTHDAY,3
-5,Android.Provider.EventDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Event.TYPE_OTHER,2
-5,Android.Provider.IMProtocolDataKind,Aim,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_AIM,0
-5,Android.Provider.IMProtocolDataKind,Custom,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_CUSTOM,-1
-5,Android.Provider.IMProtocolDataKind,GoogleTalk,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_GOOGLE_TALK,5
-5,Android.Provider.IMProtocolDataKind,Icq,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_ICQ,6
-5,Android.Provider.IMProtocolDataKind,Jabber,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_JABBER,7
-5,Android.Provider.IMProtocolDataKind,Msn,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_MSN,1
-5,Android.Provider.IMProtocolDataKind,Netmeeting,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_NETMEETING,8
-5,Android.Provider.IMProtocolDataKind,Qq,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_QQ,4
-5,Android.Provider.IMProtocolDataKind,Skype,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_SKYPE,3
-5,Android.Provider.IMProtocolDataKind,Yahoo,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_YAHOO,2
+10,Android.Provider.EventDataKind,Anniversary,android/provider/ContactsContract$CommonDataKinds$Event.TYPE_ANNIVERSARY,1
+10,Android.Provider.EventDataKind,Birthday,android/provider/ContactsContract$CommonDataKinds$Event.TYPE_BIRTHDAY,3
+10,Android.Provider.EventDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Event.TYPE_OTHER,2
+10,Android.Provider.IMProtocolDataKind,Aim,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_AIM,0
+10,Android.Provider.IMProtocolDataKind,Custom,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_CUSTOM,-1
+10,Android.Provider.IMProtocolDataKind,GoogleTalk,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_GOOGLE_TALK,5
+10,Android.Provider.IMProtocolDataKind,Icq,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_ICQ,6
+10,Android.Provider.IMProtocolDataKind,Jabber,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_JABBER,7
+10,Android.Provider.IMProtocolDataKind,Msn,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_MSN,1
+10,Android.Provider.IMProtocolDataKind,Netmeeting,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_NETMEETING,8
+10,Android.Provider.IMProtocolDataKind,Qq,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_QQ,4
+10,Android.Provider.IMProtocolDataKind,Skype,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_SKYPE,3
+10,Android.Provider.IMProtocolDataKind,Yahoo,android/provider/ContactsContract$CommonDataKinds$Im.PROTOCOL_YAHOO,2
 0,Android.Provider.IMTypeDataKind,Custom,,0
-5,Android.Provider.IMTypeDataKind,Home,android/provider/ContactsContract$CommonDataKinds$Im.TYPE_HOME,1
-5,Android.Provider.IMTypeDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Im.TYPE_OTHER,3
-5,Android.Provider.IMTypeDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Im.TYPE_WORK,2
+10,Android.Provider.IMTypeDataKind,Home,android/provider/ContactsContract$CommonDataKinds$Im.TYPE_HOME,1
+10,Android.Provider.IMTypeDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Im.TYPE_OTHER,3
+10,Android.Provider.IMTypeDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Im.TYPE_WORK,2
 0,Android.Provider.NicknameDataKind,Custom,,0
-5,Android.Provider.NicknameDataKind,Default,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_DEFAULT,1
-5,Android.Provider.NicknameDataKind,Initials,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_INITIALS,5
-9,Android.Provider.NicknameDataKind,MaidenName,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_MAIDEN_NAME,3
-5,Android.Provider.NicknameDataKind,MaindenName,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_MAINDEN_NAME,3
-5,Android.Provider.NicknameDataKind,OtherName,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_OTHER_NAME,2
-5,Android.Provider.NicknameDataKind,ShortName,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_SHORT_NAME,4
+10,Android.Provider.NicknameDataKind,Default,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_DEFAULT,1
+10,Android.Provider.NicknameDataKind,Initials,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_INITIALS,5
+10,Android.Provider.NicknameDataKind,MaidenName,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_MAIDEN_NAME,3
+10,Android.Provider.NicknameDataKind,MaindenName,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_MAINDEN_NAME,3
+10,Android.Provider.NicknameDataKind,OtherName,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_OTHER_NAME,2
+10,Android.Provider.NicknameDataKind,ShortName,android/provider/ContactsContract$CommonDataKinds$Nickname.TYPE_SHORT_NAME,4
 0,Android.Provider.OrganizationDataKind,Custom,,0
-5,Android.Provider.OrganizationDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Organization.TYPE_OTHER,2
-5,Android.Provider.OrganizationDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Organization.TYPE_WORK,1
+10,Android.Provider.OrganizationDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Organization.TYPE_OTHER,2
+10,Android.Provider.OrganizationDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Organization.TYPE_WORK,1
 0,Android.Provider.PhoneDataKind,Custom,,0
-5,Android.Provider.PhoneDataKind,Assistant,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_ASSISTANT,19
-5,Android.Provider.PhoneDataKind,Callback,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_CALLBACK,8
-5,Android.Provider.PhoneDataKind,Car,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_CAR,9
-5,Android.Provider.PhoneDataKind,CompanyMain,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_COMPANY_MAIN,10
-5,Android.Provider.PhoneDataKind,FaxHome,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_FAX_HOME,5
-5,Android.Provider.PhoneDataKind,FaxWork,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_FAX_WORK,4
-5,Android.Provider.PhoneDataKind,Home,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_HOME,1
-5,Android.Provider.PhoneDataKind,Isdn,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_ISDN,11
-5,Android.Provider.PhoneDataKind,Main,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_MAIN,12
-5,Android.Provider.PhoneDataKind,Mms,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_MMS,20
-5,Android.Provider.PhoneDataKind,Mobile,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_MOBILE,2
-5,Android.Provider.PhoneDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_OTHER,7
-5,Android.Provider.PhoneDataKind,OtherFax,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_OTHER_FAX,13
-5,Android.Provider.PhoneDataKind,Pager,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_PAGER,6
-5,Android.Provider.PhoneDataKind,Radio,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_RADIO,14
-5,Android.Provider.PhoneDataKind,Telex,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_TELEX,15
-5,Android.Provider.PhoneDataKind,TtyTdd,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_TTY_TDD,16
-5,Android.Provider.PhoneDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_WORK,3
-5,Android.Provider.PhoneDataKind,WorkMobile,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_WORK_MOBILE,17
-5,Android.Provider.PhoneDataKind,WorkPager,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_WORK_PAGER,18
+10,Android.Provider.PhoneDataKind,Assistant,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_ASSISTANT,19
+10,Android.Provider.PhoneDataKind,Callback,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_CALLBACK,8
+10,Android.Provider.PhoneDataKind,Car,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_CAR,9
+10,Android.Provider.PhoneDataKind,CompanyMain,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_COMPANY_MAIN,10
+10,Android.Provider.PhoneDataKind,FaxHome,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_FAX_HOME,5
+10,Android.Provider.PhoneDataKind,FaxWork,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_FAX_WORK,4
+10,Android.Provider.PhoneDataKind,Home,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_HOME,1
+10,Android.Provider.PhoneDataKind,Isdn,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_ISDN,11
+10,Android.Provider.PhoneDataKind,Main,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_MAIN,12
+10,Android.Provider.PhoneDataKind,Mms,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_MMS,20
+10,Android.Provider.PhoneDataKind,Mobile,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_MOBILE,2
+10,Android.Provider.PhoneDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_OTHER,7
+10,Android.Provider.PhoneDataKind,OtherFax,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_OTHER_FAX,13
+10,Android.Provider.PhoneDataKind,Pager,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_PAGER,6
+10,Android.Provider.PhoneDataKind,Radio,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_RADIO,14
+10,Android.Provider.PhoneDataKind,Telex,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_TELEX,15
+10,Android.Provider.PhoneDataKind,TtyTdd,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_TTY_TDD,16
+10,Android.Provider.PhoneDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_WORK,3
+10,Android.Provider.PhoneDataKind,WorkMobile,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_WORK_MOBILE,17
+10,Android.Provider.PhoneDataKind,WorkPager,android/provider/ContactsContract$CommonDataKinds$Phone.TYPE_WORK_PAGER,18
 0,Android.Provider.RelationDataKind,Custom,,0
-5,Android.Provider.RelationDataKind,Assistant,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_ASSISTANT,1
-5,Android.Provider.RelationDataKind,Brother,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_BROTHER,2
-5,Android.Provider.RelationDataKind,Child,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_CHILD,3
-5,Android.Provider.RelationDataKind,DomesticPartner,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_DOMESTIC_PARTNER,4
-5,Android.Provider.RelationDataKind,Father,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_FATHER,5
-5,Android.Provider.RelationDataKind,Friend,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_FRIEND,6
-5,Android.Provider.RelationDataKind,Manager,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_MANAGER,7
-5,Android.Provider.RelationDataKind,Mother,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_MOTHER,8
-5,Android.Provider.RelationDataKind,Parent,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_PARENT,9
-5,Android.Provider.RelationDataKind,Partner,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_PARTNER,10
-5,Android.Provider.RelationDataKind,ReferredBy,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_REFERRED_BY,11
-5,Android.Provider.RelationDataKind,Relative,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_RELATIVE,12
-5,Android.Provider.RelationDataKind,Sister,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_SISTER,13
-5,Android.Provider.RelationDataKind,Spouse,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_SPOUSE,14
+10,Android.Provider.RelationDataKind,Assistant,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_ASSISTANT,1
+10,Android.Provider.RelationDataKind,Brother,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_BROTHER,2
+10,Android.Provider.RelationDataKind,Child,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_CHILD,3
+10,Android.Provider.RelationDataKind,DomesticPartner,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_DOMESTIC_PARTNER,4
+10,Android.Provider.RelationDataKind,Father,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_FATHER,5
+10,Android.Provider.RelationDataKind,Friend,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_FRIEND,6
+10,Android.Provider.RelationDataKind,Manager,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_MANAGER,7
+10,Android.Provider.RelationDataKind,Mother,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_MOTHER,8
+10,Android.Provider.RelationDataKind,Parent,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_PARENT,9
+10,Android.Provider.RelationDataKind,Partner,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_PARTNER,10
+10,Android.Provider.RelationDataKind,ReferredBy,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_REFERRED_BY,11
+10,Android.Provider.RelationDataKind,Relative,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_RELATIVE,12
+10,Android.Provider.RelationDataKind,Sister,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_SISTER,13
+10,Android.Provider.RelationDataKind,Spouse,android/provider/ContactsContract$CommonDataKinds$Relation.TYPE_SPOUSE,14
 0,Android.Provider.AddressDataKind,Custom,,0
-5,Android.Provider.AddressDataKind,Home,android/provider/ContactsContract$CommonDataKinds$StructuredPostal.TYPE_HOME,1
-5,Android.Provider.AddressDataKind,Other,android/provider/ContactsContract$CommonDataKinds$StructuredPostal.TYPE_OTHER,3
-5,Android.Provider.AddressDataKind,Work,android/provider/ContactsContract$CommonDataKinds$StructuredPostal.TYPE_WORK,2
+10,Android.Provider.AddressDataKind,Home,android/provider/ContactsContract$CommonDataKinds$StructuredPostal.TYPE_HOME,1
+10,Android.Provider.AddressDataKind,Other,android/provider/ContactsContract$CommonDataKinds$StructuredPostal.TYPE_OTHER,3
+10,Android.Provider.AddressDataKind,Work,android/provider/ContactsContract$CommonDataKinds$StructuredPostal.TYPE_WORK,2
 0,Android.Provider.WebsiteDataKind,Custom,,0
-5,Android.Provider.WebsiteDataKind,Blog,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_BLOG,2
-5,Android.Provider.WebsiteDataKind,Ftp,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_FTP,6
-5,Android.Provider.WebsiteDataKind,Home,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_HOME,4
-5,Android.Provider.WebsiteDataKind,Homepage,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_HOMEPAGE,1
-5,Android.Provider.WebsiteDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_OTHER,7
-5,Android.Provider.WebsiteDataKind,Profile,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_PROFILE,3
-5,Android.Provider.WebsiteDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_WORK,5
-5,Android.Provider.QuickContactMode,Large,android/provider/ContactsContract$QuickContact.MODE_LARGE,3
-5,Android.Provider.QuickContactMode,Medium,android/provider/ContactsContract$QuickContact.MODE_MEDIUM,2
-5,Android.Provider.QuickContactMode,Small,android/provider/ContactsContract$QuickContact.MODE_SMALL,1
-5,Android.Provider.AggregationMode,Default,android/provider/ContactsContract$RawContacts.AGGREGATION_MODE_DEFAULT,0
-5,Android.Provider.AggregationMode,Disabled,android/provider/ContactsContract$RawContacts.AGGREGATION_MODE_DISABLED,3
-5,Android.Provider.AggregationMode,Immediate,android/provider/ContactsContract$RawContacts.AGGREGATION_MODE_IMMEDIATE,1
-5,Android.Provider.AggregationMode,Suspended,android/provider/ContactsContract$RawContacts.AGGREGATION_MODE_SUSPENDED,2
+10,Android.Provider.WebsiteDataKind,Blog,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_BLOG,2
+10,Android.Provider.WebsiteDataKind,Ftp,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_FTP,6
+10,Android.Provider.WebsiteDataKind,Home,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_HOME,4
+10,Android.Provider.WebsiteDataKind,Homepage,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_HOMEPAGE,1
+10,Android.Provider.WebsiteDataKind,Other,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_OTHER,7
+10,Android.Provider.WebsiteDataKind,Profile,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_PROFILE,3
+10,Android.Provider.WebsiteDataKind,Work,android/provider/ContactsContract$CommonDataKinds$Website.TYPE_WORK,5
+10,Android.Provider.QuickContactMode,Large,android/provider/ContactsContract$QuickContact.MODE_LARGE,3
+10,Android.Provider.QuickContactMode,Medium,android/provider/ContactsContract$QuickContact.MODE_MEDIUM,2
+10,Android.Provider.QuickContactMode,Small,android/provider/ContactsContract$QuickContact.MODE_SMALL,1
+10,Android.Provider.AggregationMode,Default,android/provider/ContactsContract$RawContacts.AGGREGATION_MODE_DEFAULT,0
+10,Android.Provider.AggregationMode,Disabled,android/provider/ContactsContract$RawContacts.AGGREGATION_MODE_DISABLED,3
+10,Android.Provider.AggregationMode,Immediate,android/provider/ContactsContract$RawContacts.AGGREGATION_MODE_IMMEDIATE,1
+10,Android.Provider.AggregationMode,Suspended,android/provider/ContactsContract$RawContacts.AGGREGATION_MODE_SUSPENDED,2
 26,Android.Provider.FontResultCode,FontNotFound,android/provider/FontsContract.Columns.RESULT_CODE_FONT_NOT_FOUND,1
 26,Android.Provider.FontResultCode,FontUnavailable,android/provider/FontsContract.Columns.RESULT_CODE_FONT_UNAVAILABLE,2
 26,Android.Provider.FontResultCode,MalformedQuery,android/provider/FontsContract.Columns.RESULT_CODE_MALFORMED_QUERY,3
@@ -1703,18 +1663,18 @@
 26,Android.Provider.FontRequestFailureReason,MalformedQuery,android/provider/FontsContract.FontRequestCallback.FAIL_REASON_MALFORMED_QUERY,3
 26,Android.Provider.FontRequestFailureReason,ProviderNotFound,android/provider/FontsContract.FontRequestCallback.FAIL_REASON_PROVIDER_NOT_FOUND,-1
 26,Android.Provider.FontRequestFailureReason,WrongCertificates,android/provider/FontsContract.FontRequestCallback.FAIL_REASON_WRONG_CERTIFICATES,-2
-3,Android.Provider.DisplayMode,Grid,android/provider/LiveFolders.DISPLAY_MODE_GRID,1
-3,Android.Provider.DisplayMode,List,android/provider/LiveFolders.DISPLAY_MODE_LIST,2
-1,Android.Provider.ThumbnailKind,FullScreenKind,android/provider/MediaStore$Images$Thumbnails.FULL_SCREEN_KIND,2
-1,Android.Provider.ThumbnailKind,MicroKind,android/provider/MediaStore$Images$Thumbnails.MICRO_KIND,3
-1,Android.Provider.ThumbnailKind,MiniKind,android/provider/MediaStore$Images$Thumbnails.MINI_KIND,1
-11,Android.Renderscripts.AllocationUsage,GraphicsConstants,android/renderscript/Allocation.USAGE_GRAPHICS_CONSTANTS,8
-14,Android.Renderscripts.AllocationUsage,GraphicsRenderTarget,android/renderscript/Allocation.USAGE_GRAPHICS_RENDER_TARGET,16
-11,Android.Renderscripts.AllocationUsage,GraphicsTexture,android/renderscript/Allocation.USAGE_GRAPHICS_TEXTURE,2
-11,Android.Renderscripts.AllocationUsage,GraphicsVertex,android/renderscript/Allocation.USAGE_GRAPHICS_VERTEX,4
+10,Android.Provider.DisplayMode,Grid,android/provider/LiveFolders.DISPLAY_MODE_GRID,1
+10,Android.Provider.DisplayMode,List,android/provider/LiveFolders.DISPLAY_MODE_LIST,2
+10,Android.Provider.ThumbnailKind,FullScreenKind,android/provider/MediaStore$Images$Thumbnails.FULL_SCREEN_KIND,2
+10,Android.Provider.ThumbnailKind,MicroKind,android/provider/MediaStore$Images$Thumbnails.MICRO_KIND,3
+10,Android.Provider.ThumbnailKind,MiniKind,android/provider/MediaStore$Images$Thumbnails.MINI_KIND,1
+15,Android.Renderscripts.AllocationUsage,GraphicsConstants,android/renderscript/Allocation.USAGE_GRAPHICS_CONSTANTS,8
+15,Android.Renderscripts.AllocationUsage,GraphicsRenderTarget,android/renderscript/Allocation.USAGE_GRAPHICS_RENDER_TARGET,16
+15,Android.Renderscripts.AllocationUsage,GraphicsTexture,android/renderscript/Allocation.USAGE_GRAPHICS_TEXTURE,2
+15,Android.Renderscripts.AllocationUsage,GraphicsVertex,android/renderscript/Allocation.USAGE_GRAPHICS_VERTEX,4
 16,Android.Renderscripts.AllocationUsage,IoInput,android/renderscript/Allocation.USAGE_IO_INPUT,32
 16,Android.Renderscripts.AllocationUsage,IoOutput,android/renderscript/Allocation.USAGE_IO_OUTPUT,64
-11,Android.Renderscripts.AllocationUsage,Script,android/renderscript/Allocation.USAGE_SCRIPT,1
+15,Android.Renderscripts.AllocationUsage,Script,android/renderscript/Allocation.USAGE_SCRIPT,1
 18,Android.Renderscripts.AllocationUsage,Shared,android/renderscript/Allocation.USAGE_SHARED,128
 21,Android.Renderscripts.CreateFlag,LowLatency,android/renderscript/RenderScript.CREATE_FLAG_LOW_LATENCY,2
 21,Android.Renderscripts.CreateFlag,LowPower,android/renderscript/RenderScript.CREATE_FLAG_LOW_POWER,4
@@ -1791,77 +1751,80 @@
 21,Android.Telephony.MmsError,Retry,android/telephony/SmsManager.MMS_ERROR_RETRY,6
 21,Android.Telephony.MmsError,UnableConnectMms,android/telephony/SmsManager.MMS_ERROR_UNABLE_CONNECT_MMS,3
 21,Android.Telephony.MmsError,Unspecified,android/telephony/SmsManager.MMS_ERROR_UNSPECIFIED,1
-4,Android.Telephony.SmsResultError,GenericFailure,android/telephony/SmsManager.RESULT_ERROR_GENERIC_FAILURE,1
-4,Android.Telephony.SmsResultError,NoService,android/telephony/SmsManager.RESULT_ERROR_NO_SERVICE,4
-4,Android.Telephony.SmsResultError,NullPdu,android/telephony/SmsManager.RESULT_ERROR_NULL_PDU,3
-4,Android.Telephony.SmsResultError,RadioOff,android/telephony/SmsManager.RESULT_ERROR_RADIO_OFF,2
-4,Android.Telephony.SmsStatus,Free,android/telephony/SmsManager.STATUS_ON_ICC_FREE,0
-4,Android.Telephony.SmsStatus,Read,android/telephony/SmsManager.STATUS_ON_ICC_READ,1
-4,Android.Telephony.SmsStatus,Sent,android/telephony/SmsManager.STATUS_ON_ICC_SENT,5
-4,Android.Telephony.SmsStatus,Unread,android/telephony/SmsManager.STATUS_ON_ICC_UNREAD,3
-4,Android.Telephony.SmsStatus,Unsent,android/telephony/SmsManager.STATUS_ON_ICC_UNSENT,7
+10,Android.Telephony.SmsResultError,GenericFailure,android/telephony/SmsManager.RESULT_ERROR_GENERIC_FAILURE,1
+27,Android.Telephony.SmsResultError,LimitExceeded,android/telephony/SmsManager.RESULT_ERROR_LIMIT_EXCEEDED,5
+10,Android.Telephony.SmsResultError,NoService,android/telephony/SmsManager.RESULT_ERROR_NO_SERVICE,4
+10,Android.Telephony.SmsResultError,NullPdu,android/telephony/SmsManager.RESULT_ERROR_NULL_PDU,3
+10,Android.Telephony.SmsResultError,RadioOff,android/telephony/SmsManager.RESULT_ERROR_RADIO_OFF,2
+27,Android.Telephony.SmsResultError,ShortCodeNeverAllowed,android/telephony/SmsManager.RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED,8
+27,Android.Telephony.SmsResultError,ShortCodeNotAllowed,android/telephony/SmsManager.RESULT_ERROR_SHORT_CODE_NOT_ALLOWED,7
+10,Android.Telephony.SmsStatus,Free,android/telephony/SmsManager.STATUS_ON_ICC_FREE,0
+10,Android.Telephony.SmsStatus,Read,android/telephony/SmsManager.STATUS_ON_ICC_READ,1
+10,Android.Telephony.SmsStatus,Sent,android/telephony/SmsManager.STATUS_ON_ICC_SENT,5
+10,Android.Telephony.SmsStatus,Unread,android/telephony/SmsManager.STATUS_ON_ICC_UNREAD,3
+10,Android.Telephony.SmsStatus,Unsent,android/telephony/SmsManager.STATUS_ON_ICC_UNSENT,7
 22,Android.Telephony.DataRoamingMode,Disable,android/telephony/SubscriptionManager.DATA_ROAMING_DISABLE,0
 22,Android.Telephony.DataRoamingMode,Enable,android/telephony/SubscriptionManager.DATA_ROAMING_ENABLE,1
-4,Android.Telephony.NetworkType,OneXrtt,android/telephony/TelephonyManager.NETWORK_TYPE_1xRTT,7
-4,Android.Telephony.NetworkType,Cdma,android/telephony/TelephonyManager.NETWORK_TYPE_CDMA,4
-1,Android.Telephony.NetworkType,Edge,android/telephony/TelephonyManager.NETWORK_TYPE_EDGE,2
-11,Android.Telephony.NetworkType,Ehrpd,android/telephony/TelephonyManager.NETWORK_TYPE_EHRPD,14
-4,Android.Telephony.NetworkType,Evdo0,android/telephony/TelephonyManager.NETWORK_TYPE_EVDO_0,5
-4,Android.Telephony.NetworkType,EvdoA,android/telephony/TelephonyManager.NETWORK_TYPE_EVDO_A,6
-9,Android.Telephony.NetworkType,EvdoB,android/telephony/TelephonyManager.NETWORK_TYPE_EVDO_B,12
-1,Android.Telephony.NetworkType,Gprs,android/telephony/TelephonyManager.NETWORK_TYPE_GPRS,1
+10,Android.Telephony.NetworkType,OneXrtt,android/telephony/TelephonyManager.NETWORK_TYPE_1xRTT,7
+10,Android.Telephony.NetworkType,Cdma,android/telephony/TelephonyManager.NETWORK_TYPE_CDMA,4
+10,Android.Telephony.NetworkType,Edge,android/telephony/TelephonyManager.NETWORK_TYPE_EDGE,2
+15,Android.Telephony.NetworkType,Ehrpd,android/telephony/TelephonyManager.NETWORK_TYPE_EHRPD,14
+10,Android.Telephony.NetworkType,Evdo0,android/telephony/TelephonyManager.NETWORK_TYPE_EVDO_0,5
+10,Android.Telephony.NetworkType,EvdoA,android/telephony/TelephonyManager.NETWORK_TYPE_EVDO_A,6
+10,Android.Telephony.NetworkType,EvdoB,android/telephony/TelephonyManager.NETWORK_TYPE_EVDO_B,12
+10,Android.Telephony.NetworkType,Gprs,android/telephony/TelephonyManager.NETWORK_TYPE_GPRS,1
 25,Android.Telephony.NetworkType,Gsm,android/telephony/TelephonyManager.NETWORK_TYPE_GSM,16
-5,Android.Telephony.NetworkType,Hsdpa,android/telephony/TelephonyManager.NETWORK_TYPE_HSDPA,8
-5,Android.Telephony.NetworkType,Hspa,android/telephony/TelephonyManager.NETWORK_TYPE_HSPA,10
-13,Android.Telephony.NetworkType,Hspap,android/telephony/TelephonyManager.NETWORK_TYPE_HSPAP,15
-5,Android.Telephony.NetworkType,Hsupa,android/telephony/TelephonyManager.NETWORK_TYPE_HSUPA,9
-8,Android.Telephony.NetworkType,Iden,android/telephony/TelephonyManager.NETWORK_TYPE_IDEN,11
+10,Android.Telephony.NetworkType,Hsdpa,android/telephony/TelephonyManager.NETWORK_TYPE_HSDPA,8
+10,Android.Telephony.NetworkType,Hspa,android/telephony/TelephonyManager.NETWORK_TYPE_HSPA,10
+15,Android.Telephony.NetworkType,Hspap,android/telephony/TelephonyManager.NETWORK_TYPE_HSPAP,15
+10,Android.Telephony.NetworkType,Hsupa,android/telephony/TelephonyManager.NETWORK_TYPE_HSUPA,9
+10,Android.Telephony.NetworkType,Iden,android/telephony/TelephonyManager.NETWORK_TYPE_IDEN,11
 25,Android.Telephony.NetworkType,Iwlan,android/telephony/TelephonyManager.NETWORK_TYPE_IWLAN,18
-11,Android.Telephony.NetworkType,Lte,android/telephony/TelephonyManager.NETWORK_TYPE_LTE,13
+15,Android.Telephony.NetworkType,Lte,android/telephony/TelephonyManager.NETWORK_TYPE_LTE,13
 25,Android.Telephony.NetworkType,TdScdma,android/telephony/TelephonyManager.NETWORK_TYPE_TD_SCDMA,17
-1,Android.Telephony.NetworkType,Umts,android/telephony/TelephonyManager.NETWORK_TYPE_UMTS,3
-1,Android.Telephony.NetworkType,Unknown,android/telephony/TelephonyManager.NETWORK_TYPE_UNKNOWN,0
-3,Android.Text.InputTypes,ClassDatetime,I:android/text/InputType.TYPE_CLASS_DATETIME,4
-3,Android.Text.InputTypes,ClassNumber,I:android/text/InputType.TYPE_CLASS_NUMBER,2
-3,Android.Text.InputTypes,ClassPhone,I:android/text/InputType.TYPE_CLASS_PHONE,3
-3,Android.Text.InputTypes,ClassText,I:android/text/InputType.TYPE_CLASS_TEXT,1
-3,Android.Text.InputTypes,DatetimeVariationDate,I:android/text/InputType.TYPE_DATETIME_VARIATION_DATE,16
-3,Android.Text.InputTypes,DatetimeVariationNormal,I:android/text/InputType.TYPE_DATETIME_VARIATION_NORMAL,0
-3,Android.Text.InputTypes,DatetimeVariationTime,I:android/text/InputType.TYPE_DATETIME_VARIATION_TIME,32
-3,Android.Text.InputTypes,MaskClass,I:android/text/InputType.TYPE_MASK_CLASS,15
-3,Android.Text.InputTypes,MaskFlags,I:android/text/InputType.TYPE_MASK_FLAGS,16773120
-3,Android.Text.InputTypes,MaskVariation,I:android/text/InputType.TYPE_MASK_VARIATION,4080
-3,Android.Text.InputTypes,Null,I:android/text/InputType.TYPE_NULL,0
-3,Android.Text.InputTypes,NumberFlagDecimal,I:android/text/InputType.TYPE_NUMBER_FLAG_DECIMAL,8192
-3,Android.Text.InputTypes,NumberFlagSigned,I:android/text/InputType.TYPE_NUMBER_FLAG_SIGNED,4096
-11,Android.Text.InputTypes,NumberVariationNormal,I:android/text/InputType.TYPE_NUMBER_VARIATION_NORMAL,0
-11,Android.Text.InputTypes,NumberVariationPassword,I:android/text/InputType.TYPE_NUMBER_VARIATION_PASSWORD,16
-3,Android.Text.InputTypes,TextFlagAutoComplete,I:android/text/InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE,65536
-3,Android.Text.InputTypes,TextFlagAutoCorrect,I:android/text/InputType.TYPE_TEXT_FLAG_AUTO_CORRECT,32768
-3,Android.Text.InputTypes,TextFlagCapCharacters,I:android/text/InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS,4096
-3,Android.Text.InputTypes,TextFlagCapSentences,I:android/text/InputType.TYPE_TEXT_FLAG_CAP_SENTENCES,16384
-3,Android.Text.InputTypes,TextFlagCapWords,I:android/text/InputType.TYPE_TEXT_FLAG_CAP_WORDS,8192
-3,Android.Text.InputTypes,TextFlagImeMultiLine,I:android/text/InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE,262144
-3,Android.Text.InputTypes,TextFlagMultiLine,I:android/text/InputType.TYPE_TEXT_FLAG_MULTI_LINE,131072
-5,Android.Text.InputTypes,TextFlagNoSuggestions,I:android/text/InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS,524288
-3,Android.Text.InputTypes,TextVariationEmailAddress,I:android/text/InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS,32
-3,Android.Text.InputTypes,TextVariationEmailSubject,I:android/text/InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT,48
-3,Android.Text.InputTypes,TextVariationFilter,I:android/text/InputType.TYPE_TEXT_VARIATION_FILTER,176
-3,Android.Text.InputTypes,TextVariationLongMessage,I:android/text/InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE,80
-3,Android.Text.InputTypes,TextVariationNormal,I:android/text/InputType.TYPE_TEXT_VARIATION_NORMAL,0
-3,Android.Text.InputTypes,TextVariationPassword,I:android/text/InputType.TYPE_TEXT_VARIATION_PASSWORD,128
-3,Android.Text.InputTypes,TextVariationPersonName,I:android/text/InputType.TYPE_TEXT_VARIATION_PERSON_NAME,96
-3,Android.Text.InputTypes,TextVariationPhonetic,I:android/text/InputType.TYPE_TEXT_VARIATION_PHONETIC,192
-3,Android.Text.InputTypes,TextVariationPostalAddress,I:android/text/InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS,112
-3,Android.Text.InputTypes,TextVariationShortMessage,I:android/text/InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE,64
-3,Android.Text.InputTypes,TextVariationUri,I:android/text/InputType.TYPE_TEXT_VARIATION_URI,16
-3,Android.Text.InputTypes,TextVariationVisiblePassword,I:android/text/InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,144
-3,Android.Text.InputTypes,TextVariationWebEditText,I:android/text/InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT,160
-11,Android.Text.InputTypes,TextVariationWebEmailAddress,I:android/text/InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS,208
-11,Android.Text.InputTypes,TextVariationWebPassword,I:android/text/InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD,224
-3,Android.Text.CapitalizationMode,Characters,android/text/TextUtils.CAP_MODE_CHARACTERS,4096
-3,Android.Text.CapitalizationMode,Sentences,android/text/TextUtils.CAP_MODE_SENTENCES,16384
-3,Android.Text.CapitalizationMode,Words,android/text/TextUtils.CAP_MODE_WORDS,8192
+10,Android.Telephony.NetworkType,Umts,android/telephony/TelephonyManager.NETWORK_TYPE_UMTS,3
+10,Android.Telephony.NetworkType,Unknown,android/telephony/TelephonyManager.NETWORK_TYPE_UNKNOWN,0
+10,Android.Text.InputTypes,ClassDatetime,I:android/text/InputType.TYPE_CLASS_DATETIME,4
+10,Android.Text.InputTypes,ClassNumber,I:android/text/InputType.TYPE_CLASS_NUMBER,2
+10,Android.Text.InputTypes,ClassPhone,I:android/text/InputType.TYPE_CLASS_PHONE,3
+10,Android.Text.InputTypes,ClassText,I:android/text/InputType.TYPE_CLASS_TEXT,1
+10,Android.Text.InputTypes,DatetimeVariationDate,I:android/text/InputType.TYPE_DATETIME_VARIATION_DATE,16
+10,Android.Text.InputTypes,DatetimeVariationNormal,I:android/text/InputType.TYPE_DATETIME_VARIATION_NORMAL,0
+10,Android.Text.InputTypes,DatetimeVariationTime,I:android/text/InputType.TYPE_DATETIME_VARIATION_TIME,32
+10,Android.Text.InputTypes,MaskClass,I:android/text/InputType.TYPE_MASK_CLASS,15
+10,Android.Text.InputTypes,MaskFlags,I:android/text/InputType.TYPE_MASK_FLAGS,16773120
+10,Android.Text.InputTypes,MaskVariation,I:android/text/InputType.TYPE_MASK_VARIATION,4080
+10,Android.Text.InputTypes,Null,I:android/text/InputType.TYPE_NULL,0
+10,Android.Text.InputTypes,NumberFlagDecimal,I:android/text/InputType.TYPE_NUMBER_FLAG_DECIMAL,8192
+10,Android.Text.InputTypes,NumberFlagSigned,I:android/text/InputType.TYPE_NUMBER_FLAG_SIGNED,4096
+15,Android.Text.InputTypes,NumberVariationNormal,I:android/text/InputType.TYPE_NUMBER_VARIATION_NORMAL,0
+15,Android.Text.InputTypes,NumberVariationPassword,I:android/text/InputType.TYPE_NUMBER_VARIATION_PASSWORD,16
+10,Android.Text.InputTypes,TextFlagAutoComplete,I:android/text/InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE,65536
+10,Android.Text.InputTypes,TextFlagAutoCorrect,I:android/text/InputType.TYPE_TEXT_FLAG_AUTO_CORRECT,32768
+10,Android.Text.InputTypes,TextFlagCapCharacters,I:android/text/InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS,4096
+10,Android.Text.InputTypes,TextFlagCapSentences,I:android/text/InputType.TYPE_TEXT_FLAG_CAP_SENTENCES,16384
+10,Android.Text.InputTypes,TextFlagCapWords,I:android/text/InputType.TYPE_TEXT_FLAG_CAP_WORDS,8192
+10,Android.Text.InputTypes,TextFlagImeMultiLine,I:android/text/InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE,262144
+10,Android.Text.InputTypes,TextFlagMultiLine,I:android/text/InputType.TYPE_TEXT_FLAG_MULTI_LINE,131072
+10,Android.Text.InputTypes,TextFlagNoSuggestions,I:android/text/InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS,524288
+10,Android.Text.InputTypes,TextVariationEmailAddress,I:android/text/InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS,32
+10,Android.Text.InputTypes,TextVariationEmailSubject,I:android/text/InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT,48
+10,Android.Text.InputTypes,TextVariationFilter,I:android/text/InputType.TYPE_TEXT_VARIATION_FILTER,176
+10,Android.Text.InputTypes,TextVariationLongMessage,I:android/text/InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE,80
+10,Android.Text.InputTypes,TextVariationNormal,I:android/text/InputType.TYPE_TEXT_VARIATION_NORMAL,0
+10,Android.Text.InputTypes,TextVariationPassword,I:android/text/InputType.TYPE_TEXT_VARIATION_PASSWORD,128
+10,Android.Text.InputTypes,TextVariationPersonName,I:android/text/InputType.TYPE_TEXT_VARIATION_PERSON_NAME,96
+10,Android.Text.InputTypes,TextVariationPhonetic,I:android/text/InputType.TYPE_TEXT_VARIATION_PHONETIC,192
+10,Android.Text.InputTypes,TextVariationPostalAddress,I:android/text/InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS,112
+10,Android.Text.InputTypes,TextVariationShortMessage,I:android/text/InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE,64
+10,Android.Text.InputTypes,TextVariationUri,I:android/text/InputType.TYPE_TEXT_VARIATION_URI,16
+10,Android.Text.InputTypes,TextVariationVisiblePassword,I:android/text/InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,144
+10,Android.Text.InputTypes,TextVariationWebEditText,I:android/text/InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT,160
+15,Android.Text.InputTypes,TextVariationWebEmailAddress,I:android/text/InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS,208
+15,Android.Text.InputTypes,TextVariationWebPassword,I:android/text/InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD,224
+10,Android.Text.CapitalizationMode,Characters,android/text/TextUtils.CAP_MODE_CHARACTERS,4096
+10,Android.Text.CapitalizationMode,Sentences,android/text/TextUtils.CAP_MODE_SENTENCES,16384
+10,Android.Text.CapitalizationMode,Words,android/text/TextUtils.CAP_MODE_WORDS,8192
 21,Android.Text.Style.TtsSpanMonth,April,android/text/style/TtsSpan.MONTH_APRIL,3
 21,Android.Text.Style.TtsSpanMonth,August,android/text/style/TtsSpan.MONTH_AUGUST,7
 21,Android.Text.Style.TtsSpanMonth,December,android/text/style/TtsSpan.MONTH_DECEMBER,11
@@ -1883,331 +1846,331 @@
 21,Android.Text.Style.TtsSpanWeekday,Wednesday,android/text/style/TtsSpan.WEEKDAY_WEDNESDAY,4
 21,Android.Transitions.VisibilityMode,In,android/transition/Visibility.MODE_IN,1
 21,Android.Transitions.VisibilityMode,Out,android/transition/Visibility.MODE_OUT,2
-1,Android.Util.ComplexUnitType,Dip,android/util/TypedValue.COMPLEX_UNIT_DIP,1
-1,Android.Util.ComplexUnitType,Fraction,android/util/TypedValue.COMPLEX_UNIT_FRACTION,0
-1,Android.Util.ComplexUnitType,FractionParent,android/util/TypedValue.COMPLEX_UNIT_FRACTION_PARENT,1
-1,Android.Util.ComplexUnitType,In,android/util/TypedValue.COMPLEX_UNIT_IN,4
-1,Android.Util.ComplexUnitType,Mask,android/util/TypedValue.COMPLEX_UNIT_MASK,15
-1,Android.Util.ComplexUnitType,Mm,android/util/TypedValue.COMPLEX_UNIT_MM,5
-1,Android.Util.ComplexUnitType,Pt,android/util/TypedValue.COMPLEX_UNIT_PT,3
-1,Android.Util.ComplexUnitType,Px,android/util/TypedValue.COMPLEX_UNIT_PX,0
-1,Android.Util.ComplexUnitType,Shift,android/util/TypedValue.COMPLEX_UNIT_SHIFT,0
-1,Android.Util.ComplexUnitType,Sp,android/util/TypedValue.COMPLEX_UNIT_SP,2
-1,Android.Util.DataType,Attribute,android/util/TypedValue.TYPE_ATTRIBUTE,2
-1,Android.Util.DataType,Dimension,android/util/TypedValue.TYPE_DIMENSION,5
-1,Android.Util.DataType,FirstColorInt,android/util/TypedValue.TYPE_FIRST_COLOR_INT,28
-1,Android.Util.DataType,FirstInt,android/util/TypedValue.TYPE_FIRST_INT,16
-1,Android.Util.DataType,Float,android/util/TypedValue.TYPE_FLOAT,4
-1,Android.Util.DataType,Fraction,android/util/TypedValue.TYPE_FRACTION,6
-1,Android.Util.DataType,IntBoolean,android/util/TypedValue.TYPE_INT_BOOLEAN,18
-1,Android.Util.DataType,IntColorArgb4,android/util/TypedValue.TYPE_INT_COLOR_ARGB4,30
-1,Android.Util.DataType,IntColorArgb8,android/util/TypedValue.TYPE_INT_COLOR_ARGB8,28
-1,Android.Util.DataType,IntColorRgb4,android/util/TypedValue.TYPE_INT_COLOR_RGB4,31
-1,Android.Util.DataType,IntColorRgb8,android/util/TypedValue.TYPE_INT_COLOR_RGB8,29
-1,Android.Util.DataType,IntDec,android/util/TypedValue.TYPE_INT_DEC,16
-1,Android.Util.DataType,IntHex,android/util/TypedValue.TYPE_INT_HEX,17
-1,Android.Util.DataType,LastColorInt,android/util/TypedValue.TYPE_LAST_COLOR_INT,31
-1,Android.Util.DataType,LastInt,android/util/TypedValue.TYPE_LAST_INT,31
-1,Android.Util.DataType,Null,android/util/TypedValue.TYPE_NULL,0
-1,Android.Util.DataType,Reference,android/util/TypedValue.TYPE_REFERENCE,1
-1,Android.Util.DataType,String,android/util/TypedValue.TYPE_STRING,3
+10,Android.Util.ComplexUnitType,Dip,android/util/TypedValue.COMPLEX_UNIT_DIP,1
+10,Android.Util.ComplexUnitType,Fraction,android/util/TypedValue.COMPLEX_UNIT_FRACTION,0
+10,Android.Util.ComplexUnitType,FractionParent,android/util/TypedValue.COMPLEX_UNIT_FRACTION_PARENT,1
+10,Android.Util.ComplexUnitType,In,android/util/TypedValue.COMPLEX_UNIT_IN,4
+10,Android.Util.ComplexUnitType,Mask,android/util/TypedValue.COMPLEX_UNIT_MASK,15
+10,Android.Util.ComplexUnitType,Mm,android/util/TypedValue.COMPLEX_UNIT_MM,5
+10,Android.Util.ComplexUnitType,Pt,android/util/TypedValue.COMPLEX_UNIT_PT,3
+10,Android.Util.ComplexUnitType,Px,android/util/TypedValue.COMPLEX_UNIT_PX,0
+10,Android.Util.ComplexUnitType,Shift,android/util/TypedValue.COMPLEX_UNIT_SHIFT,0
+10,Android.Util.ComplexUnitType,Sp,android/util/TypedValue.COMPLEX_UNIT_SP,2
+10,Android.Util.DataType,Attribute,android/util/TypedValue.TYPE_ATTRIBUTE,2
+10,Android.Util.DataType,Dimension,android/util/TypedValue.TYPE_DIMENSION,5
+10,Android.Util.DataType,FirstColorInt,android/util/TypedValue.TYPE_FIRST_COLOR_INT,28
+10,Android.Util.DataType,FirstInt,android/util/TypedValue.TYPE_FIRST_INT,16
+10,Android.Util.DataType,Float,android/util/TypedValue.TYPE_FLOAT,4
+10,Android.Util.DataType,Fraction,android/util/TypedValue.TYPE_FRACTION,6
+10,Android.Util.DataType,IntBoolean,android/util/TypedValue.TYPE_INT_BOOLEAN,18
+10,Android.Util.DataType,IntColorArgb4,android/util/TypedValue.TYPE_INT_COLOR_ARGB4,30
+10,Android.Util.DataType,IntColorArgb8,android/util/TypedValue.TYPE_INT_COLOR_ARGB8,28
+10,Android.Util.DataType,IntColorRgb4,android/util/TypedValue.TYPE_INT_COLOR_RGB4,31
+10,Android.Util.DataType,IntColorRgb8,android/util/TypedValue.TYPE_INT_COLOR_RGB8,29
+10,Android.Util.DataType,IntDec,android/util/TypedValue.TYPE_INT_DEC,16
+10,Android.Util.DataType,IntHex,android/util/TypedValue.TYPE_INT_HEX,17
+10,Android.Util.DataType,LastColorInt,android/util/TypedValue.TYPE_LAST_COLOR_INT,31
+10,Android.Util.DataType,LastInt,android/util/TypedValue.TYPE_LAST_INT,31
+10,Android.Util.DataType,Null,android/util/TypedValue.TYPE_NULL,0
+10,Android.Util.DataType,Reference,android/util/TypedValue.TYPE_REFERENCE,1
+10,Android.Util.DataType,String,android/util/TypedValue.TYPE_STRING,3
 16,Android.Views.Accessibility.EventTypes,Announcement,android/view/accessibility/AccessibilityEvent.TYPE_ANNOUNCEMENT,16384
 23,Android.Views.Accessibility.EventTypes,AssistReadingContext,android/view/accessibility/AccessibilityEvent.TYPE_ASSIST_READING_CONTEXT,16777216
 17,Android.Views.Accessibility.EventTypes,GestureDetectionEnd,android/view/accessibility/AccessibilityEvent.TYPE_GESTURE_DETECTION_END,524288
 17,Android.Views.Accessibility.EventTypes,GestureDetectionStart,android/view/accessibility/AccessibilityEvent.TYPE_GESTURE_DETECTION_START,262144
-4,Android.Views.Accessibility.EventTypes,NotificationStateChanged,android/view/accessibility/AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED,64
-14,Android.Views.Accessibility.EventTypes,TouchExplorationGestureEnd,android/view/accessibility/AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END,1024
-14,Android.Views.Accessibility.EventTypes,TouchExplorationGestureStart,android/view/accessibility/AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START,512
+10,Android.Views.Accessibility.EventTypes,NotificationStateChanged,android/view/accessibility/AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED,64
+15,Android.Views.Accessibility.EventTypes,TouchExplorationGestureEnd,android/view/accessibility/AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END,1024
+15,Android.Views.Accessibility.EventTypes,TouchExplorationGestureStart,android/view/accessibility/AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START,512
 17,Android.Views.Accessibility.EventTypes,TouchInteractionEnd,android/view/accessibility/AccessibilityEvent.TYPE_TOUCH_INTERACTION_END,2097152
 17,Android.Views.Accessibility.EventTypes,TouchInteractionStart,android/view/accessibility/AccessibilityEvent.TYPE_TOUCH_INTERACTION_START,1048576
-16,Android.Views.Accessibility.EventTypes,ViewAccessibilityFocused,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED,32768
 16,Android.Views.Accessibility.EventTypes,ViewAccessibilityFocusCleared,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED,65536
-4,Android.Views.Accessibility.EventTypes,ViewClicked,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_CLICKED,1
+16,Android.Views.Accessibility.EventTypes,ViewAccessibilityFocused,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED,32768
+10,Android.Views.Accessibility.EventTypes,ViewClicked,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_CLICKED,1
 23,Android.Views.Accessibility.EventTypes,ViewContextClicked,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_CONTEXT_CLICKED,8388608
-4,Android.Views.Accessibility.EventTypes,ViewFocused,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_FOCUSED,8
-14,Android.Views.Accessibility.EventTypes,ViewHoverEnter,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_HOVER_ENTER,128
-14,Android.Views.Accessibility.EventTypes,ViewHoverExit,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_HOVER_EXIT,256
-4,Android.Views.Accessibility.EventTypes,ViewLongClicked,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_LONG_CLICKED,2
-14,Android.Views.Accessibility.EventTypes,ViewScrolled,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_SCROLLED,4096
-4,Android.Views.Accessibility.EventTypes,ViewSelected,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_SELECTED,4
-4,Android.Views.Accessibility.EventTypes,ViewTextChanged,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED,16
-14,Android.Views.Accessibility.EventTypes,ViewTextSelectionChanged,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED,8192
+10,Android.Views.Accessibility.EventTypes,ViewFocused,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_FOCUSED,8
+15,Android.Views.Accessibility.EventTypes,ViewHoverEnter,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_HOVER_ENTER,128
+15,Android.Views.Accessibility.EventTypes,ViewHoverExit,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_HOVER_EXIT,256
+10,Android.Views.Accessibility.EventTypes,ViewLongClicked,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_LONG_CLICKED,2
+15,Android.Views.Accessibility.EventTypes,ViewScrolled,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_SCROLLED,4096
+10,Android.Views.Accessibility.EventTypes,ViewSelected,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_SELECTED,4
+10,Android.Views.Accessibility.EventTypes,ViewTextChanged,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED,16
+15,Android.Views.Accessibility.EventTypes,ViewTextSelectionChanged,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED,8192
 16,Android.Views.Accessibility.EventTypes,ViewTextTraversedAtMovementGranularity,android/view/accessibility/AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY,131072
+15,Android.Views.Accessibility.EventTypes,WindowContentChanged,android/view/accessibility/AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED,2048
+10,Android.Views.Accessibility.EventTypes,WindowStateChanged,android/view/accessibility/AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED,32
 21,Android.Views.Accessibility.EventTypes,WindowsChanged,android/view/accessibility/AccessibilityEvent.TYPE_WINDOWS_CHANGED,4194304
-14,Android.Views.Accessibility.EventTypes,WindowContentChanged,android/view/accessibility/AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED,2048
-4,Android.Views.Accessibility.EventTypes,WindowStateChanged,android/view/accessibility/AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED,32
-4,Android.Views.Accessibility.EventTypes,AllMask,android/view/accessibility/AccessibilityEvent.TYPES_ALL_MASK,-1
-3,Android.Views.GravityFlags,AxisClip,android/view/Gravity.AXIS_CLIP,8
-1,Android.Views.GravityFlags,AxisPullAfter,android/view/Gravity.AXIS_PULL_AFTER,4
-1,Android.Views.GravityFlags,AxisPullBefore,android/view/Gravity.AXIS_PULL_BEFORE,2
-1,Android.Views.GravityFlags,AxisSpecified,android/view/Gravity.AXIS_SPECIFIED,1
-1,Android.Views.GravityFlags,AxisXShift,android/view/Gravity.AXIS_X_SHIFT,0
-1,Android.Views.GravityFlags,AxisYShift,android/view/Gravity.AXIS_Y_SHIFT,4
-1,Android.Views.GravityFlags,Bottom,android/view/Gravity.BOTTOM,80
-1,Android.Views.GravityFlags,Center,android/view/Gravity.CENTER,17
-1,Android.Views.GravityFlags,CenterHorizontal,android/view/Gravity.CENTER_HORIZONTAL,1
-1,Android.Views.GravityFlags,CenterVertical,android/view/Gravity.CENTER_VERTICAL,16
-3,Android.Views.GravityFlags,ClipHorizontal,android/view/Gravity.CLIP_HORIZONTAL,8
-3,Android.Views.GravityFlags,ClipVertical,android/view/Gravity.CLIP_VERTICAL,128
-3,Android.Views.GravityFlags,DisplayClipHorizontal,android/view/Gravity.DISPLAY_CLIP_HORIZONTAL,16777216
-3,Android.Views.GravityFlags,DisplayClipVertical,android/view/Gravity.DISPLAY_CLIP_VERTICAL,268435456
-14,Android.Views.GravityFlags,End,android/view/Gravity.END,8388613
-1,Android.Views.GravityFlags,Fill,android/view/Gravity.FILL,119
-1,Android.Views.GravityFlags,FillHorizontal,android/view/Gravity.FILL_HORIZONTAL,7
-1,Android.Views.GravityFlags,FillVertical,android/view/Gravity.FILL_VERTICAL,112
-1,Android.Views.GravityFlags,HorizontalGravityMask,android/view/Gravity.HORIZONTAL_GRAVITY_MASK,7
-1,Android.Views.GravityFlags,Left,android/view/Gravity.LEFT,3
-1,Android.Views.GravityFlags,NoGravity,android/view/Gravity.NO_GRAVITY,0
-14,Android.Views.GravityFlags,RelativeHorizontalGravityMask,android/view/Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK,8388615
-14,Android.Views.GravityFlags,RelativeLayoutDirection,android/view/Gravity.RELATIVE_LAYOUT_DIRECTION,8388608
-1,Android.Views.GravityFlags,Right,android/view/Gravity.RIGHT,5
-14,Android.Views.GravityFlags,Start,android/view/Gravity.START,8388611
-1,Android.Views.GravityFlags,Top,android/view/Gravity.TOP,48
-1,Android.Views.GravityFlags,VerticalGravityMask,android/view/Gravity.VERTICAL_GRAVITY_MASK,112
-1,Android.Views.Keycode,Num0,android/view/KeyEvent.KEYCODE_0,7
-1,Android.Views.Keycode,Num1,android/view/KeyEvent.KEYCODE_1,8
+10,Android.Views.Accessibility.EventTypes,AllMask,android/view/accessibility/AccessibilityEvent.TYPES_ALL_MASK,-1
+10,Android.Views.GravityFlags,AxisClip,android/view/Gravity.AXIS_CLIP,8
+10,Android.Views.GravityFlags,AxisPullAfter,android/view/Gravity.AXIS_PULL_AFTER,4
+10,Android.Views.GravityFlags,AxisPullBefore,android/view/Gravity.AXIS_PULL_BEFORE,2
+10,Android.Views.GravityFlags,AxisSpecified,android/view/Gravity.AXIS_SPECIFIED,1
+10,Android.Views.GravityFlags,AxisXShift,android/view/Gravity.AXIS_X_SHIFT,0
+10,Android.Views.GravityFlags,AxisYShift,android/view/Gravity.AXIS_Y_SHIFT,4
+10,Android.Views.GravityFlags,Bottom,android/view/Gravity.BOTTOM,80
+10,Android.Views.GravityFlags,Center,android/view/Gravity.CENTER,17
+10,Android.Views.GravityFlags,CenterHorizontal,android/view/Gravity.CENTER_HORIZONTAL,1
+10,Android.Views.GravityFlags,CenterVertical,android/view/Gravity.CENTER_VERTICAL,16
+10,Android.Views.GravityFlags,ClipHorizontal,android/view/Gravity.CLIP_HORIZONTAL,8
+10,Android.Views.GravityFlags,ClipVertical,android/view/Gravity.CLIP_VERTICAL,128
+10,Android.Views.GravityFlags,DisplayClipHorizontal,android/view/Gravity.DISPLAY_CLIP_HORIZONTAL,16777216
+10,Android.Views.GravityFlags,DisplayClipVertical,android/view/Gravity.DISPLAY_CLIP_VERTICAL,268435456
+15,Android.Views.GravityFlags,End,android/view/Gravity.END,8388613
+10,Android.Views.GravityFlags,Fill,android/view/Gravity.FILL,119
+10,Android.Views.GravityFlags,FillHorizontal,android/view/Gravity.FILL_HORIZONTAL,7
+10,Android.Views.GravityFlags,FillVertical,android/view/Gravity.FILL_VERTICAL,112
+10,Android.Views.GravityFlags,HorizontalGravityMask,android/view/Gravity.HORIZONTAL_GRAVITY_MASK,7
+10,Android.Views.GravityFlags,Left,android/view/Gravity.LEFT,3
+10,Android.Views.GravityFlags,NoGravity,android/view/Gravity.NO_GRAVITY,0
+15,Android.Views.GravityFlags,RelativeHorizontalGravityMask,android/view/Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK,8388615
+15,Android.Views.GravityFlags,RelativeLayoutDirection,android/view/Gravity.RELATIVE_LAYOUT_DIRECTION,8388608
+10,Android.Views.GravityFlags,Right,android/view/Gravity.RIGHT,5
+15,Android.Views.GravityFlags,Start,android/view/Gravity.START,8388611
+10,Android.Views.GravityFlags,Top,android/view/Gravity.TOP,48
+10,Android.Views.GravityFlags,VerticalGravityMask,android/view/Gravity.VERTICAL_GRAVITY_MASK,112
+10,Android.Views.Keycode,Num0,android/view/KeyEvent.KEYCODE_0,7
+10,Android.Views.Keycode,Num1,android/view/KeyEvent.KEYCODE_1,8
 21,Android.Views.Keycode,K11,android/view/KeyEvent.KEYCODE_11,227
 21,Android.Views.Keycode,K12,android/view/KeyEvent.KEYCODE_12,228
-1,Android.Views.Keycode,Num2,android/view/KeyEvent.KEYCODE_2,9
-1,Android.Views.Keycode,Num3,android/view/KeyEvent.KEYCODE_3,10
-14,Android.Views.Keycode,ThreeDMode,android/view/KeyEvent.KEYCODE_3D_MODE,206
-1,Android.Views.Keycode,Num4,android/view/KeyEvent.KEYCODE_4,11
-1,Android.Views.Keycode,Num5,android/view/KeyEvent.KEYCODE_5,12
-1,Android.Views.Keycode,Num6,android/view/KeyEvent.KEYCODE_6,13
-1,Android.Views.Keycode,Num7,android/view/KeyEvent.KEYCODE_7,14
-1,Android.Views.Keycode,Num8,android/view/KeyEvent.KEYCODE_8,15
-1,Android.Views.Keycode,Num9,android/view/KeyEvent.KEYCODE_9,16
-1,Android.Views.Keycode,A,android/view/KeyEvent.KEYCODE_A,29
-1,Android.Views.Keycode,AltLeft,android/view/KeyEvent.KEYCODE_ALT_LEFT,57
-1,Android.Views.Keycode,AltRight,android/view/KeyEvent.KEYCODE_ALT_RIGHT,58
-1,Android.Views.Keycode,Apostrophe,android/view/KeyEvent.KEYCODE_APOSTROPHE,75
-11,Android.Views.Keycode,AppSwitch,android/view/KeyEvent.KEYCODE_APP_SWITCH,187
+10,Android.Views.Keycode,Num2,android/view/KeyEvent.KEYCODE_2,9
+10,Android.Views.Keycode,Num3,android/view/KeyEvent.KEYCODE_3,10
+15,Android.Views.Keycode,ThreeDMode,android/view/KeyEvent.KEYCODE_3D_MODE,206
+10,Android.Views.Keycode,Num4,android/view/KeyEvent.KEYCODE_4,11
+10,Android.Views.Keycode,Num5,android/view/KeyEvent.KEYCODE_5,12
+10,Android.Views.Keycode,Num6,android/view/KeyEvent.KEYCODE_6,13
+10,Android.Views.Keycode,Num7,android/view/KeyEvent.KEYCODE_7,14
+10,Android.Views.Keycode,Num8,android/view/KeyEvent.KEYCODE_8,15
+10,Android.Views.Keycode,Num9,android/view/KeyEvent.KEYCODE_9,16
+10,Android.Views.Keycode,A,android/view/KeyEvent.KEYCODE_A,29
+10,Android.Views.Keycode,AltLeft,android/view/KeyEvent.KEYCODE_ALT_LEFT,57
+10,Android.Views.Keycode,AltRight,android/view/KeyEvent.KEYCODE_ALT_RIGHT,58
+10,Android.Views.Keycode,Apostrophe,android/view/KeyEvent.KEYCODE_APOSTROPHE,75
+15,Android.Views.Keycode,AppSwitch,android/view/KeyEvent.KEYCODE_APP_SWITCH,187
 16,Android.Views.Keycode,Assist,android/view/KeyEvent.KEYCODE_ASSIST,219
-1,Android.Views.Keycode,At,android/view/KeyEvent.KEYCODE_AT,77
-11,Android.Views.Keycode,AvrInput,android/view/KeyEvent.KEYCODE_AVR_INPUT,182
-11,Android.Views.Keycode,AvrPower,android/view/KeyEvent.KEYCODE_AVR_POWER,181
-1,Android.Views.Keycode,B,android/view/KeyEvent.KEYCODE_B,30
-1,Android.Views.Keycode,Back,android/view/KeyEvent.KEYCODE_BACK,4
-1,Android.Views.Keycode,Backslash,android/view/KeyEvent.KEYCODE_BACKSLASH,73
-11,Android.Views.Keycode,Bookmark,android/view/KeyEvent.KEYCODE_BOOKMARK,174
-11,Android.Views.Keycode,Break,android/view/KeyEvent.KEYCODE_BREAK,121
+10,Android.Views.Keycode,At,android/view/KeyEvent.KEYCODE_AT,77
+15,Android.Views.Keycode,AvrInput,android/view/KeyEvent.KEYCODE_AVR_INPUT,182
+15,Android.Views.Keycode,AvrPower,android/view/KeyEvent.KEYCODE_AVR_POWER,181
+10,Android.Views.Keycode,B,android/view/KeyEvent.KEYCODE_B,30
+10,Android.Views.Keycode,Back,android/view/KeyEvent.KEYCODE_BACK,4
+10,Android.Views.Keycode,Backslash,android/view/KeyEvent.KEYCODE_BACKSLASH,73
+15,Android.Views.Keycode,Bookmark,android/view/KeyEvent.KEYCODE_BOOKMARK,174
+15,Android.Views.Keycode,Break,android/view/KeyEvent.KEYCODE_BREAK,121
 18,Android.Views.Keycode,BrightnessDown,android/view/KeyEvent.KEYCODE_BRIGHTNESS_DOWN,220
 18,Android.Views.Keycode,BrightnessUp,android/view/KeyEvent.KEYCODE_BRIGHTNESS_UP,221
-12,Android.Views.Keycode,Button1,android/view/KeyEvent.KEYCODE_BUTTON_1,188
-12,Android.Views.Keycode,Button10,android/view/KeyEvent.KEYCODE_BUTTON_10,197
-12,Android.Views.Keycode,Button11,android/view/KeyEvent.KEYCODE_BUTTON_11,198
-12,Android.Views.Keycode,Button12,android/view/KeyEvent.KEYCODE_BUTTON_12,199
-12,Android.Views.Keycode,Button13,android/view/KeyEvent.KEYCODE_BUTTON_13,200
-12,Android.Views.Keycode,Button14,android/view/KeyEvent.KEYCODE_BUTTON_14,201
-12,Android.Views.Keycode,Button15,android/view/KeyEvent.KEYCODE_BUTTON_15,202
-12,Android.Views.Keycode,Button16,android/view/KeyEvent.KEYCODE_BUTTON_16,203
-12,Android.Views.Keycode,Button2,android/view/KeyEvent.KEYCODE_BUTTON_2,189
-12,Android.Views.Keycode,Button3,android/view/KeyEvent.KEYCODE_BUTTON_3,190
-12,Android.Views.Keycode,Button4,android/view/KeyEvent.KEYCODE_BUTTON_4,191
-12,Android.Views.Keycode,Button5,android/view/KeyEvent.KEYCODE_BUTTON_5,192
-12,Android.Views.Keycode,Button6,android/view/KeyEvent.KEYCODE_BUTTON_6,193
-12,Android.Views.Keycode,Button7,android/view/KeyEvent.KEYCODE_BUTTON_7,194
-12,Android.Views.Keycode,Button8,android/view/KeyEvent.KEYCODE_BUTTON_8,195
-12,Android.Views.Keycode,Button9,android/view/KeyEvent.KEYCODE_BUTTON_9,196
-9,Android.Views.Keycode,ButtonA,android/view/KeyEvent.KEYCODE_BUTTON_A,96
-9,Android.Views.Keycode,ButtonB,android/view/KeyEvent.KEYCODE_BUTTON_B,97
-9,Android.Views.Keycode,ButtonC,android/view/KeyEvent.KEYCODE_BUTTON_C,98
-9,Android.Views.Keycode,ButtonL1,android/view/KeyEvent.KEYCODE_BUTTON_L1,102
-9,Android.Views.Keycode,ButtonL2,android/view/KeyEvent.KEYCODE_BUTTON_L2,104
-9,Android.Views.Keycode,ButtonMode,android/view/KeyEvent.KEYCODE_BUTTON_MODE,110
-9,Android.Views.Keycode,ButtonR1,android/view/KeyEvent.KEYCODE_BUTTON_R1,103
-9,Android.Views.Keycode,ButtonR2,android/view/KeyEvent.KEYCODE_BUTTON_R2,105
-9,Android.Views.Keycode,ButtonSelect,android/view/KeyEvent.KEYCODE_BUTTON_SELECT,109
-9,Android.Views.Keycode,ButtonStart,android/view/KeyEvent.KEYCODE_BUTTON_START,108
-9,Android.Views.Keycode,ButtonThumbl,android/view/KeyEvent.KEYCODE_BUTTON_THUMBL,106
-9,Android.Views.Keycode,ButtonThumbr,android/view/KeyEvent.KEYCODE_BUTTON_THUMBR,107
-9,Android.Views.Keycode,ButtonX,android/view/KeyEvent.KEYCODE_BUTTON_X,99
-9,Android.Views.Keycode,ButtonY,android/view/KeyEvent.KEYCODE_BUTTON_Y,100
-9,Android.Views.Keycode,ButtonZ,android/view/KeyEvent.KEYCODE_BUTTON_Z,101
-1,Android.Views.Keycode,C,android/view/KeyEvent.KEYCODE_C,31
+15,Android.Views.Keycode,Button1,android/view/KeyEvent.KEYCODE_BUTTON_1,188
+15,Android.Views.Keycode,Button10,android/view/KeyEvent.KEYCODE_BUTTON_10,197
+15,Android.Views.Keycode,Button11,android/view/KeyEvent.KEYCODE_BUTTON_11,198
+15,Android.Views.Keycode,Button12,android/view/KeyEvent.KEYCODE_BUTTON_12,199
+15,Android.Views.Keycode,Button13,android/view/KeyEvent.KEYCODE_BUTTON_13,200
+15,Android.Views.Keycode,Button14,android/view/KeyEvent.KEYCODE_BUTTON_14,201
+15,Android.Views.Keycode,Button15,android/view/KeyEvent.KEYCODE_BUTTON_15,202
+15,Android.Views.Keycode,Button16,android/view/KeyEvent.KEYCODE_BUTTON_16,203
+15,Android.Views.Keycode,Button2,android/view/KeyEvent.KEYCODE_BUTTON_2,189
+15,Android.Views.Keycode,Button3,android/view/KeyEvent.KEYCODE_BUTTON_3,190
+15,Android.Views.Keycode,Button4,android/view/KeyEvent.KEYCODE_BUTTON_4,191
+15,Android.Views.Keycode,Button5,android/view/KeyEvent.KEYCODE_BUTTON_5,192
+15,Android.Views.Keycode,Button6,android/view/KeyEvent.KEYCODE_BUTTON_6,193
+15,Android.Views.Keycode,Button7,android/view/KeyEvent.KEYCODE_BUTTON_7,194
+15,Android.Views.Keycode,Button8,android/view/KeyEvent.KEYCODE_BUTTON_8,195
+15,Android.Views.Keycode,Button9,android/view/KeyEvent.KEYCODE_BUTTON_9,196
+10,Android.Views.Keycode,ButtonA,android/view/KeyEvent.KEYCODE_BUTTON_A,96
+10,Android.Views.Keycode,ButtonB,android/view/KeyEvent.KEYCODE_BUTTON_B,97
+10,Android.Views.Keycode,ButtonC,android/view/KeyEvent.KEYCODE_BUTTON_C,98
+10,Android.Views.Keycode,ButtonL1,android/view/KeyEvent.KEYCODE_BUTTON_L1,102
+10,Android.Views.Keycode,ButtonL2,android/view/KeyEvent.KEYCODE_BUTTON_L2,104
+10,Android.Views.Keycode,ButtonMode,android/view/KeyEvent.KEYCODE_BUTTON_MODE,110
+10,Android.Views.Keycode,ButtonR1,android/view/KeyEvent.KEYCODE_BUTTON_R1,103
+10,Android.Views.Keycode,ButtonR2,android/view/KeyEvent.KEYCODE_BUTTON_R2,105
+10,Android.Views.Keycode,ButtonSelect,android/view/KeyEvent.KEYCODE_BUTTON_SELECT,109
+10,Android.Views.Keycode,ButtonStart,android/view/KeyEvent.KEYCODE_BUTTON_START,108
+10,Android.Views.Keycode,ButtonThumbl,android/view/KeyEvent.KEYCODE_BUTTON_THUMBL,106
+10,Android.Views.Keycode,ButtonThumbr,android/view/KeyEvent.KEYCODE_BUTTON_THUMBR,107
+10,Android.Views.Keycode,ButtonX,android/view/KeyEvent.KEYCODE_BUTTON_X,99
+10,Android.Views.Keycode,ButtonY,android/view/KeyEvent.KEYCODE_BUTTON_Y,100
+10,Android.Views.Keycode,ButtonZ,android/view/KeyEvent.KEYCODE_BUTTON_Z,101
+10,Android.Views.Keycode,C,android/view/KeyEvent.KEYCODE_C,31
 15,Android.Views.Keycode,Calculator,android/view/KeyEvent.KEYCODE_CALCULATOR,210
 15,Android.Views.Keycode,Calendar,android/view/KeyEvent.KEYCODE_CALENDAR,208
-1,Android.Views.Keycode,Call,android/view/KeyEvent.KEYCODE_CALL,5
-1,Android.Views.Keycode,Camera,android/view/KeyEvent.KEYCODE_CAMERA,27
-11,Android.Views.Keycode,CapsLock,android/view/KeyEvent.KEYCODE_CAPS_LOCK,115
-11,Android.Views.Keycode,Captions,android/view/KeyEvent.KEYCODE_CAPTIONS,175
-11,Android.Views.Keycode,ChannelDown,android/view/KeyEvent.KEYCODE_CHANNEL_DOWN,167
-11,Android.Views.Keycode,ChannelUp,android/view/KeyEvent.KEYCODE_CHANNEL_UP,166
-1,Android.Views.Keycode,Clear,android/view/KeyEvent.KEYCODE_CLEAR,28
-1,Android.Views.Keycode,Comma,android/view/KeyEvent.KEYCODE_COMMA,55
+10,Android.Views.Keycode,Call,android/view/KeyEvent.KEYCODE_CALL,5
+10,Android.Views.Keycode,Camera,android/view/KeyEvent.KEYCODE_CAMERA,27
+15,Android.Views.Keycode,CapsLock,android/view/KeyEvent.KEYCODE_CAPS_LOCK,115
+15,Android.Views.Keycode,Captions,android/view/KeyEvent.KEYCODE_CAPTIONS,175
+15,Android.Views.Keycode,ChannelDown,android/view/KeyEvent.KEYCODE_CHANNEL_DOWN,167
+15,Android.Views.Keycode,ChannelUp,android/view/KeyEvent.KEYCODE_CHANNEL_UP,166
+10,Android.Views.Keycode,Clear,android/view/KeyEvent.KEYCODE_CLEAR,28
+10,Android.Views.Keycode,Comma,android/view/KeyEvent.KEYCODE_COMMA,55
 15,Android.Views.Keycode,Contacts,android/view/KeyEvent.KEYCODE_CONTACTS,207
 24,Android.Views.Keycode,Copy,android/view/KeyEvent.KEYCODE_COPY,278
-11,Android.Views.Keycode,CtrlLeft,android/view/KeyEvent.KEYCODE_CTRL_LEFT,113
-11,Android.Views.Keycode,CtrlRight,android/view/KeyEvent.KEYCODE_CTRL_RIGHT,114
+15,Android.Views.Keycode,CtrlLeft,android/view/KeyEvent.KEYCODE_CTRL_LEFT,113
+15,Android.Views.Keycode,CtrlRight,android/view/KeyEvent.KEYCODE_CTRL_RIGHT,114
 24,Android.Views.Keycode,Cut,android/view/KeyEvent.KEYCODE_CUT,277
-1,Android.Views.Keycode,D,android/view/KeyEvent.KEYCODE_D,32
-1,Android.Views.Keycode,Del,android/view/KeyEvent.KEYCODE_DEL,67
-1,Android.Views.Keycode,DpadCenter,android/view/KeyEvent.KEYCODE_DPAD_CENTER,23
-1,Android.Views.Keycode,DpadDown,android/view/KeyEvent.KEYCODE_DPAD_DOWN,20
+10,Android.Views.Keycode,D,android/view/KeyEvent.KEYCODE_D,32
+10,Android.Views.Keycode,Del,android/view/KeyEvent.KEYCODE_DEL,67
+10,Android.Views.Keycode,DpadCenter,android/view/KeyEvent.KEYCODE_DPAD_CENTER,23
+10,Android.Views.Keycode,DpadDown,android/view/KeyEvent.KEYCODE_DPAD_DOWN,20
 24,Android.Views.Keycode,DpadDownLeft,android/view/KeyEvent.KEYCODE_DPAD_DOWN_LEFT,269
 24,Android.Views.Keycode,DpadDownRight,android/view/KeyEvent.KEYCODE_DPAD_DOWN_RIGHT,271
-1,Android.Views.Keycode,DpadLeft,android/view/KeyEvent.KEYCODE_DPAD_LEFT,21
-1,Android.Views.Keycode,DpadRight,android/view/KeyEvent.KEYCODE_DPAD_RIGHT,22
-1,Android.Views.Keycode,DpadUp,android/view/KeyEvent.KEYCODE_DPAD_UP,19
+10,Android.Views.Keycode,DpadLeft,android/view/KeyEvent.KEYCODE_DPAD_LEFT,21
+10,Android.Views.Keycode,DpadRight,android/view/KeyEvent.KEYCODE_DPAD_RIGHT,22
+10,Android.Views.Keycode,DpadUp,android/view/KeyEvent.KEYCODE_DPAD_UP,19
 24,Android.Views.Keycode,DpadUpLeft,android/view/KeyEvent.KEYCODE_DPAD_UP_LEFT,268
 24,Android.Views.Keycode,DpadUpRight,android/view/KeyEvent.KEYCODE_DPAD_UP_RIGHT,270
-11,Android.Views.Keycode,Dvr,android/view/KeyEvent.KEYCODE_DVR,173
-1,Android.Views.Keycode,E,android/view/KeyEvent.KEYCODE_E,33
+15,Android.Views.Keycode,Dvr,android/view/KeyEvent.KEYCODE_DVR,173
+10,Android.Views.Keycode,E,android/view/KeyEvent.KEYCODE_E,33
 16,Android.Views.Keycode,Eisu,android/view/KeyEvent.KEYCODE_EISU,212
-1,Android.Views.Keycode,Endcall,android/view/KeyEvent.KEYCODE_ENDCALL,6
-1,Android.Views.Keycode,Enter,android/view/KeyEvent.KEYCODE_ENTER,66
-1,Android.Views.Keycode,Envelope,android/view/KeyEvent.KEYCODE_ENVELOPE,65
-1,Android.Views.Keycode,Equals,android/view/KeyEvent.KEYCODE_EQUALS,70
-11,Android.Views.Keycode,Escape,android/view/KeyEvent.KEYCODE_ESCAPE,111
-1,Android.Views.Keycode,Explorer,android/view/KeyEvent.KEYCODE_EXPLORER,64
-1,Android.Views.Keycode,F,android/view/KeyEvent.KEYCODE_F,34
-11,Android.Views.Keycode,F1,android/view/KeyEvent.KEYCODE_F1,131
-11,Android.Views.Keycode,F10,android/view/KeyEvent.KEYCODE_F10,140
-11,Android.Views.Keycode,F11,android/view/KeyEvent.KEYCODE_F11,141
-11,Android.Views.Keycode,F12,android/view/KeyEvent.KEYCODE_F12,142
-11,Android.Views.Keycode,F2,android/view/KeyEvent.KEYCODE_F2,132
-11,Android.Views.Keycode,F3,android/view/KeyEvent.KEYCODE_F3,133
-11,Android.Views.Keycode,F4,android/view/KeyEvent.KEYCODE_F4,134
-11,Android.Views.Keycode,F5,android/view/KeyEvent.KEYCODE_F5,135
-11,Android.Views.Keycode,F6,android/view/KeyEvent.KEYCODE_F6,136
-11,Android.Views.Keycode,F7,android/view/KeyEvent.KEYCODE_F7,137
-11,Android.Views.Keycode,F8,android/view/KeyEvent.KEYCODE_F8,138
-11,Android.Views.Keycode,F9,android/view/KeyEvent.KEYCODE_F9,139
-1,Android.Views.Keycode,Focus,android/view/KeyEvent.KEYCODE_FOCUS,80
-11,Android.Views.Keycode,Forward,android/view/KeyEvent.KEYCODE_FORWARD,125
-11,Android.Views.Keycode,ForwardDel,android/view/KeyEvent.KEYCODE_FORWARD_DEL,112
-11,Android.Views.Keycode,Function,android/view/KeyEvent.KEYCODE_FUNCTION,119
-1,Android.Views.Keycode,G,android/view/KeyEvent.KEYCODE_G,35
-1,Android.Views.Keycode,Grave,android/view/KeyEvent.KEYCODE_GRAVE,68
-11,Android.Views.Keycode,Guide,android/view/KeyEvent.KEYCODE_GUIDE,172
-1,Android.Views.Keycode,H,android/view/KeyEvent.KEYCODE_H,36
-1,Android.Views.Keycode,Headsethook,android/view/KeyEvent.KEYCODE_HEADSETHOOK,79
+10,Android.Views.Keycode,Endcall,android/view/KeyEvent.KEYCODE_ENDCALL,6
+10,Android.Views.Keycode,Enter,android/view/KeyEvent.KEYCODE_ENTER,66
+10,Android.Views.Keycode,Envelope,android/view/KeyEvent.KEYCODE_ENVELOPE,65
+10,Android.Views.Keycode,Equals,android/view/KeyEvent.KEYCODE_EQUALS,70
+15,Android.Views.Keycode,Escape,android/view/KeyEvent.KEYCODE_ESCAPE,111
+10,Android.Views.Keycode,Explorer,android/view/KeyEvent.KEYCODE_EXPLORER,64
+10,Android.Views.Keycode,F,android/view/KeyEvent.KEYCODE_F,34
+15,Android.Views.Keycode,F1,android/view/KeyEvent.KEYCODE_F1,131
+15,Android.Views.Keycode,F10,android/view/KeyEvent.KEYCODE_F10,140
+15,Android.Views.Keycode,F11,android/view/KeyEvent.KEYCODE_F11,141
+15,Android.Views.Keycode,F12,android/view/KeyEvent.KEYCODE_F12,142
+15,Android.Views.Keycode,F2,android/view/KeyEvent.KEYCODE_F2,132
+15,Android.Views.Keycode,F3,android/view/KeyEvent.KEYCODE_F3,133
+15,Android.Views.Keycode,F4,android/view/KeyEvent.KEYCODE_F4,134
+15,Android.Views.Keycode,F5,android/view/KeyEvent.KEYCODE_F5,135
+15,Android.Views.Keycode,F6,android/view/KeyEvent.KEYCODE_F6,136
+15,Android.Views.Keycode,F7,android/view/KeyEvent.KEYCODE_F7,137
+15,Android.Views.Keycode,F8,android/view/KeyEvent.KEYCODE_F8,138
+15,Android.Views.Keycode,F9,android/view/KeyEvent.KEYCODE_F9,139
+10,Android.Views.Keycode,Focus,android/view/KeyEvent.KEYCODE_FOCUS,80
+15,Android.Views.Keycode,Forward,android/view/KeyEvent.KEYCODE_FORWARD,125
+15,Android.Views.Keycode,ForwardDel,android/view/KeyEvent.KEYCODE_FORWARD_DEL,112
+15,Android.Views.Keycode,Function,android/view/KeyEvent.KEYCODE_FUNCTION,119
+10,Android.Views.Keycode,G,android/view/KeyEvent.KEYCODE_G,35
+10,Android.Views.Keycode,Grave,android/view/KeyEvent.KEYCODE_GRAVE,68
+15,Android.Views.Keycode,Guide,android/view/KeyEvent.KEYCODE_GUIDE,172
+10,Android.Views.Keycode,H,android/view/KeyEvent.KEYCODE_H,36
+10,Android.Views.Keycode,Headsethook,android/view/KeyEvent.KEYCODE_HEADSETHOOK,79
 21,Android.Views.Keycode,Help,android/view/KeyEvent.KEYCODE_HELP,259
 16,Android.Views.Keycode,Henkan,android/view/KeyEvent.KEYCODE_HENKAN,214
-1,Android.Views.Keycode,Home,android/view/KeyEvent.KEYCODE_HOME,3
-1,Android.Views.Keycode,I,android/view/KeyEvent.KEYCODE_I,37
-11,Android.Views.Keycode,Info,android/view/KeyEvent.KEYCODE_INFO,165
-11,Android.Views.Keycode,Insert,android/view/KeyEvent.KEYCODE_INSERT,124
-1,Android.Views.Keycode,J,android/view/KeyEvent.KEYCODE_J,38
-1,Android.Views.Keycode,K,android/view/KeyEvent.KEYCODE_K,39
+10,Android.Views.Keycode,Home,android/view/KeyEvent.KEYCODE_HOME,3
+10,Android.Views.Keycode,I,android/view/KeyEvent.KEYCODE_I,37
+15,Android.Views.Keycode,Info,android/view/KeyEvent.KEYCODE_INFO,165
+15,Android.Views.Keycode,Insert,android/view/KeyEvent.KEYCODE_INSERT,124
+10,Android.Views.Keycode,J,android/view/KeyEvent.KEYCODE_J,38
+10,Android.Views.Keycode,K,android/view/KeyEvent.KEYCODE_K,39
 16,Android.Views.Keycode,Kana,android/view/KeyEvent.KEYCODE_KANA,218
 16,Android.Views.Keycode,KatakanaHiragana,android/view/KeyEvent.KEYCODE_KATAKANA_HIRAGANA,215
-1,Android.Views.Keycode,L,android/view/KeyEvent.KEYCODE_L,40
-14,Android.Views.Keycode,LanguageSwitch,android/view/KeyEvent.KEYCODE_LANGUAGE_SWITCH,204
+10,Android.Views.Keycode,L,android/view/KeyEvent.KEYCODE_L,40
+15,Android.Views.Keycode,LanguageSwitch,android/view/KeyEvent.KEYCODE_LANGUAGE_SWITCH,204
 21,Android.Views.Keycode,LastChannel,android/view/KeyEvent.KEYCODE_LAST_CHANNEL,229
-1,Android.Views.Keycode,LeftBracket,android/view/KeyEvent.KEYCODE_LEFT_BRACKET,71
-1,Android.Views.Keycode,M,android/view/KeyEvent.KEYCODE_M,41
-14,Android.Views.Keycode,MannerMode,android/view/KeyEvent.KEYCODE_MANNER_MODE,205
+10,Android.Views.Keycode,LeftBracket,android/view/KeyEvent.KEYCODE_LEFT_BRACKET,71
+10,Android.Views.Keycode,M,android/view/KeyEvent.KEYCODE_M,41
+15,Android.Views.Keycode,MannerMode,android/view/KeyEvent.KEYCODE_MANNER_MODE,205
 19,Android.Views.Keycode,MediaAudioTrack,android/view/KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK,222
-11,Android.Views.Keycode,MediaClose,android/view/KeyEvent.KEYCODE_MEDIA_CLOSE,128
-11,Android.Views.Keycode,MediaEject,android/view/KeyEvent.KEYCODE_MEDIA_EJECT,129
-3,Android.Views.Keycode,MediaFastForward,android/view/KeyEvent.KEYCODE_MEDIA_FAST_FORWARD,90
-3,Android.Views.Keycode,MediaNext,android/view/KeyEvent.KEYCODE_MEDIA_NEXT,87
-11,Android.Views.Keycode,MediaPause,android/view/KeyEvent.KEYCODE_MEDIA_PAUSE,127
-11,Android.Views.Keycode,MediaPlay,android/view/KeyEvent.KEYCODE_MEDIA_PLAY,126
-3,Android.Views.Keycode,MediaPlayPause,android/view/KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE,85
-3,Android.Views.Keycode,MediaPrevious,android/view/KeyEvent.KEYCODE_MEDIA_PREVIOUS,88
-11,Android.Views.Keycode,MediaRecord,android/view/KeyEvent.KEYCODE_MEDIA_RECORD,130
-3,Android.Views.Keycode,MediaRewind,android/view/KeyEvent.KEYCODE_MEDIA_REWIND,89
+15,Android.Views.Keycode,MediaClose,android/view/KeyEvent.KEYCODE_MEDIA_CLOSE,128
+15,Android.Views.Keycode,MediaEject,android/view/KeyEvent.KEYCODE_MEDIA_EJECT,129
+10,Android.Views.Keycode,MediaFastForward,android/view/KeyEvent.KEYCODE_MEDIA_FAST_FORWARD,90
+10,Android.Views.Keycode,MediaNext,android/view/KeyEvent.KEYCODE_MEDIA_NEXT,87
+15,Android.Views.Keycode,MediaPause,android/view/KeyEvent.KEYCODE_MEDIA_PAUSE,127
+15,Android.Views.Keycode,MediaPlay,android/view/KeyEvent.KEYCODE_MEDIA_PLAY,126
+10,Android.Views.Keycode,MediaPlayPause,android/view/KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE,85
+10,Android.Views.Keycode,MediaPrevious,android/view/KeyEvent.KEYCODE_MEDIA_PREVIOUS,88
+15,Android.Views.Keycode,MediaRecord,android/view/KeyEvent.KEYCODE_MEDIA_RECORD,130
+10,Android.Views.Keycode,MediaRewind,android/view/KeyEvent.KEYCODE_MEDIA_REWIND,89
 23,Android.Views.Keycode,MediaSkipBackward,android/view/KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD,273
 23,Android.Views.Keycode,MediaSkipForward,android/view/KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD,272
 23,Android.Views.Keycode,MediaStepBackward,android/view/KeyEvent.KEYCODE_MEDIA_STEP_BACKWARD,275
 23,Android.Views.Keycode,MediaStepForward,android/view/KeyEvent.KEYCODE_MEDIA_STEP_FORWARD,274
-3,Android.Views.Keycode,MediaStop,android/view/KeyEvent.KEYCODE_MEDIA_STOP,86
+10,Android.Views.Keycode,MediaStop,android/view/KeyEvent.KEYCODE_MEDIA_STOP,86
 21,Android.Views.Keycode,MediaTopMenu,android/view/KeyEvent.KEYCODE_MEDIA_TOP_MENU,226
-1,Android.Views.Keycode,Menu,android/view/KeyEvent.KEYCODE_MENU,82
-11,Android.Views.Keycode,MetaLeft,android/view/KeyEvent.KEYCODE_META_LEFT,117
-11,Android.Views.Keycode,MetaRight,android/view/KeyEvent.KEYCODE_META_RIGHT,118
-1,Android.Views.Keycode,Minus,android/view/KeyEvent.KEYCODE_MINUS,69
-11,Android.Views.Keycode,MoveEnd,android/view/KeyEvent.KEYCODE_MOVE_END,123
-11,Android.Views.Keycode,MoveHome,android/view/KeyEvent.KEYCODE_MOVE_HOME,122
+10,Android.Views.Keycode,Menu,android/view/KeyEvent.KEYCODE_MENU,82
+15,Android.Views.Keycode,MetaLeft,android/view/KeyEvent.KEYCODE_META_LEFT,117
+15,Android.Views.Keycode,MetaRight,android/view/KeyEvent.KEYCODE_META_RIGHT,118
+10,Android.Views.Keycode,Minus,android/view/KeyEvent.KEYCODE_MINUS,69
+15,Android.Views.Keycode,MoveEnd,android/view/KeyEvent.KEYCODE_MOVE_END,123
+15,Android.Views.Keycode,MoveHome,android/view/KeyEvent.KEYCODE_MOVE_HOME,122
 16,Android.Views.Keycode,Muhenkan,android/view/KeyEvent.KEYCODE_MUHENKAN,213
 15,Android.Views.Keycode,Music,android/view/KeyEvent.KEYCODE_MUSIC,209
-3,Android.Views.Keycode,Mute,android/view/KeyEvent.KEYCODE_MUTE,91
-1,Android.Views.Keycode,N,android/view/KeyEvent.KEYCODE_N,42
+10,Android.Views.Keycode,Mute,android/view/KeyEvent.KEYCODE_MUTE,91
+10,Android.Views.Keycode,N,android/view/KeyEvent.KEYCODE_N,42
 23,Android.Views.Keycode,NavigateIn,android/view/KeyEvent.KEYCODE_NAVIGATE_IN,262
 23,Android.Views.Keycode,NavigateNext,android/view/KeyEvent.KEYCODE_NAVIGATE_NEXT,261
 23,Android.Views.Keycode,NavigateOut,android/view/KeyEvent.KEYCODE_NAVIGATE_OUT,263
 23,Android.Views.Keycode,NavigatePrevious,android/view/KeyEvent.KEYCODE_NAVIGATE_PREVIOUS,260
-1,Android.Views.Keycode,Notification,android/view/KeyEvent.KEYCODE_NOTIFICATION,83
-1,Android.Views.Keycode,Num,android/view/KeyEvent.KEYCODE_NUM,78
-11,Android.Views.Keycode,Numpad0,android/view/KeyEvent.KEYCODE_NUMPAD_0,144
-11,Android.Views.Keycode,Numpad1,android/view/KeyEvent.KEYCODE_NUMPAD_1,145
-11,Android.Views.Keycode,Numpad2,android/view/KeyEvent.KEYCODE_NUMPAD_2,146
-11,Android.Views.Keycode,Numpad3,android/view/KeyEvent.KEYCODE_NUMPAD_3,147
-11,Android.Views.Keycode,Numpad4,android/view/KeyEvent.KEYCODE_NUMPAD_4,148
-11,Android.Views.Keycode,Numpad5,android/view/KeyEvent.KEYCODE_NUMPAD_5,149
-11,Android.Views.Keycode,Numpad6,android/view/KeyEvent.KEYCODE_NUMPAD_6,150
-11,Android.Views.Keycode,Numpad7,android/view/KeyEvent.KEYCODE_NUMPAD_7,151
-11,Android.Views.Keycode,Numpad8,android/view/KeyEvent.KEYCODE_NUMPAD_8,152
-11,Android.Views.Keycode,Numpad9,android/view/KeyEvent.KEYCODE_NUMPAD_9,153
-11,Android.Views.Keycode,NumpadAdd,android/view/KeyEvent.KEYCODE_NUMPAD_ADD,157
-11,Android.Views.Keycode,NumpadComma,android/view/KeyEvent.KEYCODE_NUMPAD_COMMA,159
-11,Android.Views.Keycode,NumpadDivide,android/view/KeyEvent.KEYCODE_NUMPAD_DIVIDE,154
-11,Android.Views.Keycode,NumpadDot,android/view/KeyEvent.KEYCODE_NUMPAD_DOT,158
-11,Android.Views.Keycode,NumpadEnter,android/view/KeyEvent.KEYCODE_NUMPAD_ENTER,160
-11,Android.Views.Keycode,NumpadEquals,android/view/KeyEvent.KEYCODE_NUMPAD_EQUALS,161
-11,Android.Views.Keycode,NumpadLeftParen,android/view/KeyEvent.KEYCODE_NUMPAD_LEFT_PAREN,162
-11,Android.Views.Keycode,NumpadMultiply,android/view/KeyEvent.KEYCODE_NUMPAD_MULTIPLY,155
-11,Android.Views.Keycode,NumpadRightParen,android/view/KeyEvent.KEYCODE_NUMPAD_RIGHT_PAREN,163
-11,Android.Views.Keycode,NumpadSubtract,android/view/KeyEvent.KEYCODE_NUMPAD_SUBTRACT,156
-11,Android.Views.Keycode,NumLock,android/view/KeyEvent.KEYCODE_NUM_LOCK,143
-1,Android.Views.Keycode,O,android/view/KeyEvent.KEYCODE_O,43
-1,Android.Views.Keycode,P,android/view/KeyEvent.KEYCODE_P,44
-9,Android.Views.Keycode,PageDown,android/view/KeyEvent.KEYCODE_PAGE_DOWN,93
-9,Android.Views.Keycode,PageUp,android/view/KeyEvent.KEYCODE_PAGE_UP,92
+10,Android.Views.Keycode,Notification,android/view/KeyEvent.KEYCODE_NOTIFICATION,83
+10,Android.Views.Keycode,Num,android/view/KeyEvent.KEYCODE_NUM,78
+15,Android.Views.Keycode,NumLock,android/view/KeyEvent.KEYCODE_NUM_LOCK,143
+15,Android.Views.Keycode,Numpad0,android/view/KeyEvent.KEYCODE_NUMPAD_0,144
+15,Android.Views.Keycode,Numpad1,android/view/KeyEvent.KEYCODE_NUMPAD_1,145
+15,Android.Views.Keycode,Numpad2,android/view/KeyEvent.KEYCODE_NUMPAD_2,146
+15,Android.Views.Keycode,Numpad3,android/view/KeyEvent.KEYCODE_NUMPAD_3,147
+15,Android.Views.Keycode,Numpad4,android/view/KeyEvent.KEYCODE_NUMPAD_4,148
+15,Android.Views.Keycode,Numpad5,android/view/KeyEvent.KEYCODE_NUMPAD_5,149
+15,Android.Views.Keycode,Numpad6,android/view/KeyEvent.KEYCODE_NUMPAD_6,150
+15,Android.Views.Keycode,Numpad7,android/view/KeyEvent.KEYCODE_NUMPAD_7,151
+15,Android.Views.Keycode,Numpad8,android/view/KeyEvent.KEYCODE_NUMPAD_8,152
+15,Android.Views.Keycode,Numpad9,android/view/KeyEvent.KEYCODE_NUMPAD_9,153
+15,Android.Views.Keycode,NumpadAdd,android/view/KeyEvent.KEYCODE_NUMPAD_ADD,157
+15,Android.Views.Keycode,NumpadComma,android/view/KeyEvent.KEYCODE_NUMPAD_COMMA,159
+15,Android.Views.Keycode,NumpadDivide,android/view/KeyEvent.KEYCODE_NUMPAD_DIVIDE,154
+15,Android.Views.Keycode,NumpadDot,android/view/KeyEvent.KEYCODE_NUMPAD_DOT,158
+15,Android.Views.Keycode,NumpadEnter,android/view/KeyEvent.KEYCODE_NUMPAD_ENTER,160
+15,Android.Views.Keycode,NumpadEquals,android/view/KeyEvent.KEYCODE_NUMPAD_EQUALS,161
+15,Android.Views.Keycode,NumpadLeftParen,android/view/KeyEvent.KEYCODE_NUMPAD_LEFT_PAREN,162
+15,Android.Views.Keycode,NumpadMultiply,android/view/KeyEvent.KEYCODE_NUMPAD_MULTIPLY,155
+15,Android.Views.Keycode,NumpadRightParen,android/view/KeyEvent.KEYCODE_NUMPAD_RIGHT_PAREN,163
+15,Android.Views.Keycode,NumpadSubtract,android/view/KeyEvent.KEYCODE_NUMPAD_SUBTRACT,156
+10,Android.Views.Keycode,O,android/view/KeyEvent.KEYCODE_O,43
+10,Android.Views.Keycode,P,android/view/KeyEvent.KEYCODE_P,44
+10,Android.Views.Keycode,PageDown,android/view/KeyEvent.KEYCODE_PAGE_DOWN,93
+10,Android.Views.Keycode,PageUp,android/view/KeyEvent.KEYCODE_PAGE_UP,92
 21,Android.Views.Keycode,Pairing,android/view/KeyEvent.KEYCODE_PAIRING,225
 24,Android.Views.Keycode,Paste,android/view/KeyEvent.KEYCODE_PASTE,279
-1,Android.Views.Keycode,Period,android/view/KeyEvent.KEYCODE_PERIOD,56
-9,Android.Views.Keycode,Pictsymbols,android/view/KeyEvent.KEYCODE_PICTSYMBOLS,94
-1,Android.Views.Keycode,Plus,android/view/KeyEvent.KEYCODE_PLUS,81
-1,Android.Views.Keycode,Pound,android/view/KeyEvent.KEYCODE_POUND,18
-1,Android.Views.Keycode,Power,android/view/KeyEvent.KEYCODE_POWER,26
-11,Android.Views.Keycode,ProgBlue,android/view/KeyEvent.KEYCODE_PROG_BLUE,186
-11,Android.Views.Keycode,ProgGreen,android/view/KeyEvent.KEYCODE_PROG_GREEN,184
-11,Android.Views.Keycode,ProgRed,android/view/KeyEvent.KEYCODE_PROG_RED,183
-11,Android.Views.Keycode,ProgYellow,android/view/KeyEvent.KEYCODE_PROG_YELLOW,185
-1,Android.Views.Keycode,Q,android/view/KeyEvent.KEYCODE_Q,45
-1,Android.Views.Keycode,R,android/view/KeyEvent.KEYCODE_R,46
-1,Android.Views.Keycode,RightBracket,android/view/KeyEvent.KEYCODE_RIGHT_BRACKET,72
+10,Android.Views.Keycode,Period,android/view/KeyEvent.KEYCODE_PERIOD,56
+10,Android.Views.Keycode,Pictsymbols,android/view/KeyEvent.KEYCODE_PICTSYMBOLS,94
+10,Android.Views.Keycode,Plus,android/view/KeyEvent.KEYCODE_PLUS,81
+10,Android.Views.Keycode,Pound,android/view/KeyEvent.KEYCODE_POUND,18
+10,Android.Views.Keycode,Power,android/view/KeyEvent.KEYCODE_POWER,26
+15,Android.Views.Keycode,ProgBlue,android/view/KeyEvent.KEYCODE_PROG_BLUE,186
+15,Android.Views.Keycode,ProgGreen,android/view/KeyEvent.KEYCODE_PROG_GREEN,184
+15,Android.Views.Keycode,ProgRed,android/view/KeyEvent.KEYCODE_PROG_RED,183
+15,Android.Views.Keycode,ProgYellow,android/view/KeyEvent.KEYCODE_PROG_YELLOW,185
+10,Android.Views.Keycode,Q,android/view/KeyEvent.KEYCODE_Q,45
+10,Android.Views.Keycode,R,android/view/KeyEvent.KEYCODE_R,46
+10,Android.Views.Keycode,RightBracket,android/view/KeyEvent.KEYCODE_RIGHT_BRACKET,72
 16,Android.Views.Keycode,Ro,android/view/KeyEvent.KEYCODE_RO,217
-1,Android.Views.Keycode,S,android/view/KeyEvent.KEYCODE_S,47
-11,Android.Views.Keycode,ScrollLock,android/view/KeyEvent.KEYCODE_SCROLL_LOCK,116
-1,Android.Views.Keycode,Search,android/view/KeyEvent.KEYCODE_SEARCH,84
-1,Android.Views.Keycode,Semicolon,android/view/KeyEvent.KEYCODE_SEMICOLON,74
-11,Android.Views.Keycode,Settings,android/view/KeyEvent.KEYCODE_SETTINGS,176
-1,Android.Views.Keycode,ShiftLeft,android/view/KeyEvent.KEYCODE_SHIFT_LEFT,59
-1,Android.Views.Keycode,ShiftRight,android/view/KeyEvent.KEYCODE_SHIFT_RIGHT,60
-1,Android.Views.Keycode,Slash,android/view/KeyEvent.KEYCODE_SLASH,76
+10,Android.Views.Keycode,S,android/view/KeyEvent.KEYCODE_S,47
+15,Android.Views.Keycode,ScrollLock,android/view/KeyEvent.KEYCODE_SCROLL_LOCK,116
+10,Android.Views.Keycode,Search,android/view/KeyEvent.KEYCODE_SEARCH,84
+10,Android.Views.Keycode,Semicolon,android/view/KeyEvent.KEYCODE_SEMICOLON,74
+15,Android.Views.Keycode,Settings,android/view/KeyEvent.KEYCODE_SETTINGS,176
+10,Android.Views.Keycode,ShiftLeft,android/view/KeyEvent.KEYCODE_SHIFT_LEFT,59
+10,Android.Views.Keycode,ShiftRight,android/view/KeyEvent.KEYCODE_SHIFT_RIGHT,60
+10,Android.Views.Keycode,Slash,android/view/KeyEvent.KEYCODE_SLASH,76
 20,Android.Views.Keycode,Sleep,android/view/KeyEvent.KEYCODE_SLEEP,223
-1,Android.Views.Keycode,SoftLeft,android/view/KeyEvent.KEYCODE_SOFT_LEFT,1
-1,Android.Views.Keycode,SoftRight,android/view/KeyEvent.KEYCODE_SOFT_RIGHT,2
+10,Android.Views.Keycode,SoftLeft,android/view/KeyEvent.KEYCODE_SOFT_LEFT,1
+10,Android.Views.Keycode,SoftRight,android/view/KeyEvent.KEYCODE_SOFT_RIGHT,2
 24,Android.Views.Keycode,SoftSleep,android/view/KeyEvent.KEYCODE_SOFT_SLEEP,276
-1,Android.Views.Keycode,Space,android/view/KeyEvent.KEYCODE_SPACE,62
-1,Android.Views.Keycode,Star,android/view/KeyEvent.KEYCODE_STAR,17
-11,Android.Views.Keycode,StbInput,android/view/KeyEvent.KEYCODE_STB_INPUT,180
-11,Android.Views.Keycode,StbPower,android/view/KeyEvent.KEYCODE_STB_POWER,179
+10,Android.Views.Keycode,Space,android/view/KeyEvent.KEYCODE_SPACE,62
+10,Android.Views.Keycode,Star,android/view/KeyEvent.KEYCODE_STAR,17
+15,Android.Views.Keycode,StbInput,android/view/KeyEvent.KEYCODE_STB_INPUT,180
+15,Android.Views.Keycode,StbPower,android/view/KeyEvent.KEYCODE_STB_POWER,179
 24,Android.Views.Keycode,Stem1,android/view/KeyEvent.KEYCODE_STEM_1,265
 24,Android.Views.Keycode,Stem2,android/view/KeyEvent.KEYCODE_STEM_2,266
 24,Android.Views.Keycode,Stem3,android/view/KeyEvent.KEYCODE_STEM_3,267
 24,Android.Views.Keycode,StemPrimary,android/view/KeyEvent.KEYCODE_STEM_PRIMARY,264
-9,Android.Views.Keycode,SwitchCharset,android/view/KeyEvent.KEYCODE_SWITCH_CHARSET,95
-1,Android.Views.Keycode,Sym,android/view/KeyEvent.KEYCODE_SYM,63
-11,Android.Views.Keycode,Sysrq,android/view/KeyEvent.KEYCODE_SYSRQ,120
+10,Android.Views.Keycode,SwitchCharset,android/view/KeyEvent.KEYCODE_SWITCH_CHARSET,95
+10,Android.Views.Keycode,Sym,android/view/KeyEvent.KEYCODE_SYM,63
+15,Android.Views.Keycode,Sysrq,android/view/KeyEvent.KEYCODE_SYSRQ,120
 25,Android.Views.Keycode,SystemNavigationDown,android/view/KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN,281
 25,Android.Views.Keycode,SystemNavigationLeft,android/view/KeyEvent.KEYCODE_SYSTEM_NAVIGATION_LEFT,282
 25,Android.Views.Keycode,SystemNavigationRight,android/view/KeyEvent.KEYCODE_SYSTEM_NAVIGATION_RIGHT,283
 25,Android.Views.Keycode,SystemNavigationUp,android/view/KeyEvent.KEYCODE_SYSTEM_NAVIGATION_UP,280
-1,Android.Views.Keycode,T,android/view/KeyEvent.KEYCODE_T,48
-1,Android.Views.Keycode,Tab,android/view/KeyEvent.KEYCODE_TAB,61
-11,Android.Views.Keycode,Tv,android/view/KeyEvent.KEYCODE_TV,170
+10,Android.Views.Keycode,T,android/view/KeyEvent.KEYCODE_T,48
+10,Android.Views.Keycode,Tab,android/view/KeyEvent.KEYCODE_TAB,61
+15,Android.Views.Keycode,Tv,android/view/KeyEvent.KEYCODE_TV,170
 21,Android.Views.Keycode,TvAntennaCable,android/view/KeyEvent.KEYCODE_TV_ANTENNA_CABLE,242
 21,Android.Views.Keycode,TvAudioDescription,android/view/KeyEvent.KEYCODE_TV_AUDIO_DESCRIPTION,252
 21,Android.Views.Keycode,TvAudioDescriptionMixDown,android/view/KeyEvent.KEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN,254
 21,Android.Views.Keycode,TvAudioDescriptionMixUp,android/view/KeyEvent.KEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP,253
 21,Android.Views.Keycode,TvContentsMenu,android/view/KeyEvent.KEYCODE_TV_CONTENTS_MENU,256
 21,Android.Views.Keycode,TvDataService,android/view/KeyEvent.KEYCODE_TV_DATA_SERVICE,230
-11,Android.Views.Keycode,TvInput,android/view/KeyEvent.KEYCODE_TV_INPUT,178
+15,Android.Views.Keycode,TvInput,android/view/KeyEvent.KEYCODE_TV_INPUT,178
 21,Android.Views.Keycode,TvInputComponent1,android/view/KeyEvent.KEYCODE_TV_INPUT_COMPONENT_1,249
 21,Android.Views.Keycode,TvInputComponent2,android/view/KeyEvent.KEYCODE_TV_INPUT_COMPONENT_2,250
 21,Android.Views.Keycode,TvInputComposite1,android/view/KeyEvent.KEYCODE_TV_INPUT_COMPOSITE_1,247
@@ -2220,7 +2183,7 @@
 21,Android.Views.Keycode,TvMediaContextMenu,android/view/KeyEvent.KEYCODE_TV_MEDIA_CONTEXT_MENU,257
 21,Android.Views.Keycode,TvNetwork,android/view/KeyEvent.KEYCODE_TV_NETWORK,241
 21,Android.Views.Keycode,TvNumberEntry,android/view/KeyEvent.KEYCODE_TV_NUMBER_ENTRY,234
-11,Android.Views.Keycode,TvPower,android/view/KeyEvent.KEYCODE_TV_POWER,177
+15,Android.Views.Keycode,TvPower,android/view/KeyEvent.KEYCODE_TV_POWER,177
 21,Android.Views.Keycode,TvRadioService,android/view/KeyEvent.KEYCODE_TV_RADIO_SERVICE,232
 21,Android.Views.Keycode,TvSatellite,android/view/KeyEvent.KEYCODE_TV_SATELLITE,237
 21,Android.Views.Keycode,TvSatelliteBs,android/view/KeyEvent.KEYCODE_TV_SATELLITE_BS,238
@@ -2231,216 +2194,217 @@
 21,Android.Views.Keycode,TvTerrestrialDigital,android/view/KeyEvent.KEYCODE_TV_TERRESTRIAL_DIGITAL,236
 21,Android.Views.Keycode,TvTimerProgramming,android/view/KeyEvent.KEYCODE_TV_TIMER_PROGRAMMING,258
 21,Android.Views.Keycode,TvZoomMode,android/view/KeyEvent.KEYCODE_TV_ZOOM_MODE,255
-1,Android.Views.Keycode,U,android/view/KeyEvent.KEYCODE_U,49
-1,Android.Views.Keycode,Unknown,android/view/KeyEvent.KEYCODE_UNKNOWN,0
-1,Android.Views.Keycode,V,android/view/KeyEvent.KEYCODE_V,50
+10,Android.Views.Keycode,U,android/view/KeyEvent.KEYCODE_U,49
+10,Android.Views.Keycode,Unknown,android/view/KeyEvent.KEYCODE_UNKNOWN,0
+10,Android.Views.Keycode,V,android/view/KeyEvent.KEYCODE_V,50
 21,Android.Views.Keycode,VoiceAssist,android/view/KeyEvent.KEYCODE_VOICE_ASSIST,231
-1,Android.Views.Keycode,VolumeDown,android/view/KeyEvent.KEYCODE_VOLUME_DOWN,25
-11,Android.Views.Keycode,VolumeMute,android/view/KeyEvent.KEYCODE_VOLUME_MUTE,164
-1,Android.Views.Keycode,VolumeUp,android/view/KeyEvent.KEYCODE_VOLUME_UP,24
-1,Android.Views.Keycode,W,android/view/KeyEvent.KEYCODE_W,51
+10,Android.Views.Keycode,VolumeDown,android/view/KeyEvent.KEYCODE_VOLUME_DOWN,25
+15,Android.Views.Keycode,VolumeMute,android/view/KeyEvent.KEYCODE_VOLUME_MUTE,164
+10,Android.Views.Keycode,VolumeUp,android/view/KeyEvent.KEYCODE_VOLUME_UP,24
+10,Android.Views.Keycode,W,android/view/KeyEvent.KEYCODE_W,51
 20,Android.Views.Keycode,Wakeup,android/view/KeyEvent.KEYCODE_WAKEUP,224
-11,Android.Views.Keycode,Window,android/view/KeyEvent.KEYCODE_WINDOW,171
-1,Android.Views.Keycode,X,android/view/KeyEvent.KEYCODE_X,52
-1,Android.Views.Keycode,Y,android/view/KeyEvent.KEYCODE_Y,53
+15,Android.Views.Keycode,Window,android/view/KeyEvent.KEYCODE_WINDOW,171
+10,Android.Views.Keycode,X,android/view/KeyEvent.KEYCODE_X,52
+10,Android.Views.Keycode,Y,android/view/KeyEvent.KEYCODE_Y,53
 16,Android.Views.Keycode,Yen,android/view/KeyEvent.KEYCODE_YEN,216
-1,Android.Views.Keycode,Z,android/view/KeyEvent.KEYCODE_Z,54
+10,Android.Views.Keycode,Z,android/view/KeyEvent.KEYCODE_Z,54
 16,Android.Views.Keycode,ZenkakuHankaku,android/view/KeyEvent.KEYCODE_ZENKAKU_HANKAKU,211
-11,Android.Views.Keycode,ZoomIn,android/view/KeyEvent.KEYCODE_ZOOM_IN,168
-11,Android.Views.Keycode,ZoomOut,android/view/KeyEvent.KEYCODE_ZOOM_OUT,169
-1,Android.Views.KeyEventActions,Down,android/view/KeyEvent.ACTION_DOWN,0
-1,Android.Views.KeyEventActions,Multiple,android/view/KeyEvent.ACTION_MULTIPLE,2
-1,Android.Views.KeyEventActions,Up,android/view/KeyEvent.ACTION_UP,1
-5,Android.Views.KeyEventFlags,Canceled,android/view/KeyEvent.FLAG_CANCELED,32
-5,Android.Views.KeyEventFlags,CanceledLongPress,android/view/KeyEvent.FLAG_CANCELED_LONG_PRESS,256
-3,Android.Views.KeyEventFlags,EditorAction,android/view/KeyEvent.FLAG_EDITOR_ACTION,16
-11,Android.Views.KeyEventFlags,Fallback,android/view/KeyEvent.FLAG_FALLBACK,1024
-3,Android.Views.KeyEventFlags,FromSystem,android/view/KeyEvent.FLAG_FROM_SYSTEM,8
-3,Android.Views.KeyEventFlags,KeepTouchMode,android/view/KeyEvent.FLAG_KEEP_TOUCH_MODE,4
-5,Android.Views.KeyEventFlags,LongPress,android/view/KeyEvent.FLAG_LONG_PRESS,128
-3,Android.Views.KeyEventFlags,SoftKeyboard,android/view/KeyEvent.FLAG_SOFT_KEYBOARD,2
-5,Android.Views.KeyEventFlags,Tracking,android/view/KeyEvent.FLAG_TRACKING,512
-5,Android.Views.KeyEventFlags,VirtualHardKey,android/view/KeyEvent.FLAG_VIRTUAL_HARD_KEY,64
-1,Android.Views.KeyEventFlags,WokeHere,android/view/KeyEvent.FLAG_WOKE_HERE,1
-1,Android.Views.MetaKeyStates,AltLeftOn,android/view/KeyEvent.META_ALT_LEFT_ON,16
-11,Android.Views.MetaKeyStates,AltMask,android/view/KeyEvent.META_ALT_MASK,50
-1,Android.Views.MetaKeyStates,AltOn,android/view/KeyEvent.META_ALT_ON,2
-1,Android.Views.MetaKeyStates,AltRightOn,android/view/KeyEvent.META_ALT_RIGHT_ON,32
-11,Android.Views.MetaKeyStates,CapsLockOn,android/view/KeyEvent.META_CAPS_LOCK_ON,1048576
-11,Android.Views.MetaKeyStates,CtrlLeftOn,android/view/KeyEvent.META_CTRL_LEFT_ON,8192
-11,Android.Views.MetaKeyStates,CtrlMask,android/view/KeyEvent.META_CTRL_MASK,28672
-11,Android.Views.MetaKeyStates,CtrlOn,android/view/KeyEvent.META_CTRL_ON,4096
-11,Android.Views.MetaKeyStates,CtrlRightOn,android/view/KeyEvent.META_CTRL_RIGHT_ON,16384
-11,Android.Views.MetaKeyStates,FunctionOn,android/view/KeyEvent.META_FUNCTION_ON,8
-11,Android.Views.MetaKeyStates,MetaLeftOn,android/view/KeyEvent.META_META_LEFT_ON,131072
-11,Android.Views.MetaKeyStates,MetaMask,android/view/KeyEvent.META_META_MASK,458752
-11,Android.Views.MetaKeyStates,MetaOn,android/view/KeyEvent.META_META_ON,65536
-11,Android.Views.MetaKeyStates,MetaRightOn,android/view/KeyEvent.META_META_RIGHT_ON,262144
-11,Android.Views.MetaKeyStates,NumLockOn,android/view/KeyEvent.META_NUM_LOCK_ON,2097152
-11,Android.Views.MetaKeyStates,ScrollLockOn,android/view/KeyEvent.META_SCROLL_LOCK_ON,4194304
-1,Android.Views.MetaKeyStates,ShiftLeftOn,android/view/KeyEvent.META_SHIFT_LEFT_ON,64
-11,Android.Views.MetaKeyStates,ShiftMask,android/view/KeyEvent.META_SHIFT_MASK,193
-1,Android.Views.MetaKeyStates,ShiftOn,android/view/KeyEvent.META_SHIFT_ON,1
-1,Android.Views.MetaKeyStates,ShiftRightOn,android/view/KeyEvent.META_SHIFT_RIGHT_ON,128
-1,Android.Views.MetaKeyStates,SymOn,android/view/KeyEvent.META_SYM_ON,4
-1,Android.Views.MenuCategory,Alternative,I:android/view/Menu.CATEGORY_ALTERNATIVE,262144
-1,Android.Views.MenuCategory,Container,I:android/view/Menu.CATEGORY_CONTAINER,65536
-1,Android.Views.MenuCategory,Secondary,I:android/view/Menu.CATEGORY_SECONDARY,196608
-1,Android.Views.MenuCategory,System,I:android/view/Menu.CATEGORY_SYSTEM,131072
+15,Android.Views.Keycode,ZoomIn,android/view/KeyEvent.KEYCODE_ZOOM_IN,168
+15,Android.Views.Keycode,ZoomOut,android/view/KeyEvent.KEYCODE_ZOOM_OUT,169
+10,Android.Views.KeyEventActions,Down,android/view/KeyEvent.ACTION_DOWN,0
+10,Android.Views.KeyEventActions,Multiple,android/view/KeyEvent.ACTION_MULTIPLE,2
+10,Android.Views.KeyEventActions,Up,android/view/KeyEvent.ACTION_UP,1
+10,Android.Views.KeyEventFlags,Canceled,android/view/KeyEvent.FLAG_CANCELED,32
+10,Android.Views.KeyEventFlags,CanceledLongPress,android/view/KeyEvent.FLAG_CANCELED_LONG_PRESS,256
+10,Android.Views.KeyEventFlags,EditorAction,android/view/KeyEvent.FLAG_EDITOR_ACTION,16
+15,Android.Views.KeyEventFlags,Fallback,android/view/KeyEvent.FLAG_FALLBACK,1024
+10,Android.Views.KeyEventFlags,FromSystem,android/view/KeyEvent.FLAG_FROM_SYSTEM,8
+10,Android.Views.KeyEventFlags,KeepTouchMode,android/view/KeyEvent.FLAG_KEEP_TOUCH_MODE,4
+10,Android.Views.KeyEventFlags,LongPress,android/view/KeyEvent.FLAG_LONG_PRESS,128
+10,Android.Views.KeyEventFlags,SoftKeyboard,android/view/KeyEvent.FLAG_SOFT_KEYBOARD,2
+10,Android.Views.KeyEventFlags,Tracking,android/view/KeyEvent.FLAG_TRACKING,512
+10,Android.Views.KeyEventFlags,VirtualHardKey,android/view/KeyEvent.FLAG_VIRTUAL_HARD_KEY,64
+10,Android.Views.KeyEventFlags,WokeHere,android/view/KeyEvent.FLAG_WOKE_HERE,1
+10,Android.Views.MetaKeyStates,AltLeftOn,android/view/KeyEvent.META_ALT_LEFT_ON,16
+15,Android.Views.MetaKeyStates,AltMask,android/view/KeyEvent.META_ALT_MASK,50
+10,Android.Views.MetaKeyStates,AltOn,android/view/KeyEvent.META_ALT_ON,2
+10,Android.Views.MetaKeyStates,AltRightOn,android/view/KeyEvent.META_ALT_RIGHT_ON,32
+15,Android.Views.MetaKeyStates,CapsLockOn,android/view/KeyEvent.META_CAPS_LOCK_ON,1048576
+15,Android.Views.MetaKeyStates,CtrlLeftOn,android/view/KeyEvent.META_CTRL_LEFT_ON,8192
+15,Android.Views.MetaKeyStates,CtrlMask,android/view/KeyEvent.META_CTRL_MASK,28672
+15,Android.Views.MetaKeyStates,CtrlOn,android/view/KeyEvent.META_CTRL_ON,4096
+15,Android.Views.MetaKeyStates,CtrlRightOn,android/view/KeyEvent.META_CTRL_RIGHT_ON,16384
+15,Android.Views.MetaKeyStates,FunctionOn,android/view/KeyEvent.META_FUNCTION_ON,8
+15,Android.Views.MetaKeyStates,MetaLeftOn,android/view/KeyEvent.META_META_LEFT_ON,131072
+15,Android.Views.MetaKeyStates,MetaMask,android/view/KeyEvent.META_META_MASK,458752
+15,Android.Views.MetaKeyStates,MetaOn,android/view/KeyEvent.META_META_ON,65536
+15,Android.Views.MetaKeyStates,MetaRightOn,android/view/KeyEvent.META_META_RIGHT_ON,262144
+15,Android.Views.MetaKeyStates,NumLockOn,android/view/KeyEvent.META_NUM_LOCK_ON,2097152
+15,Android.Views.MetaKeyStates,ScrollLockOn,android/view/KeyEvent.META_SCROLL_LOCK_ON,4194304
+10,Android.Views.MetaKeyStates,ShiftLeftOn,android/view/KeyEvent.META_SHIFT_LEFT_ON,64
+15,Android.Views.MetaKeyStates,ShiftMask,android/view/KeyEvent.META_SHIFT_MASK,193
+10,Android.Views.MetaKeyStates,ShiftOn,android/view/KeyEvent.META_SHIFT_ON,1
+10,Android.Views.MetaKeyStates,ShiftRightOn,android/view/KeyEvent.META_SHIFT_RIGHT_ON,128
+10,Android.Views.MetaKeyStates,SymOn,android/view/KeyEvent.META_SYM_ON,4
+10,Android.Views.MenuCategory,Alternative,I:android/view/Menu.CATEGORY_ALTERNATIVE,262144
+10,Android.Views.MenuCategory,Container,I:android/view/Menu.CATEGORY_CONTAINER,65536
+10,Android.Views.MenuCategory,Secondary,I:android/view/Menu.CATEGORY_SECONDARY,196608
+10,Android.Views.MenuCategory,System,I:android/view/Menu.CATEGORY_SYSTEM,131072
 0,Android.Views.MenuPerformFlags,None,,0
-1,Android.Views.MenuPerformFlags,AlwaysPerformClose,I:android/view/Menu.FLAG_ALWAYS_PERFORM_CLOSE,2
-1,Android.Views.MenuPerformFlags,PerformNoClose,I:android/view/Menu.FLAG_PERFORM_NO_CLOSE,1
-11,Android.Views.ShowAsAction,Always,I:android/view/MenuItem.SHOW_AS_ACTION_ALWAYS,2
-14,Android.Views.ShowAsAction,CollapseActionView,I:android/view/MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW,8
-11,Android.Views.ShowAsAction,IfRoom,I:android/view/MenuItem.SHOW_AS_ACTION_IF_ROOM,1
-11,Android.Views.ShowAsAction,Never,I:android/view/MenuItem.SHOW_AS_ACTION_NEVER,0
-11,Android.Views.ShowAsAction,WithText,I:android/view/MenuItem.SHOW_AS_ACTION_WITH_TEXT,4
+10,Android.Views.MenuPerformFlags,AlwaysPerformClose,I:android/view/Menu.FLAG_ALWAYS_PERFORM_CLOSE,2
+10,Android.Views.MenuPerformFlags,PerformNoClose,I:android/view/Menu.FLAG_PERFORM_NO_CLOSE,1
+15,Android.Views.ShowAsAction,Always,I:android/view/MenuItem.SHOW_AS_ACTION_ALWAYS,2
+15,Android.Views.ShowAsAction,CollapseActionView,I:android/view/MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW,8
+15,Android.Views.ShowAsAction,IfRoom,I:android/view/MenuItem.SHOW_AS_ACTION_IF_ROOM,1
+15,Android.Views.ShowAsAction,Never,I:android/view/MenuItem.SHOW_AS_ACTION_NEVER,0
+15,Android.Views.ShowAsAction,WithText,I:android/view/MenuItem.SHOW_AS_ACTION_WITH_TEXT,4
 23,Android.Views.MotionEventActions,ButtonPress,android/view/MotionEvent.ACTION_BUTTON_PRESS,11
 23,Android.Views.MotionEventActions,ButtonRelease,android/view/MotionEvent.ACTION_BUTTON_RELEASE,12
-1,Android.Views.MotionEventActions,Cancel,android/view/MotionEvent.ACTION_CANCEL,3
-1,Android.Views.MotionEventActions,Down,android/view/MotionEvent.ACTION_DOWN,0
-14,Android.Views.MotionEventActions,HoverEnter,android/view/MotionEvent.ACTION_HOVER_ENTER,9
-14,Android.Views.MotionEventActions,HoverExit,android/view/MotionEvent.ACTION_HOVER_EXIT,10
-12,Android.Views.MotionEventActions,HoverMove,android/view/MotionEvent.ACTION_HOVER_MOVE,7
-5,Android.Views.MotionEventActions,Mask,android/view/MotionEvent.ACTION_MASK,255
-1,Android.Views.MotionEventActions,Move,android/view/MotionEvent.ACTION_MOVE,2
-3,Android.Views.MotionEventActions,Outside,android/view/MotionEvent.ACTION_OUTSIDE,4
-5,Android.Views.MotionEventActions,Pointer1Down,android/view/MotionEvent.ACTION_POINTER_1_DOWN,5
-5,Android.Views.MotionEventActions,Pointer1Up,android/view/MotionEvent.ACTION_POINTER_1_UP,6
-5,Android.Views.MotionEventActions,Pointer2Down,android/view/MotionEvent.ACTION_POINTER_2_DOWN,261
-5,Android.Views.MotionEventActions,Pointer2Up,android/view/MotionEvent.ACTION_POINTER_2_UP,262
-5,Android.Views.MotionEventActions,Pointer3Down,android/view/MotionEvent.ACTION_POINTER_3_DOWN,517
-5,Android.Views.MotionEventActions,Pointer3Up,android/view/MotionEvent.ACTION_POINTER_3_UP,518
-5,Android.Views.MotionEventActions,PointerDown,android/view/MotionEvent.ACTION_POINTER_DOWN,5
-5,Android.Views.MotionEventActions,PointerIdMask,android/view/MotionEvent.ACTION_POINTER_ID_MASK,65280
-5,Android.Views.MotionEventActions,PointerIdShift,android/view/MotionEvent.ACTION_POINTER_ID_SHIFT,8
-8,Android.Views.MotionEventActions,PointerIndexMask,android/view/MotionEvent.ACTION_POINTER_INDEX_MASK,65280
-8,Android.Views.MotionEventActions,PointerIndexShift,android/view/MotionEvent.ACTION_POINTER_INDEX_SHIFT,8
-5,Android.Views.MotionEventActions,PointerUp,android/view/MotionEvent.ACTION_POINTER_UP,6
-12,Android.Views.MotionEventActions,Scroll,android/view/MotionEvent.ACTION_SCROLL,8
-1,Android.Views.MotionEventActions,Up,android/view/MotionEvent.ACTION_UP,1
-12,Android.Views.Axis,Brake,android/view/MotionEvent.AXIS_BRAKE,23
-14,Android.Views.Axis,Distance,android/view/MotionEvent.AXIS_DISTANCE,24
-12,Android.Views.Axis,Gas,android/view/MotionEvent.AXIS_GAS,22
-12,Android.Views.Axis,Generic1,android/view/MotionEvent.AXIS_GENERIC_1,32
-12,Android.Views.Axis,Generic10,android/view/MotionEvent.AXIS_GENERIC_10,41
-12,Android.Views.Axis,Generic11,android/view/MotionEvent.AXIS_GENERIC_11,42
-12,Android.Views.Axis,Generic12,android/view/MotionEvent.AXIS_GENERIC_12,43
-12,Android.Views.Axis,Generic13,android/view/MotionEvent.AXIS_GENERIC_13,44
-12,Android.Views.Axis,Generic14,android/view/MotionEvent.AXIS_GENERIC_14,45
-12,Android.Views.Axis,Generic15,android/view/MotionEvent.AXIS_GENERIC_15,46
-12,Android.Views.Axis,Generic16,android/view/MotionEvent.AXIS_GENERIC_16,47
-12,Android.Views.Axis,Generic2,android/view/MotionEvent.AXIS_GENERIC_2,33
-12,Android.Views.Axis,Generic3,android/view/MotionEvent.AXIS_GENERIC_3,34
-12,Android.Views.Axis,Generic4,android/view/MotionEvent.AXIS_GENERIC_4,35
-12,Android.Views.Axis,Generic5,android/view/MotionEvent.AXIS_GENERIC_5,36
-12,Android.Views.Axis,Generic6,android/view/MotionEvent.AXIS_GENERIC_6,37
-12,Android.Views.Axis,Generic7,android/view/MotionEvent.AXIS_GENERIC_7,38
-12,Android.Views.Axis,Generic8,android/view/MotionEvent.AXIS_GENERIC_8,39
-12,Android.Views.Axis,Generic9,android/view/MotionEvent.AXIS_GENERIC_9,40
-12,Android.Views.Axis,HatX,android/view/MotionEvent.AXIS_HAT_X,15
-12,Android.Views.Axis,HatY,android/view/MotionEvent.AXIS_HAT_Y,16
-12,Android.Views.Axis,Hscroll,android/view/MotionEvent.AXIS_HSCROLL,10
-12,Android.Views.Axis,Ltrigger,android/view/MotionEvent.AXIS_LTRIGGER,17
-12,Android.Views.Axis,Orientation,android/view/MotionEvent.AXIS_ORIENTATION,8
-12,Android.Views.Axis,Pressure,android/view/MotionEvent.AXIS_PRESSURE,2
+10,Android.Views.MotionEventActions,Cancel,android/view/MotionEvent.ACTION_CANCEL,3
+10,Android.Views.MotionEventActions,Down,android/view/MotionEvent.ACTION_DOWN,0
+15,Android.Views.MotionEventActions,HoverEnter,android/view/MotionEvent.ACTION_HOVER_ENTER,9
+15,Android.Views.MotionEventActions,HoverExit,android/view/MotionEvent.ACTION_HOVER_EXIT,10
+15,Android.Views.MotionEventActions,HoverMove,android/view/MotionEvent.ACTION_HOVER_MOVE,7
+10,Android.Views.MotionEventActions,Mask,android/view/MotionEvent.ACTION_MASK,255
+10,Android.Views.MotionEventActions,Move,android/view/MotionEvent.ACTION_MOVE,2
+10,Android.Views.MotionEventActions,Outside,android/view/MotionEvent.ACTION_OUTSIDE,4
+10,Android.Views.MotionEventActions,Pointer1Down,android/view/MotionEvent.ACTION_POINTER_1_DOWN,5
+10,Android.Views.MotionEventActions,Pointer1Up,android/view/MotionEvent.ACTION_POINTER_1_UP,6
+10,Android.Views.MotionEventActions,Pointer2Down,android/view/MotionEvent.ACTION_POINTER_2_DOWN,261
+10,Android.Views.MotionEventActions,Pointer2Up,android/view/MotionEvent.ACTION_POINTER_2_UP,262
+10,Android.Views.MotionEventActions,Pointer3Down,android/view/MotionEvent.ACTION_POINTER_3_DOWN,517
+10,Android.Views.MotionEventActions,Pointer3Up,android/view/MotionEvent.ACTION_POINTER_3_UP,518
+10,Android.Views.MotionEventActions,PointerDown,android/view/MotionEvent.ACTION_POINTER_DOWN,5
+10,Android.Views.MotionEventActions,PointerIdMask,android/view/MotionEvent.ACTION_POINTER_ID_MASK,65280
+10,Android.Views.MotionEventActions,PointerIdShift,android/view/MotionEvent.ACTION_POINTER_ID_SHIFT,8
+10,Android.Views.MotionEventActions,PointerIndexMask,android/view/MotionEvent.ACTION_POINTER_INDEX_MASK,65280
+10,Android.Views.MotionEventActions,PointerIndexShift,android/view/MotionEvent.ACTION_POINTER_INDEX_SHIFT,8
+10,Android.Views.MotionEventActions,PointerUp,android/view/MotionEvent.ACTION_POINTER_UP,6
+15,Android.Views.MotionEventActions,Scroll,android/view/MotionEvent.ACTION_SCROLL,8
+10,Android.Views.MotionEventActions,Up,android/view/MotionEvent.ACTION_UP,1
+15,Android.Views.Axis,Brake,android/view/MotionEvent.AXIS_BRAKE,23
+15,Android.Views.Axis,Distance,android/view/MotionEvent.AXIS_DISTANCE,24
+15,Android.Views.Axis,Gas,android/view/MotionEvent.AXIS_GAS,22
+15,Android.Views.Axis,Generic1,android/view/MotionEvent.AXIS_GENERIC_1,32
+15,Android.Views.Axis,Generic10,android/view/MotionEvent.AXIS_GENERIC_10,41
+15,Android.Views.Axis,Generic11,android/view/MotionEvent.AXIS_GENERIC_11,42
+15,Android.Views.Axis,Generic12,android/view/MotionEvent.AXIS_GENERIC_12,43
+15,Android.Views.Axis,Generic13,android/view/MotionEvent.AXIS_GENERIC_13,44
+15,Android.Views.Axis,Generic14,android/view/MotionEvent.AXIS_GENERIC_14,45
+15,Android.Views.Axis,Generic15,android/view/MotionEvent.AXIS_GENERIC_15,46
+15,Android.Views.Axis,Generic16,android/view/MotionEvent.AXIS_GENERIC_16,47
+15,Android.Views.Axis,Generic2,android/view/MotionEvent.AXIS_GENERIC_2,33
+15,Android.Views.Axis,Generic3,android/view/MotionEvent.AXIS_GENERIC_3,34
+15,Android.Views.Axis,Generic4,android/view/MotionEvent.AXIS_GENERIC_4,35
+15,Android.Views.Axis,Generic5,android/view/MotionEvent.AXIS_GENERIC_5,36
+15,Android.Views.Axis,Generic6,android/view/MotionEvent.AXIS_GENERIC_6,37
+15,Android.Views.Axis,Generic7,android/view/MotionEvent.AXIS_GENERIC_7,38
+15,Android.Views.Axis,Generic8,android/view/MotionEvent.AXIS_GENERIC_8,39
+15,Android.Views.Axis,Generic9,android/view/MotionEvent.AXIS_GENERIC_9,40
+15,Android.Views.Axis,HatX,android/view/MotionEvent.AXIS_HAT_X,15
+15,Android.Views.Axis,HatY,android/view/MotionEvent.AXIS_HAT_Y,16
+15,Android.Views.Axis,Hscroll,android/view/MotionEvent.AXIS_HSCROLL,10
+15,Android.Views.Axis,Ltrigger,android/view/MotionEvent.AXIS_LTRIGGER,17
+15,Android.Views.Axis,Orientation,android/view/MotionEvent.AXIS_ORIENTATION,8
+15,Android.Views.Axis,Pressure,android/view/MotionEvent.AXIS_PRESSURE,2
 24,Android.Views.Axis,RelativeX,android/view/MotionEvent.AXIS_RELATIVE_X,27
 24,Android.Views.Axis,RelativeY,android/view/MotionEvent.AXIS_RELATIVE_Y,28
-12,Android.Views.Axis,Rtrigger,android/view/MotionEvent.AXIS_RTRIGGER,18
-12,Android.Views.Axis,Rudder,android/view/MotionEvent.AXIS_RUDDER,20
-12,Android.Views.Axis,Rx,android/view/MotionEvent.AXIS_RX,12
-12,Android.Views.Axis,Ry,android/view/MotionEvent.AXIS_RY,13
-12,Android.Views.Axis,Rz,android/view/MotionEvent.AXIS_RZ,14
+15,Android.Views.Axis,Rtrigger,android/view/MotionEvent.AXIS_RTRIGGER,18
+15,Android.Views.Axis,Rudder,android/view/MotionEvent.AXIS_RUDDER,20
+15,Android.Views.Axis,Rx,android/view/MotionEvent.AXIS_RX,12
+15,Android.Views.Axis,Ry,android/view/MotionEvent.AXIS_RY,13
+15,Android.Views.Axis,Rz,android/view/MotionEvent.AXIS_RZ,14
 26,Android.Views.Axis,Scroll,android/view/MotionEvent.AXIS_SCROLL,26
-12,Android.Views.Axis,Size,android/view/MotionEvent.AXIS_SIZE,3
-12,Android.Views.Axis,Throttle,android/view/MotionEvent.AXIS_THROTTLE,19
-14,Android.Views.Axis,Tilt,android/view/MotionEvent.AXIS_TILT,25
-12,Android.Views.Axis,ToolMajor,android/view/MotionEvent.AXIS_TOOL_MAJOR,6
-12,Android.Views.Axis,ToolMinor,android/view/MotionEvent.AXIS_TOOL_MINOR,7
-12,Android.Views.Axis,TouchMajor,android/view/MotionEvent.AXIS_TOUCH_MAJOR,4
-12,Android.Views.Axis,TouchMinor,android/view/MotionEvent.AXIS_TOUCH_MINOR,5
-12,Android.Views.Axis,Vscroll,android/view/MotionEvent.AXIS_VSCROLL,9
-12,Android.Views.Axis,Wheel,android/view/MotionEvent.AXIS_WHEEL,21
-12,Android.Views.Axis,X,android/view/MotionEvent.AXIS_X,0
-12,Android.Views.Axis,Y,android/view/MotionEvent.AXIS_Y,1
-12,Android.Views.Axis,Z,android/view/MotionEvent.AXIS_Z,11
-1,Android.Views.Edge,Bottom,android/view/MotionEvent.EDGE_BOTTOM,2
-1,Android.Views.Edge,Left,android/view/MotionEvent.EDGE_LEFT,4
-1,Android.Views.Edge,Right,android/view/MotionEvent.EDGE_RIGHT,8
-1,Android.Views.Edge,Top,android/view/MotionEvent.EDGE_TOP,1
-8,Android.Views.WindowManagerFlags,AllowLockWhileScreenOn,android/view/WindowManager$LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON,1
-3,Android.Views.WindowManagerFlags,AltFocusableIm,android/view/WindowManager$LayoutParams.FLAG_ALT_FOCUSABLE_IM,131072
-1,Android.Views.WindowManagerFlags,BlurBehind,android/view/WindowManager$LayoutParams.FLAG_BLUR_BEHIND,4
-1,Android.Views.WindowManagerFlags,DimBehind,android/view/WindowManager$LayoutParams.FLAG_DIM_BEHIND,2
-5,Android.Views.WindowManagerFlags,DismissKeyguard,android/view/WindowManager$LayoutParams.FLAG_DISMISS_KEYGUARD,4194304
-1,Android.Views.WindowManagerFlags,Dither,android/view/WindowManager$LayoutParams.FLAG_DITHER,4096
+15,Android.Views.Axis,Size,android/view/MotionEvent.AXIS_SIZE,3
+15,Android.Views.Axis,Throttle,android/view/MotionEvent.AXIS_THROTTLE,19
+15,Android.Views.Axis,Tilt,android/view/MotionEvent.AXIS_TILT,25
+15,Android.Views.Axis,ToolMajor,android/view/MotionEvent.AXIS_TOOL_MAJOR,6
+15,Android.Views.Axis,ToolMinor,android/view/MotionEvent.AXIS_TOOL_MINOR,7
+15,Android.Views.Axis,TouchMajor,android/view/MotionEvent.AXIS_TOUCH_MAJOR,4
+15,Android.Views.Axis,TouchMinor,android/view/MotionEvent.AXIS_TOUCH_MINOR,5
+15,Android.Views.Axis,Vscroll,android/view/MotionEvent.AXIS_VSCROLL,9
+15,Android.Views.Axis,Wheel,android/view/MotionEvent.AXIS_WHEEL,21
+15,Android.Views.Axis,X,android/view/MotionEvent.AXIS_X,0
+15,Android.Views.Axis,Y,android/view/MotionEvent.AXIS_Y,1
+15,Android.Views.Axis,Z,android/view/MotionEvent.AXIS_Z,11
+10,Android.Views.Edge,Bottom,android/view/MotionEvent.EDGE_BOTTOM,2
+10,Android.Views.Edge,Left,android/view/MotionEvent.EDGE_LEFT,4
+10,Android.Views.Edge,Right,android/view/MotionEvent.EDGE_RIGHT,8
+10,Android.Views.Edge,Top,android/view/MotionEvent.EDGE_TOP,1
+10,Android.Views.WindowManagerFlags,AllowLockWhileScreenOn,android/view/WindowManager$LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON,1
+10,Android.Views.WindowManagerFlags,AltFocusableIm,android/view/WindowManager$LayoutParams.FLAG_ALT_FOCUSABLE_IM,131072
+10,Android.Views.WindowManagerFlags,BlurBehind,android/view/WindowManager$LayoutParams.FLAG_BLUR_BEHIND,4
+10,Android.Views.WindowManagerFlags,DimBehind,android/view/WindowManager$LayoutParams.FLAG_DIM_BEHIND,2
+10,Android.Views.WindowManagerFlags,DismissKeyguard,android/view/WindowManager$LayoutParams.FLAG_DISMISS_KEYGUARD,4194304
+10,Android.Views.WindowManagerFlags,Dither,android/view/WindowManager$LayoutParams.FLAG_DITHER,4096
 21,Android.Views.WindowManagerFlags,DrawsSystemBarBackgrounds,android/view/WindowManager$LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS,-2147483648
-1,Android.Views.WindowManagerFlags,ForceNotFullscreen,android/view/WindowManager$LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,2048
-1,Android.Views.WindowManagerFlags,Fullscreen,android/view/WindowManager$LayoutParams.FLAG_FULLSCREEN,1024
-11,Android.Views.WindowManagerFlags,HardwareAccelerated,android/view/WindowManager$LayoutParams.FLAG_HARDWARE_ACCELERATED,16777216
-1,Android.Views.WindowManagerFlags,IgnoreCheekPresses,android/view/WindowManager$LayoutParams.FLAG_IGNORE_CHEEK_PRESSES,32768
-1,Android.Views.WindowManagerFlags,KeepScreenOn,android/view/WindowManager$LayoutParams.FLAG_KEEP_SCREEN_ON,128
+10,Android.Views.WindowManagerFlags,ForceNotFullscreen,android/view/WindowManager$LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,2048
+10,Android.Views.WindowManagerFlags,Fullscreen,android/view/WindowManager$LayoutParams.FLAG_FULLSCREEN,1024
+15,Android.Views.WindowManagerFlags,HardwareAccelerated,android/view/WindowManager$LayoutParams.FLAG_HARDWARE_ACCELERATED,16777216
+10,Android.Views.WindowManagerFlags,IgnoreCheekPresses,android/view/WindowManager$LayoutParams.FLAG_IGNORE_CHEEK_PRESSES,32768
+10,Android.Views.WindowManagerFlags,KeepScreenOn,android/view/WindowManager$LayoutParams.FLAG_KEEP_SCREEN_ON,128
 22,Android.Views.WindowManagerFlags,LayoutAttachedInDecor,android/view/WindowManager$LayoutParams.FLAG_LAYOUT_ATTACHED_IN_DECOR,1073741824
-1,Android.Views.WindowManagerFlags,LayoutInsetDecor,android/view/WindowManager$LayoutParams.FLAG_LAYOUT_INSET_DECOR,65536
 18,Android.Views.WindowManagerFlags,LayoutInOverscan,android/view/WindowManager$LayoutParams.FLAG_LAYOUT_IN_OVERSCAN,33554432
-1,Android.Views.WindowManagerFlags,LayoutInScreen,android/view/WindowManager$LayoutParams.FLAG_LAYOUT_IN_SCREEN,256
-1,Android.Views.WindowManagerFlags,LayoutNoLimits,android/view/WindowManager$LayoutParams.FLAG_LAYOUT_NO_LIMITS,512
+10,Android.Views.WindowManagerFlags,LayoutInScreen,android/view/WindowManager$LayoutParams.FLAG_LAYOUT_IN_SCREEN,256
+10,Android.Views.WindowManagerFlags,LayoutInsetDecor,android/view/WindowManager$LayoutParams.FLAG_LAYOUT_INSET_DECOR,65536
+10,Android.Views.WindowManagerFlags,LayoutNoLimits,android/view/WindowManager$LayoutParams.FLAG_LAYOUT_NO_LIMITS,512
 19,Android.Views.WindowManagerFlags,LocalFocusMode,android/view/WindowManager$LayoutParams.FLAG_LOCAL_FOCUS_MODE,268435456
-1,Android.Views.WindowManagerFlags,NotFocusable,android/view/WindowManager$LayoutParams.FLAG_NOT_FOCUSABLE,8
-1,Android.Views.WindowManagerFlags,NotTouchable,android/view/WindowManager$LayoutParams.FLAG_NOT_TOUCHABLE,16
-1,Android.Views.WindowManagerFlags,NotTouchModal,android/view/WindowManager$LayoutParams.FLAG_NOT_TOUCH_MODAL,32
-1,Android.Views.WindowManagerFlags,Scaled,android/view/WindowManager$LayoutParams.FLAG_SCALED,16384
-1,Android.Views.WindowManagerFlags,Secure,android/view/WindowManager$LayoutParams.FLAG_SECURE,8192
-5,Android.Views.WindowManagerFlags,ShowWallpaper,android/view/WindowManager$LayoutParams.FLAG_SHOW_WALLPAPER,1048576
-5,Android.Views.WindowManagerFlags,ShowWhenLocked,android/view/WindowManager$LayoutParams.FLAG_SHOW_WHEN_LOCKED,524288
-11,Android.Views.WindowManagerFlags,SplitTouch,android/view/WindowManager$LayoutParams.FLAG_SPLIT_TOUCH,8388608
-1,Android.Views.WindowManagerFlags,TouchableWhenWaking,android/view/WindowManager$LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING,64
+10,Android.Views.WindowManagerFlags,NotFocusable,android/view/WindowManager$LayoutParams.FLAG_NOT_FOCUSABLE,8
+10,Android.Views.WindowManagerFlags,NotTouchModal,android/view/WindowManager$LayoutParams.FLAG_NOT_TOUCH_MODAL,32
+10,Android.Views.WindowManagerFlags,NotTouchable,android/view/WindowManager$LayoutParams.FLAG_NOT_TOUCHABLE,16
+10,Android.Views.WindowManagerFlags,Scaled,android/view/WindowManager$LayoutParams.FLAG_SCALED,16384
+10,Android.Views.WindowManagerFlags,Secure,android/view/WindowManager$LayoutParams.FLAG_SECURE,8192
+10,Android.Views.WindowManagerFlags,ShowWallpaper,android/view/WindowManager$LayoutParams.FLAG_SHOW_WALLPAPER,1048576
+10,Android.Views.WindowManagerFlags,ShowWhenLocked,android/view/WindowManager$LayoutParams.FLAG_SHOW_WHEN_LOCKED,524288
+15,Android.Views.WindowManagerFlags,SplitTouch,android/view/WindowManager$LayoutParams.FLAG_SPLIT_TOUCH,8388608
+10,Android.Views.WindowManagerFlags,TouchableWhenWaking,android/view/WindowManager$LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING,64
 19,Android.Views.WindowManagerFlags,TranslucentNavigation,android/view/WindowManager$LayoutParams.FLAG_TRANSLUCENT_NAVIGATION,134217728
 19,Android.Views.WindowManagerFlags,TranslucentStatus,android/view/WindowManager$LayoutParams.FLAG_TRANSLUCENT_STATUS,67108864
-5,Android.Views.WindowManagerFlags,TurnScreenOn,android/view/WindowManager$LayoutParams.FLAG_TURN_SCREEN_ON,2097152
-3,Android.Views.WindowManagerFlags,WatchOutsideTouch,android/view/WindowManager$LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH,262144
-1,Android.Views.MemoryType,Gpu,android/view/WindowManager$LayoutParams.MEMORY_TYPE_GPU,2
-1,Android.Views.MemoryType,Hardware,android/view/WindowManager$LayoutParams.MEMORY_TYPE_HARDWARE,1
-1,Android.Views.MemoryType,Normal,android/view/WindowManager$LayoutParams.MEMORY_TYPE_NORMAL,0
-1,Android.Views.MemoryType,PushBuffers,android/view/WindowManager$LayoutParams.MEMORY_TYPE_PUSH_BUFFERS,3
-11,Android.Views.SoftInput,AdjustNothing,android/view/WindowManager$LayoutParams.SOFT_INPUT_ADJUST_NOTHING,48
-3,Android.Views.SoftInput,AdjustPan,android/view/WindowManager$LayoutParams.SOFT_INPUT_ADJUST_PAN,32
-3,Android.Views.SoftInput,AdjustResize,android/view/WindowManager$LayoutParams.SOFT_INPUT_ADJUST_RESIZE,16
-3,Android.Views.SoftInput,AdjustUnspecified,android/view/WindowManager$LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED,0
-3,Android.Views.SoftInput,IsForwardNavigation,android/view/WindowManager$LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION,256
-3,Android.Views.SoftInput,MaskAdjust,android/view/WindowManager$LayoutParams.SOFT_INPUT_MASK_ADJUST,240
-3,Android.Views.SoftInput,MaskState,android/view/WindowManager$LayoutParams.SOFT_INPUT_MASK_STATE,15
-3,Android.Views.SoftInput,StateAlwaysHidden,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN,3
-3,Android.Views.SoftInput,StateAlwaysVisible,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE,5
-3,Android.Views.SoftInput,StateHidden,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_HIDDEN,2
-3,Android.Views.SoftInput,StateUnchanged,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_UNCHANGED,1
-3,Android.Views.SoftInput,StateUnspecified,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED,0
-3,Android.Views.SoftInput,StateVisible,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_VISIBLE,4
+10,Android.Views.WindowManagerFlags,TurnScreenOn,android/view/WindowManager$LayoutParams.FLAG_TURN_SCREEN_ON,2097152
+10,Android.Views.WindowManagerFlags,WatchOutsideTouch,android/view/WindowManager$LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH,262144
+10,Android.Views.MemoryType,Gpu,android/view/WindowManager$LayoutParams.MEMORY_TYPE_GPU,2
+10,Android.Views.MemoryType,Hardware,android/view/WindowManager$LayoutParams.MEMORY_TYPE_HARDWARE,1
+10,Android.Views.MemoryType,Normal,android/view/WindowManager$LayoutParams.MEMORY_TYPE_NORMAL,0
+10,Android.Views.MemoryType,PushBuffers,android/view/WindowManager$LayoutParams.MEMORY_TYPE_PUSH_BUFFERS,3
+15,Android.Views.SoftInput,AdjustNothing,android/view/WindowManager$LayoutParams.SOFT_INPUT_ADJUST_NOTHING,48
+10,Android.Views.SoftInput,AdjustPan,android/view/WindowManager$LayoutParams.SOFT_INPUT_ADJUST_PAN,32
+10,Android.Views.SoftInput,AdjustResize,android/view/WindowManager$LayoutParams.SOFT_INPUT_ADJUST_RESIZE,16
+10,Android.Views.SoftInput,AdjustUnspecified,android/view/WindowManager$LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED,0
+10,Android.Views.SoftInput,IsForwardNavigation,android/view/WindowManager$LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION,256
+10,Android.Views.SoftInput,MaskAdjust,android/view/WindowManager$LayoutParams.SOFT_INPUT_MASK_ADJUST,240
+10,Android.Views.SoftInput,MaskState,android/view/WindowManager$LayoutParams.SOFT_INPUT_MASK_STATE,15
+10,Android.Views.SoftInput,StateAlwaysHidden,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN,3
+10,Android.Views.SoftInput,StateAlwaysVisible,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE,5
+10,Android.Views.SoftInput,StateHidden,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_HIDDEN,2
+10,Android.Views.SoftInput,StateUnchanged,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_UNCHANGED,1
+10,Android.Views.SoftInput,StateUnspecified,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED,0
+10,Android.Views.SoftInput,StateVisible,android/view/WindowManager$LayoutParams.SOFT_INPUT_STATE_VISIBLE,4
 22,Android.Views.WindowManagerTypes,AccessibilityOverlay,android/view/WindowManager$LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,2032
-1,Android.Views.WindowManagerTypes,Application,android/view/WindowManager$LayoutParams.TYPE_APPLICATION,2
-3,Android.Views.WindowManagerTypes,ApplicationAttachedDialog,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG,1003
-1,Android.Views.WindowManagerTypes,ApplicationMedia,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_MEDIA,1001
+10,Android.Views.WindowManagerTypes,Application,android/view/WindowManager$LayoutParams.TYPE_APPLICATION,2
+10,Android.Views.WindowManagerTypes,ApplicationAttachedDialog,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG,1003
+10,Android.Views.WindowManagerTypes,ApplicationMedia,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_MEDIA,1001
 26,Android.Views.WindowManagerTypes,ApplicationOverlay,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_OVERLAY,2038
-1,Android.Views.WindowManagerTypes,ApplicationPanel,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_PANEL,1000
-1,Android.Views.WindowManagerTypes,ApplicationStarting,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_STARTING,3
-1,Android.Views.WindowManagerTypes,ApplicationSubPanel,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_SUB_PANEL,1002
-1,Android.Views.WindowManagerTypes,BaseApplication,android/view/WindowManager$LayoutParams.TYPE_BASE_APPLICATION,1
+10,Android.Views.WindowManagerTypes,ApplicationPanel,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_PANEL,1000
+10,Android.Views.WindowManagerTypes,ApplicationStarting,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_STARTING,3
+10,Android.Views.WindowManagerTypes,ApplicationSubPanel,android/view/WindowManager$LayoutParams.TYPE_APPLICATION_SUB_PANEL,1002
+10,Android.Views.WindowManagerTypes,BaseApplication,android/view/WindowManager$LayoutParams.TYPE_BASE_APPLICATION,1
 25,Android.Views.WindowManagerTypes,DrawnApplication,android/view/WindowManager$LayoutParams.TYPE_DRAWN_APPLICATION,4
-3,Android.Views.WindowManagerTypes,InputMethod,android/view/WindowManager$LayoutParams.TYPE_INPUT_METHOD,2011
-3,Android.Views.WindowManagerTypes,InputMethodDialog,android/view/WindowManager$LayoutParams.TYPE_INPUT_METHOD_DIALOG,2012
-1,Android.Views.WindowManagerTypes,KeyguardDialog,android/view/WindowManager$LayoutParams.TYPE_KEYGUARD_DIALOG,2009
-1,Android.Views.WindowManagerTypes,Phone,android/view/WindowManager$LayoutParams.TYPE_PHONE,2002
-1,Android.Views.WindowManagerTypes,PriorityPhone,android/view/WindowManager$LayoutParams.TYPE_PRIORITY_PHONE,2007
+10,Android.Views.WindowManagerTypes,InputMethod,android/view/WindowManager$LayoutParams.TYPE_INPUT_METHOD,2011
+10,Android.Views.WindowManagerTypes,InputMethodDialog,android/view/WindowManager$LayoutParams.TYPE_INPUT_METHOD_DIALOG,2012
+10,Android.Views.WindowManagerTypes,Keyguard,android/view/WindowManager$LayoutParams.TYPE_KEYGUARD,2004
+10,Android.Views.WindowManagerTypes,KeyguardDialog,android/view/WindowManager$LayoutParams.TYPE_KEYGUARD_DIALOG,2009
+10,Android.Views.WindowManagerTypes,Phone,android/view/WindowManager$LayoutParams.TYPE_PHONE,2002
+10,Android.Views.WindowManagerTypes,PriorityPhone,android/view/WindowManager$LayoutParams.TYPE_PRIORITY_PHONE,2007
 19,Android.Views.WindowManagerTypes,PrivatePresentation,android/view/WindowManager$LayoutParams.TYPE_PRIVATE_PRESENTATION,2030
-1,Android.Views.WindowManagerTypes,SearchBar,android/view/WindowManager$LayoutParams.TYPE_SEARCH_BAR,2001
-1,Android.Views.WindowManagerTypes,StatusBar,android/view/WindowManager$LayoutParams.TYPE_STATUS_BAR,2000
-1,Android.Views.WindowManagerTypes,StatusBarPanel,android/view/WindowManager$LayoutParams.TYPE_STATUS_BAR_PANEL,2014
-1,Android.Views.WindowManagerTypes,SystemAlert,android/view/WindowManager$LayoutParams.TYPE_SYSTEM_ALERT,2003
-1,Android.Views.WindowManagerTypes,SystemDialog,android/view/WindowManager$LayoutParams.TYPE_SYSTEM_DIALOG,2008
-1,Android.Views.WindowManagerTypes,SystemError,android/view/WindowManager$LayoutParams.TYPE_SYSTEM_ERROR,2010
-1,Android.Views.WindowManagerTypes,SystemOverlay,android/view/WindowManager$LayoutParams.TYPE_SYSTEM_OVERLAY,2006
-1,Android.Views.WindowManagerTypes,Toast,android/view/WindowManager$LayoutParams.TYPE_TOAST,2005
-5,Android.Views.WindowManagerTypes,Wallpaper,android/view/WindowManager$LayoutParams.TYPE_WALLPAPER,2013
+10,Android.Views.WindowManagerTypes,SearchBar,android/view/WindowManager$LayoutParams.TYPE_SEARCH_BAR,2001
+10,Android.Views.WindowManagerTypes,StatusBar,android/view/WindowManager$LayoutParams.TYPE_STATUS_BAR,2000
+10,Android.Views.WindowManagerTypes,StatusBarPanel,android/view/WindowManager$LayoutParams.TYPE_STATUS_BAR_PANEL,2014
+10,Android.Views.WindowManagerTypes,SystemAlert,android/view/WindowManager$LayoutParams.TYPE_SYSTEM_ALERT,2003
+10,Android.Views.WindowManagerTypes,SystemDialog,android/view/WindowManager$LayoutParams.TYPE_SYSTEM_DIALOG,2008
+10,Android.Views.WindowManagerTypes,SystemError,android/view/WindowManager$LayoutParams.TYPE_SYSTEM_ERROR,2010
+10,Android.Views.WindowManagerTypes,SystemOverlay,android/view/WindowManager$LayoutParams.TYPE_SYSTEM_OVERLAY,2006
+10,Android.Views.WindowManagerTypes,Toast,android/view/WindowManager$LayoutParams.TYPE_TOAST,2005
+10,Android.Views.WindowManagerTypes,Wallpaper,android/view/WindowManager$LayoutParams.TYPE_WALLPAPER,2013
 0,Android.Views.InputMethods.CursorAnchorFlags,None,,0
 21,Android.Views.InputMethods.CursorAnchorFlags,HasInvisibleRegion,android/view/inputmethod/CursorAnchorInfo.FLAG_HAS_INVISIBLE_REGION,2
 21,Android.Views.InputMethods.CursorAnchorFlags,HasVisibleRegion,android/view/inputmethod/CursorAnchorInfo.FLAG_HAS_VISIBLE_REGION,1
@@ -2448,209 +2412,212 @@
 21,Android.Views.InputMethods.CursorUpdate,Immediate,I:android/view/inputmethod/InputConnection.CURSOR_UPDATE_IMMEDIATE,1
 21,Android.Views.InputMethods.CursorUpdate,Monitor,I:android/view/inputmethod/InputConnection.CURSOR_UPDATE_MONITOR,2
 0,Android.Views.InputMethods.HideSoftInputFlags,None,,0
-3,Android.Views.InputMethods.HideSoftInputFlags,ImplicitOnly,android/view/inputmethod/InputMethodManager.HIDE_IMPLICIT_ONLY,1
-3,Android.Views.InputMethods.HideSoftInputFlags,NotAlways,android/view/inputmethod/InputMethodManager.HIDE_NOT_ALWAYS,2
-3,Android.Views.InputMethods.InputMethodResults,Hidden,android/view/inputmethod/InputMethodManager.RESULT_HIDDEN,3
-3,Android.Views.InputMethods.InputMethodResults,Shown,android/view/inputmethod/InputMethodManager.RESULT_SHOWN,2
-3,Android.Views.InputMethods.InputMethodResults,UnchangedHidden,android/view/inputmethod/InputMethodManager.RESULT_UNCHANGED_HIDDEN,1
-3,Android.Views.InputMethods.InputMethodResults,UnchangedShown,android/view/inputmethod/InputMethodManager.RESULT_UNCHANGED_SHOWN,0
+10,Android.Views.InputMethods.HideSoftInputFlags,ImplicitOnly,android/view/inputmethod/InputMethodManager.HIDE_IMPLICIT_ONLY,1
+10,Android.Views.InputMethods.HideSoftInputFlags,NotAlways,android/view/inputmethod/InputMethodManager.HIDE_NOT_ALWAYS,2
+10,Android.Views.InputMethods.InputMethodResults,Hidden,android/view/inputmethod/InputMethodManager.RESULT_HIDDEN,3
+10,Android.Views.InputMethods.InputMethodResults,Shown,android/view/inputmethod/InputMethodManager.RESULT_SHOWN,2
+10,Android.Views.InputMethods.InputMethodResults,UnchangedHidden,android/view/inputmethod/InputMethodManager.RESULT_UNCHANGED_HIDDEN,1
+10,Android.Views.InputMethods.InputMethodResults,UnchangedShown,android/view/inputmethod/InputMethodManager.RESULT_UNCHANGED_SHOWN,0
 16,Android.Views.InputMethods.ImeFlags,ForceAscii,android/view/inputmethod/EditorInfo.IME_FLAG_FORCE_ASCII,-2147483648
-11,Android.Views.InputMethods.ImeFlags,NavigateNext,android/view/inputmethod/EditorInfo.IME_FLAG_NAVIGATE_NEXT,134217728
-11,Android.Views.InputMethods.ImeFlags,NavigatePrevious,android/view/inputmethod/EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS,67108864
-3,Android.Views.InputMethods.ImeFlags,NoAccessoryAction,android/view/inputmethod/EditorInfo.IME_FLAG_NO_ACCESSORY_ACTION,536870912
-3,Android.Views.InputMethods.ImeFlags,NoEnterAction,android/view/inputmethod/EditorInfo.IME_FLAG_NO_ENTER_ACTION,1073741824
-3,Android.Views.InputMethods.ImeFlags,NoExtractUi,android/view/inputmethod/EditorInfo.IME_FLAG_NO_EXTRACT_UI,268435456
-11,Android.Views.InputMethods.ImeFlags,NoFullscreen,android/view/inputmethod/EditorInfo.IME_FLAG_NO_FULLSCREEN,33554432
+15,Android.Views.InputMethods.ImeFlags,NavigateNext,android/view/inputmethod/EditorInfo.IME_FLAG_NAVIGATE_NEXT,134217728
+15,Android.Views.InputMethods.ImeFlags,NavigatePrevious,android/view/inputmethod/EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS,67108864
+10,Android.Views.InputMethods.ImeFlags,NoAccessoryAction,android/view/inputmethod/EditorInfo.IME_FLAG_NO_ACCESSORY_ACTION,536870912
+10,Android.Views.InputMethods.ImeFlags,NoEnterAction,android/view/inputmethod/EditorInfo.IME_FLAG_NO_ENTER_ACTION,1073741824
+10,Android.Views.InputMethods.ImeFlags,NoExtractUi,android/view/inputmethod/EditorInfo.IME_FLAG_NO_EXTRACT_UI,268435456
+15,Android.Views.InputMethods.ImeFlags,NoFullscreen,android/view/inputmethod/EditorInfo.IME_FLAG_NO_FULLSCREEN,33554432
 26,Android.Views.InputMethods.ImeFlags,NoPersonalizedLearning,android/view/inputmethod/EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING,16777216
 21,Android.Webkit.ChromeFileChooserMode,Open,android/webkit/WebChromeClient.FileChooserParams.MODE_OPEN,0
 21,Android.Webkit.ChromeFileChooserMode,OpenMultiple,android/webkit/WebChromeClient.FileChooserParams.MODE_OPEN_MULTIPLE,1
 21,Android.Webkit.ChromeFileChooserMode,Save,android/webkit/WebChromeClient.FileChooserParams.MODE_SAVE,3
-1,Android.Content.PackageContextFlags,IgnoreSecurity,android/content/Context.CONTEXT_IGNORE_SECURITY,2
-1,Android.Content.PackageContextFlags,IncludeCode,android/content/Context.CONTEXT_INCLUDE_CODE,1
-4,Android.Content.PackageContextFlags,Restricted,android/content/Context.CONTEXT_RESTRICTED,4
-1,Android.Content.FileCreationMode,Append,android/content/Context.MODE_APPEND,32768
+10,Android.Content.PackageContextFlags,IgnoreSecurity,android/content/Context.CONTEXT_IGNORE_SECURITY,2
+10,Android.Content.PackageContextFlags,IncludeCode,android/content/Context.CONTEXT_INCLUDE_CODE,1
+10,Android.Content.PackageContextFlags,Restricted,android/content/Context.CONTEXT_RESTRICTED,4
+10,Android.Content.FileCreationMode,Append,android/content/Context.MODE_APPEND,32768
 16,Android.Content.FileCreationMode,EnableWriteAheadLogging,android/content/Context.MODE_ENABLE_WRITE_AHEAD_LOGGING,8
-11,Android.Content.FileCreationMode,MultiProcess,android/content/Context.MODE_MULTI_PROCESS,4
+15,Android.Content.FileCreationMode,MultiProcess,android/content/Context.MODE_MULTI_PROCESS,4
 24,Android.Content.FileCreationMode,NoLocalizedCollators,android/content/Context.MODE_NO_LOCALIZED_COLLATORS,16
-1,Android.Content.FileCreationMode,Private,android/content/Context.MODE_PRIVATE,0
-1,Android.Content.FileCreationMode,WorldReadable,android/content/Context.MODE_WORLD_READABLE,1
-1,Android.Content.FileCreationMode,WorldWriteable,android/content/Context.MODE_WORLD_WRITEABLE,2
-5,Android.Content.ExtraDockState,Car,android/content/Intent.EXTRA_DOCK_STATE_CAR,2
-5,Android.Content.ExtraDockState,Desk,android/content/Intent.EXTRA_DOCK_STATE_DESK,1
-11,Android.Content.ExtraDockState,HeDesk,android/content/Intent.EXTRA_DOCK_STATE_HE_DESK,4
-11,Android.Content.ExtraDockState,LeDesk,android/content/Intent.EXTRA_DOCK_STATE_LE_DESK,3
-5,Android.Content.ExtraDockState,Undocked,android/content/Intent.EXTRA_DOCK_STATE_UNDOCKED,0
-1,Android.Content.DatabaseMode,TwoLines,android/content/SearchRecentSuggestionsProvider.DATABASE_MODE_2LINES,2
-1,Android.Content.DatabaseMode,Queries,android/content/SearchRecentSuggestionsProvider.DATABASE_MODE_QUERIES,1
-1,Android.Content.PM.LaunchMode,Multiple,android/content/pm/ActivityInfo.LAUNCH_MULTIPLE,0
-1,Android.Content.PM.LaunchMode,SingleInstance,android/content/pm/ActivityInfo.LAUNCH_SINGLE_INSTANCE,3
-1,Android.Content.PM.LaunchMode,SingleTask,android/content/pm/ActivityInfo.LAUNCH_SINGLE_TASK,2
-1,Android.Content.PM.LaunchMode,SingleTop,android/content/pm/ActivityInfo.LAUNCH_SINGLE_TOP,1
+10,Android.Content.FileCreationMode,Private,android/content/Context.MODE_PRIVATE,0
+10,Android.Content.FileCreationMode,WorldReadable,android/content/Context.MODE_WORLD_READABLE,1
+10,Android.Content.FileCreationMode,WorldWriteable,android/content/Context.MODE_WORLD_WRITEABLE,2
+10,Android.Content.ExtraDockState,Car,android/content/Intent.EXTRA_DOCK_STATE_CAR,2
+10,Android.Content.ExtraDockState,Desk,android/content/Intent.EXTRA_DOCK_STATE_DESK,1
+15,Android.Content.ExtraDockState,HeDesk,android/content/Intent.EXTRA_DOCK_STATE_HE_DESK,4
+15,Android.Content.ExtraDockState,LeDesk,android/content/Intent.EXTRA_DOCK_STATE_LE_DESK,3
+10,Android.Content.ExtraDockState,Undocked,android/content/Intent.EXTRA_DOCK_STATE_UNDOCKED,0
+10,Android.Content.DatabaseMode,TwoLines,android/content/SearchRecentSuggestionsProvider.DATABASE_MODE_2LINES,2
+10,Android.Content.DatabaseMode,Queries,android/content/SearchRecentSuggestionsProvider.DATABASE_MODE_QUERIES,1
+10,Android.Content.PM.LaunchMode,Multiple,android/content/pm/ActivityInfo.LAUNCH_MULTIPLE,0
+10,Android.Content.PM.LaunchMode,SingleInstance,android/content/pm/ActivityInfo.LAUNCH_SINGLE_INSTANCE,3
+10,Android.Content.PM.LaunchMode,SingleTask,android/content/pm/ActivityInfo.LAUNCH_SINGLE_TASK,2
+10,Android.Content.PM.LaunchMode,SingleTop,android/content/pm/ActivityInfo.LAUNCH_SINGLE_TOP,1
 0,Android.Content.PM.UiOptions,None,,0
-14,Android.Content.PM.UiOptions,SplitActionBarWhenNarrow,android/content/pm/ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW,1
-1,Android.Content.PM.Permission,Denied,android/content/pm/PackageManager.PERMISSION_DENIED,-1
-1,Android.Content.PM.Permission,Granted,android/content/pm/PackageManager.PERMISSION_GRANTED,0
-1,Android.Content.PM.SignatureResult,FirstNotSigned,android/content/pm/PackageManager.SIGNATURE_FIRST_NOT_SIGNED,-1
-1,Android.Content.PM.SignatureResult,Match,android/content/pm/PackageManager.SIGNATURE_MATCH,0
-1,Android.Content.PM.SignatureResult,NeitherSigned,android/content/pm/PackageManager.SIGNATURE_NEITHER_SIGNED,1
-1,Android.Content.PM.SignatureResult,NoMatch,android/content/pm/PackageManager.SIGNATURE_NO_MATCH,-3
-1,Android.Content.PM.SignatureResult,SecondNotSigned,android/content/pm/PackageManager.SIGNATURE_SECOND_NOT_SIGNED,-2
-1,Android.Content.PM.SignatureResult,UnknownPackage,android/content/pm/PackageManager.SIGNATURE_UNKNOWN_PACKAGE,-4
-1,Android.Content.Res.Access,Buffer,android/content/res/AssetManager.ACCESS_BUFFER,3
-1,Android.Content.Res.Access,Random,android/content/res/AssetManager.ACCESS_RANDOM,1
-1,Android.Content.Res.Access,Streaming,android/content/res/AssetManager.ACCESS_STREAMING,2
-1,Android.Content.Res.Access,Unknown,android/content/res/AssetManager.ACCESS_UNKNOWN,0
-3,Android.Content.Res.HardKeyboardHidden,No,android/content/res/Configuration.HARDKEYBOARDHIDDEN_NO,1
-3,Android.Content.Res.HardKeyboardHidden,Undefined,android/content/res/Configuration.HARDKEYBOARDHIDDEN_UNDEFINED,0
-3,Android.Content.Res.HardKeyboardHidden,Yes,android/content/res/Configuration.HARDKEYBOARDHIDDEN_YES,2
-1,Android.Content.Res.KeyboardType,Twelvekey,android/content/res/Configuration.KEYBOARD_12KEY,3
-1,Android.Content.Res.KeyboardType,Nokeys,android/content/res/Configuration.KEYBOARD_NOKEYS,1
-1,Android.Content.Res.KeyboardType,Qwerty,android/content/res/Configuration.KEYBOARD_QWERTY,2
-1,Android.Content.Res.KeyboardType,Undefined,android/content/res/Configuration.KEYBOARD_UNDEFINED,0
-1,Android.Content.Res.KeyboardHidden,No,android/content/res/Configuration.KEYBOARDHIDDEN_NO,1
-1,Android.Content.Res.KeyboardHidden,Undefined,android/content/res/Configuration.KEYBOARDHIDDEN_UNDEFINED,0
-1,Android.Content.Res.KeyboardHidden,Yes,android/content/res/Configuration.KEYBOARDHIDDEN_YES,2
-1,Android.Content.Res.Navigation,Dpad,android/content/res/Configuration.NAVIGATION_DPAD,2
-1,Android.Content.Res.Navigation,Nonav,android/content/res/Configuration.NAVIGATION_NONAV,1
-1,Android.Content.Res.Navigation,Trackball,android/content/res/Configuration.NAVIGATION_TRACKBALL,3
-1,Android.Content.Res.Navigation,Undefined,android/content/res/Configuration.NAVIGATION_UNDEFINED,0
-1,Android.Content.Res.Navigation,Wheel,android/content/res/Configuration.NAVIGATION_WHEEL,4
-5,Android.Content.Res.NavigationHidden,No,android/content/res/Configuration.NAVIGATIONHIDDEN_NO,1
-5,Android.Content.Res.NavigationHidden,Undefined,android/content/res/Configuration.NAVIGATIONHIDDEN_UNDEFINED,0
-5,Android.Content.Res.NavigationHidden,Yes,android/content/res/Configuration.NAVIGATIONHIDDEN_YES,2
-1,Android.Content.Res.Orientation,Landscape,android/content/res/Configuration.ORIENTATION_LANDSCAPE,2
-1,Android.Content.Res.Orientation,Portrait,android/content/res/Configuration.ORIENTATION_PORTRAIT,1
-1,Android.Content.Res.Orientation,Square,android/content/res/Configuration.ORIENTATION_SQUARE,3
-1,Android.Content.Res.Orientation,Undefined,android/content/res/Configuration.ORIENTATION_UNDEFINED,0
-1,Android.Content.Res.TouchScreenType,Finger,android/content/res/Configuration.TOUCHSCREEN_FINGER,3
-1,Android.Content.Res.TouchScreenType,Notouch,android/content/res/Configuration.TOUCHSCREEN_NOTOUCH,1
-1,Android.Content.Res.TouchScreenType,Stylus,android/content/res/Configuration.TOUCHSCREEN_STYLUS,2
-1,Android.Content.Res.TouchScreenType,Undefined,android/content/res/Configuration.TOUCHSCREEN_UNDEFINED,0
-1,Android.Database.Sqlite.DatabaseOpenFlags,OpenReadwrite,android/database/sqlite/SQLiteDatabase.OPEN_READWRITE,0
-1,Android.Database.Sqlite.DatabaseOpenFlags,OpenReadonly,android/database/sqlite/SQLiteDatabase.OPEN_READONLY,1
-1,Android.Database.Sqlite.DatabaseOpenFlags,CreateIfNecessary,android/database/sqlite/SQLiteDatabase.CREATE_IF_NECESSARY,268435456
-1,Android.Database.Sqlite.DatabaseOpenFlags,NoLocalizedCollators,android/database/sqlite/SQLiteDatabase.NO_LOCALIZED_COLLATORS,16
-11,Android.Drm.DrmConvertedStatusCode,Error,android/drm/DrmConvertedStatus.STATUS_ERROR,3
-11,Android.Drm.DrmConvertedStatusCode,InputDataError,android/drm/DrmConvertedStatus.STATUS_INPUTDATA_ERROR,2
-11,Android.Drm.DrmConvertedStatusCode,OK,android/drm/DrmConvertedStatus.STATUS_OK,1
-11,Android.Drm.DrmInfoStatusCode,Error,android/drm/DrmInfoStatus.STATUS_ERROR,2
-11,Android.Drm.DrmInfoStatusCode,OK,android/drm/DrmInfoStatus.STATUS_OK,1
-11,Android.Drm.DrmManagerClientErrorCode,None,android/drm/DrmManagerClient.ERROR_NONE,0
-11,Android.Drm.DrmManagerClientErrorCode,Unknown,android/drm/DrmManagerClient.ERROR_UNKNOWN,-2000
-11,Android.Drm.DrmStoreObjectTypeCode,Content,android/drm/DrmStore$DrmObjectType.CONTENT,1
-11,Android.Drm.DrmStoreObjectTypeCode,RightsObject,android/drm/DrmStore$DrmObjectType.RIGHTS_OBJECT,2
-11,Android.Drm.DrmStoreObjectTypeCode,TriggerObject,android/drm/DrmStore$DrmObjectType.TRIGGER_OBJECT,3
-11,Android.Drm.DrmStoreObjectTypeCode,Unknown,android/drm/DrmStore$DrmObjectType.UNKNOWN,0
-11,Android.Drm.DrmStoreActionCode,Default,android/drm/DrmStore.Action.DEFAULT,0
-11,Android.Drm.DrmStoreActionCode,Display,android/drm/DrmStore.Action.DISPLAY,7
-11,Android.Drm.DrmStoreActionCode,Execute,android/drm/DrmStore.Action.EXECUTE,6
-11,Android.Drm.DrmStoreActionCode,Output,android/drm/DrmStore.Action.OUTPUT,4
-11,Android.Drm.DrmStoreActionCode,Play,android/drm/DrmStore.Action.PLAY,1
-11,Android.Drm.DrmStoreActionCode,Preview,android/drm/DrmStore.Action.PREVIEW,5
-11,Android.Drm.DrmStoreActionCode,Ringtone,android/drm/DrmStore.Action.RINGTONE,2
-11,Android.Drm.DrmStoreActionCode,Transfer,android/drm/DrmStore.Action.TRANSFER,3
-11,Android.Drm.DrmStorePlaybackCode,Pause,android/drm/DrmStore.Playback.PAUSE,2
-11,Android.Drm.DrmStorePlaybackCode,Resume,android/drm/DrmStore.Playback.RESUME,3
-11,Android.Drm.DrmStorePlaybackCode,Start,android/drm/DrmStore.Playback.START,0
-11,Android.Drm.DrmStorePlaybackCode,Stop,android/drm/DrmStore.Playback.STOP,1
-11,Android.Drm.DrmStoreRightsStatusCode,Expired,android/drm/DrmStore.RightsStatus.RIGHTS_EXPIRED,2
-11,Android.Drm.DrmStoreRightsStatusCode,Invalid,android/drm/DrmStore.RightsStatus.RIGHTS_INVALID,1
-11,Android.Drm.DrmStoreRightsStatusCode,NotAcquired,android/drm/DrmStore.RightsStatus.RIGHTS_NOT_ACQUIRED,3
-11,Android.Drm.DrmStoreRightsStatusCode,Valid,android/drm/DrmStore.RightsStatus.RIGHTS_VALID,0
-4,Android.Gestures.GestureOrientation,Horizontal,android/gesture/GestureOverlayView.ORIENTATION_HORIZONTAL,0
-4,Android.Gestures.GestureOrientation,Vertical,android/gesture/GestureOverlayView.ORIENTATION_VERTICAL,1
-4,Android.Gestures.OrientationStyle,Invariant,android/gesture/GestureStore.ORIENTATION_INVARIANT,1
-4,Android.Gestures.OrientationStyle,Sensitive,android/gesture/GestureStore.ORIENTATION_SENSITIVE,2
-4,Android.Gestures.SequenceStyle,Invariant,android/gesture/GestureStore.SEQUENCE_INVARIANT,1
-4,Android.Gestures.SequenceStyle,Sensitive,android/gesture/GestureStore.SEQUENCE_SENSITIVE,2
-1,Android.Graphics.PaintFlags,AntiAlias,android/graphics/Paint.ANTI_ALIAS_FLAG,1
-1,Android.Graphics.PaintFlags,DevKernText,android/graphics/Paint.DEV_KERN_TEXT_FLAG,256
-1,Android.Graphics.PaintFlags,Dither,android/graphics/Paint.DITHER_FLAG,4
+15,Android.Content.PM.UiOptions,SplitActionBarWhenNarrow,android/content/pm/ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW,1
+10,Android.Content.PM.Permission,Denied,android/content/pm/PackageManager.PERMISSION_DENIED,-1
+10,Android.Content.PM.Permission,Granted,android/content/pm/PackageManager.PERMISSION_GRANTED,0
+10,Android.Content.PM.SignatureResult,FirstNotSigned,android/content/pm/PackageManager.SIGNATURE_FIRST_NOT_SIGNED,-1
+10,Android.Content.PM.SignatureResult,Match,android/content/pm/PackageManager.SIGNATURE_MATCH,0
+10,Android.Content.PM.SignatureResult,NeitherSigned,android/content/pm/PackageManager.SIGNATURE_NEITHER_SIGNED,1
+10,Android.Content.PM.SignatureResult,NoMatch,android/content/pm/PackageManager.SIGNATURE_NO_MATCH,-3
+10,Android.Content.PM.SignatureResult,SecondNotSigned,android/content/pm/PackageManager.SIGNATURE_SECOND_NOT_SIGNED,-2
+10,Android.Content.PM.SignatureResult,UnknownPackage,android/content/pm/PackageManager.SIGNATURE_UNKNOWN_PACKAGE,-4
+10,Android.Content.Res.Access,Buffer,android/content/res/AssetManager.ACCESS_BUFFER,3
+10,Android.Content.Res.Access,Random,android/content/res/AssetManager.ACCESS_RANDOM,1
+10,Android.Content.Res.Access,Streaming,android/content/res/AssetManager.ACCESS_STREAMING,2
+10,Android.Content.Res.Access,Unknown,android/content/res/AssetManager.ACCESS_UNKNOWN,0
+10,Android.Content.Res.HardKeyboardHidden,No,android/content/res/Configuration.HARDKEYBOARDHIDDEN_NO,1
+10,Android.Content.Res.HardKeyboardHidden,Undefined,android/content/res/Configuration.HARDKEYBOARDHIDDEN_UNDEFINED,0
+10,Android.Content.Res.HardKeyboardHidden,Yes,android/content/res/Configuration.HARDKEYBOARDHIDDEN_YES,2
+10,Android.Content.Res.KeyboardType,Twelvekey,android/content/res/Configuration.KEYBOARD_12KEY,3
+10,Android.Content.Res.KeyboardType,Nokeys,android/content/res/Configuration.KEYBOARD_NOKEYS,1
+10,Android.Content.Res.KeyboardType,Qwerty,android/content/res/Configuration.KEYBOARD_QWERTY,2
+10,Android.Content.Res.KeyboardType,Undefined,android/content/res/Configuration.KEYBOARD_UNDEFINED,0
+10,Android.Content.Res.KeyboardHidden,No,android/content/res/Configuration.KEYBOARDHIDDEN_NO,1
+10,Android.Content.Res.KeyboardHidden,Undefined,android/content/res/Configuration.KEYBOARDHIDDEN_UNDEFINED,0
+10,Android.Content.Res.KeyboardHidden,Yes,android/content/res/Configuration.KEYBOARDHIDDEN_YES,2
+10,Android.Content.Res.Navigation,Dpad,android/content/res/Configuration.NAVIGATION_DPAD,2
+10,Android.Content.Res.Navigation,Nonav,android/content/res/Configuration.NAVIGATION_NONAV,1
+10,Android.Content.Res.Navigation,Trackball,android/content/res/Configuration.NAVIGATION_TRACKBALL,3
+10,Android.Content.Res.Navigation,Undefined,android/content/res/Configuration.NAVIGATION_UNDEFINED,0
+10,Android.Content.Res.Navigation,Wheel,android/content/res/Configuration.NAVIGATION_WHEEL,4
+10,Android.Content.Res.NavigationHidden,No,android/content/res/Configuration.NAVIGATIONHIDDEN_NO,1
+10,Android.Content.Res.NavigationHidden,Undefined,android/content/res/Configuration.NAVIGATIONHIDDEN_UNDEFINED,0
+10,Android.Content.Res.NavigationHidden,Yes,android/content/res/Configuration.NAVIGATIONHIDDEN_YES,2
+10,Android.Content.Res.Orientation,Landscape,android/content/res/Configuration.ORIENTATION_LANDSCAPE,2
+10,Android.Content.Res.Orientation,Portrait,android/content/res/Configuration.ORIENTATION_PORTRAIT,1
+10,Android.Content.Res.Orientation,Square,android/content/res/Configuration.ORIENTATION_SQUARE,3
+10,Android.Content.Res.Orientation,Undefined,android/content/res/Configuration.ORIENTATION_UNDEFINED,0
+10,Android.Content.Res.TouchScreenType,Finger,android/content/res/Configuration.TOUCHSCREEN_FINGER,3
+10,Android.Content.Res.TouchScreenType,Notouch,android/content/res/Configuration.TOUCHSCREEN_NOTOUCH,1
+10,Android.Content.Res.TouchScreenType,Stylus,android/content/res/Configuration.TOUCHSCREEN_STYLUS,2
+10,Android.Content.Res.TouchScreenType,Undefined,android/content/res/Configuration.TOUCHSCREEN_UNDEFINED,0
+10,Android.Database.Sqlite.DatabaseOpenFlags,OpenReadwrite,android/database/sqlite/SQLiteDatabase.OPEN_READWRITE,0
+10,Android.Database.Sqlite.DatabaseOpenFlags,OpenReadonly,android/database/sqlite/SQLiteDatabase.OPEN_READONLY,1
+10,Android.Database.Sqlite.DatabaseOpenFlags,CreateIfNecessary,android/database/sqlite/SQLiteDatabase.CREATE_IF_NECESSARY,268435456
+10,Android.Database.Sqlite.DatabaseOpenFlags,NoLocalizedCollators,android/database/sqlite/SQLiteDatabase.NO_LOCALIZED_COLLATORS,16
+15,Android.Drm.DrmConvertedStatusCode,Error,android/drm/DrmConvertedStatus.STATUS_ERROR,3
+15,Android.Drm.DrmConvertedStatusCode,InputDataError,android/drm/DrmConvertedStatus.STATUS_INPUTDATA_ERROR,2
+15,Android.Drm.DrmConvertedStatusCode,OK,android/drm/DrmConvertedStatus.STATUS_OK,1
+15,Android.Drm.DrmInfoStatusCode,Error,android/drm/DrmInfoStatus.STATUS_ERROR,2
+15,Android.Drm.DrmInfoStatusCode,OK,android/drm/DrmInfoStatus.STATUS_OK,1
+15,Android.Drm.DrmManagerClientErrorCode,None,android/drm/DrmManagerClient.ERROR_NONE,0
+15,Android.Drm.DrmManagerClientErrorCode,Unknown,android/drm/DrmManagerClient.ERROR_UNKNOWN,-2000
+15,Android.Drm.DrmStoreObjectTypeCode,Content,android/drm/DrmStore$DrmObjectType.CONTENT,1
+15,Android.Drm.DrmStoreObjectTypeCode,RightsObject,android/drm/DrmStore$DrmObjectType.RIGHTS_OBJECT,2
+15,Android.Drm.DrmStoreObjectTypeCode,TriggerObject,android/drm/DrmStore$DrmObjectType.TRIGGER_OBJECT,3
+15,Android.Drm.DrmStoreObjectTypeCode,Unknown,android/drm/DrmStore$DrmObjectType.UNKNOWN,0
+15,Android.Drm.DrmStoreActionCode,Default,android/drm/DrmStore.Action.DEFAULT,0
+15,Android.Drm.DrmStoreActionCode,Display,android/drm/DrmStore.Action.DISPLAY,7
+15,Android.Drm.DrmStoreActionCode,Execute,android/drm/DrmStore.Action.EXECUTE,6
+15,Android.Drm.DrmStoreActionCode,Output,android/drm/DrmStore.Action.OUTPUT,4
+15,Android.Drm.DrmStoreActionCode,Play,android/drm/DrmStore.Action.PLAY,1
+15,Android.Drm.DrmStoreActionCode,Preview,android/drm/DrmStore.Action.PREVIEW,5
+15,Android.Drm.DrmStoreActionCode,Ringtone,android/drm/DrmStore.Action.RINGTONE,2
+15,Android.Drm.DrmStoreActionCode,Transfer,android/drm/DrmStore.Action.TRANSFER,3
+15,Android.Drm.DrmStorePlaybackCode,Pause,android/drm/DrmStore.Playback.PAUSE,2
+15,Android.Drm.DrmStorePlaybackCode,Resume,android/drm/DrmStore.Playback.RESUME,3
+15,Android.Drm.DrmStorePlaybackCode,Start,android/drm/DrmStore.Playback.START,0
+15,Android.Drm.DrmStorePlaybackCode,Stop,android/drm/DrmStore.Playback.STOP,1
+15,Android.Drm.DrmStoreRightsStatusCode,Expired,android/drm/DrmStore.RightsStatus.RIGHTS_EXPIRED,2
+15,Android.Drm.DrmStoreRightsStatusCode,Invalid,android/drm/DrmStore.RightsStatus.RIGHTS_INVALID,1
+15,Android.Drm.DrmStoreRightsStatusCode,NotAcquired,android/drm/DrmStore.RightsStatus.RIGHTS_NOT_ACQUIRED,3
+15,Android.Drm.DrmStoreRightsStatusCode,Valid,android/drm/DrmStore.RightsStatus.RIGHTS_VALID,0
+10,Android.Gestures.GestureOrientation,Horizontal,android/gesture/GestureOverlayView.ORIENTATION_HORIZONTAL,0
+10,Android.Gestures.GestureOrientation,Vertical,android/gesture/GestureOverlayView.ORIENTATION_VERTICAL,1
+10,Android.Gestures.OrientationStyle,Invariant,android/gesture/GestureStore.ORIENTATION_INVARIANT,1
+10,Android.Gestures.OrientationStyle,Sensitive,android/gesture/GestureStore.ORIENTATION_SENSITIVE,2
+10,Android.Gestures.SequenceStyle,Invariant,android/gesture/GestureStore.SEQUENCE_INVARIANT,1
+10,Android.Gestures.SequenceStyle,Sensitive,android/gesture/GestureStore.SEQUENCE_SENSITIVE,2
+10,Android.Graphics.PaintFlags,AntiAlias,android/graphics/Paint.ANTI_ALIAS_FLAG,1
+10,Android.Graphics.PaintFlags,DevKernText,android/graphics/Paint.DEV_KERN_TEXT_FLAG,256
+10,Android.Graphics.PaintFlags,Dither,android/graphics/Paint.DITHER_FLAG,4
 19,Android.Graphics.PaintFlags,EmbeddedBitmapText,android/graphics/Paint.EMBEDDED_BITMAP_TEXT_FLAG,1024
-1,Android.Graphics.PaintFlags,FakeBoldText,android/graphics/Paint.FAKE_BOLD_TEXT_FLAG,32
-1,Android.Graphics.PaintFlags,FilterBitmap,android/graphics/Paint.FILTER_BITMAP_FLAG,2
-1,Android.Graphics.PaintFlags,LinearText,android/graphics/Paint.LINEAR_TEXT_FLAG,64
-1,Android.Graphics.PaintFlags,StrikeThruText,android/graphics/Paint.STRIKE_THRU_TEXT_FLAG,16
-1,Android.Graphics.PaintFlags,SubpixelText,android/graphics/Paint.SUBPIXEL_TEXT_FLAG,128
-1,Android.Graphics.PaintFlags,UnderlineText,android/graphics/Paint.UNDERLINE_TEXT_FLAG,8
-1,Android.Graphics.MatrixFlags,Position,android/graphics/PathMeasure.POSITION_MATRIX_FLAG,1
-1,Android.Graphics.MatrixFlags,Tangent,android/graphics/PathMeasure.TANGENT_MATRIX_FLAG,2
-1,Android.Graphics.TypefaceStyle,Bold,android/graphics/Typeface.BOLD,1
-1,Android.Graphics.TypefaceStyle,BoldItalic,android/graphics/Typeface.BOLD_ITALIC,3
-1,Android.Graphics.TypefaceStyle,Italic,android/graphics/Typeface.ITALIC,2
-1,Android.Graphics.TypefaceStyle,Normal,android/graphics/Typeface.NORMAL,0
-1,Android.Graphics.Drawables.ShapeType,Line,android/graphics/drawable/GradientDrawable.LINE,2
-1,Android.Graphics.Drawables.ShapeType,Oval,android/graphics/drawable/GradientDrawable.OVAL,1
-1,Android.Graphics.Drawables.ShapeType,Rectangle,android/graphics/drawable/GradientDrawable.RECTANGLE,0
-1,Android.Graphics.Drawables.ShapeType,Ring,android/graphics/drawable/GradientDrawable.RING,3
-1,Android.Graphics.Drawables.GradientType,LinearGradient,android/graphics/drawable/GradientDrawable.LINEAR_GRADIENT,0
-1,Android.Graphics.Drawables.GradientType,RadialGradient,android/graphics/drawable/GradientDrawable.RADIAL_GRADIENT,1
-1,Android.Graphics.Drawables.GradientType,SweepGradient,android/graphics/drawable/GradientDrawable.SWEEP_GRADIENT,2
+10,Android.Graphics.PaintFlags,FakeBoldText,android/graphics/Paint.FAKE_BOLD_TEXT_FLAG,32
+10,Android.Graphics.PaintFlags,FilterBitmap,android/graphics/Paint.FILTER_BITMAP_FLAG,2
+10,Android.Graphics.PaintFlags,LinearText,android/graphics/Paint.LINEAR_TEXT_FLAG,64
+10,Android.Graphics.PaintFlags,StrikeThruText,android/graphics/Paint.STRIKE_THRU_TEXT_FLAG,16
+10,Android.Graphics.PaintFlags,SubpixelText,android/graphics/Paint.SUBPIXEL_TEXT_FLAG,128
+10,Android.Graphics.PaintFlags,UnderlineText,android/graphics/Paint.UNDERLINE_TEXT_FLAG,8
+10,Android.Graphics.MatrixFlags,Position,android/graphics/PathMeasure.POSITION_MATRIX_FLAG,1
+10,Android.Graphics.MatrixFlags,Tangent,android/graphics/PathMeasure.TANGENT_MATRIX_FLAG,2
+10,Android.Graphics.TypefaceStyle,Bold,android/graphics/Typeface.BOLD,1
+10,Android.Graphics.TypefaceStyle,BoldItalic,android/graphics/Typeface.BOLD_ITALIC,3
+10,Android.Graphics.TypefaceStyle,Italic,android/graphics/Typeface.ITALIC,2
+10,Android.Graphics.TypefaceStyle,Normal,android/graphics/Typeface.NORMAL,0
+10,Android.Graphics.Drawables.ShapeType,Line,android/graphics/drawable/GradientDrawable.LINE,2
+10,Android.Graphics.Drawables.ShapeType,Oval,android/graphics/drawable/GradientDrawable.OVAL,1
+10,Android.Graphics.Drawables.ShapeType,Rectangle,android/graphics/drawable/GradientDrawable.RECTANGLE,0
+10,Android.Graphics.Drawables.ShapeType,Ring,android/graphics/drawable/GradientDrawable.RING,3
+10,Android.Graphics.Drawables.GradientType,LinearGradient,android/graphics/drawable/GradientDrawable.LINEAR_GRADIENT,0
+10,Android.Graphics.Drawables.GradientType,RadialGradient,android/graphics/drawable/GradientDrawable.RADIAL_GRADIENT,1
+10,Android.Graphics.Drawables.GradientType,SweepGradient,android/graphics/drawable/GradientDrawable.SWEEP_GRADIENT,2
 23,Android.Hardware.CameraError,Evicted,android/hardware/Camera.CAMERA_ERROR_EVICTED,2
-1,Android.Hardware.CameraError,ServerDied,android/hardware/Camera.CAMERA_ERROR_SERVER_DIED,100
-1,Android.Hardware.CameraError,Unknown,android/hardware/Camera.CAMERA_ERROR_UNKNOWN,1
-3,Android.Hardware.Axis,MinusX,android/hardware/SensorManager.AXIS_MINUS_X,129
-3,Android.Hardware.Axis,MinusY,android/hardware/SensorManager.AXIS_MINUS_Y,130
-3,Android.Hardware.Axis,MinusZ,android/hardware/SensorManager.AXIS_MINUS_Z,131
-3,Android.Hardware.Axis,X,android/hardware/SensorManager.AXIS_X,1
-3,Android.Hardware.Axis,Y,android/hardware/SensorManager.AXIS_Y,2
-3,Android.Hardware.Axis,Z,android/hardware/SensorManager.AXIS_Z,3
-1,Android.Hardware.SensorDelay,Fastest,android/hardware/SensorManager.SENSOR_DELAY_FASTEST,0
-1,Android.Hardware.SensorDelay,Game,android/hardware/SensorManager.SENSOR_DELAY_GAME,1
-1,Android.Hardware.SensorDelay,Normal,android/hardware/SensorManager.SENSOR_DELAY_NORMAL,3
-1,Android.Hardware.SensorDelay,Ui,android/hardware/SensorManager.SENSOR_DELAY_UI,2
-1,Android.Hardware.SensorStatus,AccuracyHigh,android/hardware/SensorManager.SENSOR_STATUS_ACCURACY_HIGH,3
-1,Android.Hardware.SensorStatus,AccuracyLow,android/hardware/SensorManager.SENSOR_STATUS_ACCURACY_LOW,1
-1,Android.Hardware.SensorStatus,AccuracyMedium,android/hardware/SensorManager.SENSOR_STATUS_ACCURACY_MEDIUM,2
+10,Android.Hardware.CameraError,ServerDied,android/hardware/Camera.CAMERA_ERROR_SERVER_DIED,100
+10,Android.Hardware.CameraError,Unknown,android/hardware/Camera.CAMERA_ERROR_UNKNOWN,1
+10,Android.Hardware.Axis,MinusX,android/hardware/SensorManager.AXIS_MINUS_X,129
+10,Android.Hardware.Axis,MinusY,android/hardware/SensorManager.AXIS_MINUS_Y,130
+10,Android.Hardware.Axis,MinusZ,android/hardware/SensorManager.AXIS_MINUS_Z,131
+10,Android.Hardware.Axis,X,android/hardware/SensorManager.AXIS_X,1
+10,Android.Hardware.Axis,Y,android/hardware/SensorManager.AXIS_Y,2
+10,Android.Hardware.Axis,Z,android/hardware/SensorManager.AXIS_Z,3
+10,Android.Hardware.SensorDelay,Fastest,android/hardware/SensorManager.SENSOR_DELAY_FASTEST,0
+10,Android.Hardware.SensorDelay,Game,android/hardware/SensorManager.SENSOR_DELAY_GAME,1
+10,Android.Hardware.SensorDelay,Normal,android/hardware/SensorManager.SENSOR_DELAY_NORMAL,3
+10,Android.Hardware.SensorDelay,Ui,android/hardware/SensorManager.SENSOR_DELAY_UI,2
+10,Android.Hardware.SensorStatus,AccuracyHigh,android/hardware/SensorManager.SENSOR_STATUS_ACCURACY_HIGH,3
+10,Android.Hardware.SensorStatus,AccuracyLow,android/hardware/SensorManager.SENSOR_STATUS_ACCURACY_LOW,1
+10,Android.Hardware.SensorStatus,AccuracyMedium,android/hardware/SensorManager.SENSOR_STATUS_ACCURACY_MEDIUM,2
 20,Android.Hardware.SensorStatus,NoContact,android/hardware/SensorManager.SENSOR_STATUS_NO_CONTACT,-1
-1,Android.Hardware.SensorStatus,Unreliable,android/hardware/SensorManager.SENSOR_STATUS_UNRELIABLE,0
-3,Android.Media.VideoEncoder,Default,android/media/MediaRecorder$VideoEncoder.DEFAULT,0
-3,Android.Media.VideoEncoder,H263,android/media/MediaRecorder$VideoEncoder.H263,1
-3,Android.Media.VideoEncoder,H264,android/media/MediaRecorder$VideoEncoder.H264,2
+10,Android.Hardware.SensorStatus,Unreliable,android/hardware/SensorManager.SENSOR_STATUS_UNRELIABLE,0
+10,Android.Media.VideoEncoder,Default,android/media/MediaRecorder$VideoEncoder.DEFAULT,0
+10,Android.Media.VideoEncoder,H263,android/media/MediaRecorder$VideoEncoder.H263,1
+10,Android.Media.VideoEncoder,H264,android/media/MediaRecorder$VideoEncoder.H264,2
 24,Android.Media.VideoEncoder,Hevc,android/media/MediaRecorder$VideoEncoder.HEVC,5
-3,Android.Media.VideoEncoder,Mpeg4Sp,android/media/MediaRecorder$VideoEncoder.MPEG_4_SP,3
+10,Android.Media.VideoEncoder,Mpeg4Sp,android/media/MediaRecorder$VideoEncoder.MPEG_4_SP,3
 21,Android.Media.VideoEncoder,Vp8,android/media/MediaRecorder$VideoEncoder.VP8,4
-3,Android.Media.VideoSource,Camera,android/media/MediaRecorder$VideoSource.CAMERA,1
-3,Android.Media.VideoSource,Default,android/media/MediaRecorder$VideoSource.DEFAULT,0
+10,Android.Media.VideoSource,Camera,android/media/MediaRecorder$VideoSource.CAMERA,1
+10,Android.Media.VideoSource,Default,android/media/MediaRecorder$VideoSource.DEFAULT,0
 21,Android.Media.VideoSource,Surface,android/media/MediaRecorder$VideoSource.SURFACE,2
-1,Android.Media.RingtoneColumnIndex,Id,android/media/RingtoneManager.ID_COLUMN_INDEX,0
-1,Android.Media.RingtoneColumnIndex,Title,android/media/RingtoneManager.TITLE_COLUMN_INDEX,1
-1,Android.Media.RingtoneColumnIndex,Uri,android/media/RingtoneManager.URI_COLUMN_INDEX,2
-1,Android.Media.Volume,Max,android/media/ToneGenerator.MAX_VOLUME,100
-1,Android.Media.Volume,Min,android/media/ToneGenerator.MIN_VOLUME,0
-12,Android.Net.Rtp.AudioGroupMode,EchoSuppression,android/net/rtp/AudioGroup.MODE_ECHO_SUPPRESSION,3
-12,Android.Net.Rtp.AudioGroupMode,Muted,android/net/rtp/AudioGroup.MODE_MUTED,1
-12,Android.Net.Rtp.AudioGroupMode,Normal,android/net/rtp/AudioGroup.MODE_NORMAL,2
-12,Android.Net.Rtp.AudioGroupMode,OnHold,android/net/rtp/AudioGroup.MODE_ON_HOLD,0
-12,Android.Net.Rtp.RtpStreamMode,Normal,android/net/rtp/RtpStream.MODE_NORMAL,0
-12,Android.Net.Rtp.RtpStreamMode,ReceiveOnly,android/net/rtp/RtpStream.MODE_RECEIVE_ONLY,2
-12,Android.Net.Rtp.RtpStreamMode,SendOnly,android/net/rtp/RtpStream.MODE_SEND_ONLY,1
-3,Android.Net.WifiMode,Full,android/net/wifi/WifiManager.WIFI_MODE_FULL,1
-12,Android.Net.WifiMode,FullHighPerf,android/net/wifi/WifiManager.WIFI_MODE_FULL_HIGH_PERF,3
-3,Android.Net.WifiMode,ScanOnly,android/net/wifi/WifiManager.WIFI_MODE_SCAN_ONLY,2
-1,Android.Net.WifiState,Disabled,android/net/wifi/WifiManager.WIFI_STATE_DISABLED,1
-1,Android.Net.WifiState,Disabling,android/net/wifi/WifiManager.WIFI_STATE_DISABLING,0
-1,Android.Net.WifiState,Enabled,android/net/wifi/WifiManager.WIFI_STATE_ENABLED,3
-1,Android.Net.WifiState,Enabling,android/net/wifi/WifiManager.WIFI_STATE_ENABLING,2
-1,Android.Net.WifiState,Unknown,android/net/wifi/WifiManager.WIFI_STATE_UNKNOWN,4
+10,Android.Media.RingtoneColumnIndex,Id,android/media/RingtoneManager.ID_COLUMN_INDEX,0
+10,Android.Media.RingtoneColumnIndex,Title,android/media/RingtoneManager.TITLE_COLUMN_INDEX,1
+10,Android.Media.RingtoneColumnIndex,Uri,android/media/RingtoneManager.URI_COLUMN_INDEX,2
+10,Android.Media.Volume,Max,android/media/ToneGenerator.MAX_VOLUME,100
+10,Android.Media.Volume,Min,android/media/ToneGenerator.MIN_VOLUME,0
+15,Android.Net.Rtp.AudioGroupMode,EchoSuppression,android/net/rtp/AudioGroup.MODE_ECHO_SUPPRESSION,3
+15,Android.Net.Rtp.AudioGroupMode,Muted,android/net/rtp/AudioGroup.MODE_MUTED,1
+15,Android.Net.Rtp.AudioGroupMode,Normal,android/net/rtp/AudioGroup.MODE_NORMAL,2
+15,Android.Net.Rtp.AudioGroupMode,OnHold,android/net/rtp/AudioGroup.MODE_ON_HOLD,0
+15,Android.Net.Rtp.RtpStreamMode,Normal,android/net/rtp/RtpStream.MODE_NORMAL,0
+15,Android.Net.Rtp.RtpStreamMode,ReceiveOnly,android/net/rtp/RtpStream.MODE_RECEIVE_ONLY,2
+15,Android.Net.Rtp.RtpStreamMode,SendOnly,android/net/rtp/RtpStream.MODE_SEND_ONLY,1
+10,Android.Net.WifiMode,Full,android/net/wifi/WifiManager.WIFI_MODE_FULL,1
+15,Android.Net.WifiMode,FullHighPerf,android/net/wifi/WifiManager.WIFI_MODE_FULL_HIGH_PERF,3
+10,Android.Net.WifiMode,ScanOnly,android/net/wifi/WifiManager.WIFI_MODE_SCAN_ONLY,2
+10,Android.Net.WifiState,Disabled,android/net/wifi/WifiManager.WIFI_STATE_DISABLED,1
+10,Android.Net.WifiState,Disabling,android/net/wifi/WifiManager.WIFI_STATE_DISABLING,0
+10,Android.Net.WifiState,Enabled,android/net/wifi/WifiManager.WIFI_STATE_ENABLED,3
+10,Android.Net.WifiState,Enabling,android/net/wifi/WifiManager.WIFI_STATE_ENABLING,2
+10,Android.Net.WifiState,Unknown,android/net/wifi/WifiManager.WIFI_STATE_UNKNOWN,4
 25,Android.Provider.CallType,AnsweredExternally,android/provider/CallLog$Calls.ANSWERED_EXTERNALLY_TYPE,7
 24,Android.Provider.CallType,Blocked,android/provider/CallLog$Calls.BLOCKED_TYPE,6
-1,Android.Provider.CallType,Incoming,android/provider/CallLog$Calls.INCOMING_TYPE,1
-1,Android.Provider.CallType,Missed,android/provider/CallLog$Calls.MISSED_TYPE,3
-1,Android.Provider.CallType,Outgoing,android/provider/CallLog$Calls.OUTGOING_TYPE,2
+10,Android.Provider.CallType,Incoming,android/provider/CallLog$Calls.INCOMING_TYPE,1
+10,Android.Provider.CallType,Missed,android/provider/CallLog$Calls.MISSED_TYPE,3
+10,Android.Provider.CallType,Outgoing,android/provider/CallLog$Calls.OUTGOING_TYPE,2
 24,Android.Provider.CallType,Rejected,android/provider/CallLog$Calls.REJECTED_TYPE,5
 21,Android.Provider.CallType,Voicemail,android/provider/CallLog$Calls.VOICEMAIL_TYPE,4
-1,Android.Provider.QueriesProjection,DateIndex,android/provider/SearchRecentSuggestions.QUERIES_PROJECTION_DATE_INDEX,1
-1,Android.Provider.QueriesProjection,Display1Index,android/provider/SearchRecentSuggestions.QUERIES_PROJECTION_DISPLAY1_INDEX,3
-1,Android.Provider.QueriesProjection,Display2Index,android/provider/SearchRecentSuggestions.QUERIES_PROJECTION_DISPLAY2_INDEX,4
-1,Android.Provider.QueriesProjection,QueryIndex,android/provider/SearchRecentSuggestions.QUERIES_PROJECTION_QUERY_INDEX,2
-3,Android.Provider.LocaleType,All,android/provider/UserDictionary.Words.LOCALE_TYPE_ALL,0
-3,Android.Provider.LocaleType,Current,android/provider/UserDictionary.Words.LOCALE_TYPE_CURRENT,1
-3,Android.Speech.RecognizerResult,AudioError,android/speech/RecognizerIntent.RESULT_AUDIO_ERROR,5
-3,Android.Speech.RecognizerResult,ClientError,android/speech/RecognizerIntent.RESULT_CLIENT_ERROR,2
-3,Android.Speech.RecognizerResult,NetworkError,android/speech/RecognizerIntent.RESULT_NETWORK_ERROR,4
-3,Android.Speech.RecognizerResult,NoMatch,android/speech/RecognizerIntent.RESULT_NO_MATCH,1
-3,Android.Speech.RecognizerResult,ServerError,android/speech/RecognizerIntent.RESULT_SERVER_ERROR,3
+10,Android.Provider.QueriesProjection,DateIndex,android/provider/SearchRecentSuggestions.QUERIES_PROJECTION_DATE_INDEX,1
+10,Android.Provider.QueriesProjection,Display1Index,android/provider/SearchRecentSuggestions.QUERIES_PROJECTION_DISPLAY1_INDEX,3
+10,Android.Provider.QueriesProjection,Display2Index,android/provider/SearchRecentSuggestions.QUERIES_PROJECTION_DISPLAY2_INDEX,4
+10,Android.Provider.QueriesProjection,QueryIndex,android/provider/SearchRecentSuggestions.QUERIES_PROJECTION_QUERY_INDEX,2
+10,Android.Provider.LocaleType,All,android/provider/UserDictionary.Words.LOCALE_TYPE_ALL,0
+10,Android.Provider.LocaleType,Current,android/provider/UserDictionary.Words.LOCALE_TYPE_CURRENT,1
+15,Android.Renderscripts.TriangleFlags,Color,android/renderscript/Mesh.TriangleMeshBuilder.COLOR,1
+15,Android.Renderscripts.TriangleFlags,Normal,android/renderscript/Mesh.TriangleMeshBuilder.NORMAL,2
+15,Android.Renderscripts.TriangleFlags,Texture0,android/renderscript/Mesh.TriangleMeshBuilder.TEXTURE_0,256
+10,Android.Speech.RecognizerResult,AudioError,android/speech/RecognizerIntent.RESULT_AUDIO_ERROR,5
+10,Android.Speech.RecognizerResult,ClientError,android/speech/RecognizerIntent.RESULT_CLIENT_ERROR,2
+10,Android.Speech.RecognizerResult,NetworkError,android/speech/RecognizerIntent.RESULT_NETWORK_ERROR,4
+10,Android.Speech.RecognizerResult,NoMatch,android/speech/RecognizerIntent.RESULT_NO_MATCH,1
+10,Android.Speech.RecognizerResult,ServerError,android/speech/RecognizerIntent.RESULT_SERVER_ERROR,3
 21,Android.Speech.Tts.TextToSpeechError,InvalidRequest,android/speech/tts/TextToSpeech.ERROR_INVALID_REQUEST,-8
 21,Android.Speech.Tts.TextToSpeechError,Network,android/speech/tts/TextToSpeech.ERROR_NETWORK,-6
 21,Android.Speech.Tts.TextToSpeechError,NetworkTimeout,android/speech/tts/TextToSpeech.ERROR_NETWORK_TIMEOUT,-7
@@ -2658,21 +2625,21 @@
 21,Android.Speech.Tts.TextToSpeechError,Output,android/speech/tts/TextToSpeech.ERROR_OUTPUT,-5
 21,Android.Speech.Tts.TextToSpeechError,Service,android/speech/tts/TextToSpeech.ERROR_SERVICE,-4
 21,Android.Speech.Tts.TextToSpeechError,Synthesis,android/speech/tts/TextToSpeech.ERROR_SYNTHESIS,-3
-4,Android.Speech.Tts.LanguageAvailableResult,Available,android/speech/tts/TextToSpeech.LANG_AVAILABLE,0
-4,Android.Speech.Tts.LanguageAvailableResult,CountryAvailable,android/speech/tts/TextToSpeech.LANG_COUNTRY_AVAILABLE,1
-4,Android.Speech.Tts.LanguageAvailableResult,CountryVarAvailable,android/speech/tts/TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE,2
-4,Android.Speech.Tts.LanguageAvailableResult,MissingData,android/speech/tts/TextToSpeech.LANG_MISSING_DATA,-1
-4,Android.Speech.Tts.LanguageAvailableResult,NotSupported,android/speech/tts/TextToSpeech.LANG_NOT_SUPPORTED,-2
-4,Android.Speech.Tts.QueueMode,Add,android/speech/tts/TextToSpeech.QUEUE_ADD,1
-4,Android.Speech.Tts.QueueMode,Flush,android/speech/tts/TextToSpeech.QUEUE_FLUSH,0
-4,Android.Speech.Tts.OperationResult,Success,android/speech/tts/TextToSpeech.SUCCESS,0
-4,Android.Speech.Tts.OperationResult,Error,android/speech/tts/TextToSpeech.ERROR,-1
+10,Android.Speech.Tts.LanguageAvailableResult,Available,android/speech/tts/TextToSpeech.LANG_AVAILABLE,0
+10,Android.Speech.Tts.LanguageAvailableResult,CountryAvailable,android/speech/tts/TextToSpeech.LANG_COUNTRY_AVAILABLE,1
+10,Android.Speech.Tts.LanguageAvailableResult,CountryVarAvailable,android/speech/tts/TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE,2
+10,Android.Speech.Tts.LanguageAvailableResult,MissingData,android/speech/tts/TextToSpeech.LANG_MISSING_DATA,-1
+10,Android.Speech.Tts.LanguageAvailableResult,NotSupported,android/speech/tts/TextToSpeech.LANG_NOT_SUPPORTED,-2
+10,Android.Speech.Tts.QueueMode,Add,android/speech/tts/TextToSpeech.QUEUE_ADD,1
+10,Android.Speech.Tts.QueueMode,Flush,android/speech/tts/TextToSpeech.QUEUE_FLUSH,0
+10,Android.Speech.Tts.OperationResult,Success,android/speech/tts/TextToSpeech.SUCCESS,0
+10,Android.Speech.Tts.OperationResult,Error,android/speech/tts/TextToSpeech.ERROR,-1
 21,Android.Speech.Tts.OperationResult,Stopped,android/speech/tts/TextToSpeech.STOPPED,-2
-4,Android.Speech.Tts.CheckVoiceData,BadData,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_BAD_DATA,-1
-4,Android.Speech.Tts.CheckVoiceData,Fail,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_FAIL,0
-4,Android.Speech.Tts.CheckVoiceData,MissingData,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_MISSING_DATA,-2
-4,Android.Speech.Tts.CheckVoiceData,MissingVolume,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_MISSING_VOLUME,-3
-4,Android.Speech.Tts.CheckVoiceData,Pass,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_PASS,1
+10,Android.Speech.Tts.CheckVoiceData,BadData,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_BAD_DATA,-1
+10,Android.Speech.Tts.CheckVoiceData,Fail,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_FAIL,0
+10,Android.Speech.Tts.CheckVoiceData,MissingData,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_MISSING_DATA,-2
+10,Android.Speech.Tts.CheckVoiceData,MissingVolume,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_MISSING_VOLUME,-3
+10,Android.Speech.Tts.CheckVoiceData,Pass,android/speech/tts/TextToSpeech.Engine.CHECK_VOICE_DATA_PASS,1
 21,Android.Speech.Tts.VoiceLatency,High,android/speech/tts/Voice.LATENCY_HIGH,400
 21,Android.Speech.Tts.VoiceLatency,Low,android/speech/tts/Voice.LATENCY_LOW,200
 21,Android.Speech.Tts.VoiceLatency,Normal,android/speech/tts/Voice.LATENCY_NORMAL,300
@@ -2683,387 +2650,392 @@
 21,Android.Speech.Tts.VoiceQuality,Normal,android/speech/tts/Voice.QUALITY_NORMAL,300
 21,Android.Speech.Tts.VoiceQuality,VeryHigh,android/speech/tts/Voice.QUALITY_VERY_HIGH,500
 21,Android.Speech.Tts.VoiceQuality,VeryLow,android/speech/tts/Voice.QUALITY_VERY_LOW,100
-3,Android.Telephony.PhoneNumberFormat,Japan,android/telephony/PhoneNumberUtils.FORMAT_JAPAN,2
-1,Android.Telephony.PhoneNumberFormat,Nanp,android/telephony/PhoneNumberUtils.FORMAT_NANP,1
-1,Android.Telephony.PhoneNumberFormat,Unknown,android/telephony/PhoneNumberUtils.FORMAT_UNKNOWN,0
-1,Android.Telephony.PhoneStateListenerFlags,CallForwardingIndicator,android/telephony/PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR,8
-1,Android.Telephony.PhoneStateListenerFlags,CallState,android/telephony/PhoneStateListener.LISTEN_CALL_STATE,32
+10,Android.Telephony.PhoneNumberFormat,Japan,android/telephony/PhoneNumberUtils.FORMAT_JAPAN,2
+10,Android.Telephony.PhoneNumberFormat,Nanp,android/telephony/PhoneNumberUtils.FORMAT_NANP,1
+10,Android.Telephony.PhoneNumberFormat,Unknown,android/telephony/PhoneNumberUtils.FORMAT_UNKNOWN,0
+10,Android.Telephony.PhoneStateListenerFlags,CallForwardingIndicator,android/telephony/PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR,8
+10,Android.Telephony.PhoneStateListenerFlags,CallState,android/telephony/PhoneStateListener.LISTEN_CALL_STATE,32
 17,Android.Telephony.PhoneStateListenerFlags,CellInfo,android/telephony/PhoneStateListener.LISTEN_CELL_INFO,1024
-1,Android.Telephony.PhoneStateListenerFlags,CellLocation,android/telephony/PhoneStateListener.LISTEN_CELL_LOCATION,16
-1,Android.Telephony.PhoneStateListenerFlags,DataActivity,android/telephony/PhoneStateListener.LISTEN_DATA_ACTIVITY,128
-1,Android.Telephony.PhoneStateListenerFlags,DataConnectionState,android/telephony/PhoneStateListener.LISTEN_DATA_CONNECTION_STATE,64
-1,Android.Telephony.PhoneStateListenerFlags,MessageWaitingIndicator,android/telephony/PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR,4
-1,Android.Telephony.PhoneStateListenerFlags,None,android/telephony/PhoneStateListener.LISTEN_NONE,0
-1,Android.Telephony.PhoneStateListenerFlags,ServiceState,android/telephony/PhoneStateListener.LISTEN_SERVICE_STATE,1
-1,Android.Telephony.PhoneStateListenerFlags,SignalStrength,android/telephony/PhoneStateListener.LISTEN_SIGNAL_STRENGTH,2
-7,Android.Telephony.PhoneStateListenerFlags,SignalStrengths,android/telephony/PhoneStateListener.LISTEN_SIGNAL_STRENGTHS,256
-1,Android.Telephony.PhoneState,EmergencyOnly,android/telephony/ServiceState.STATE_EMERGENCY_ONLY,2
-1,Android.Telephony.PhoneState,InService,android/telephony/ServiceState.STATE_IN_SERVICE,0
-1,Android.Telephony.PhoneState,OutOfService,android/telephony/ServiceState.STATE_OUT_OF_SERVICE,1
-1,Android.Telephony.PhoneState,PowerOff,android/telephony/ServiceState.STATE_POWER_OFF,3
-4,Android.Telephony.SmsEncoding,SixteenBit,android/telephony/SmsMessage.ENCODING_16BIT,3
-4,Android.Telephony.SmsEncoding,SevenBit,android/telephony/SmsMessage.ENCODING_7BIT,1
-4,Android.Telephony.SmsEncoding,EightBit,android/telephony/SmsMessage.ENCODING_8BIT,2
-4,Android.Telephony.SmsEncoding,Unknown,android/telephony/SmsMessage.ENCODING_UNKNOWN,0
-1,Android.Telephony.CallState,Idle,android/telephony/TelephonyManager.CALL_STATE_IDLE,0
-1,Android.Telephony.CallState,Offhook,android/telephony/TelephonyManager.CALL_STATE_OFFHOOK,2
-1,Android.Telephony.CallState,Ringing,android/telephony/TelephonyManager.CALL_STATE_RINGING,1
-1,Android.Telephony.DataConnectionStatus,Connected,android/telephony/TelephonyManager.DATA_CONNECTED,2
-1,Android.Telephony.DataConnectionStatus,Connecting,android/telephony/TelephonyManager.DATA_CONNECTING,1
-1,Android.Telephony.DataConnectionStatus,Disconnected,android/telephony/TelephonyManager.DATA_DISCONNECTED,0
-1,Android.Telephony.DataConnectionStatus,Suspended,android/telephony/TelephonyManager.DATA_SUSPENDED,3
-4,Android.Telephony.DataActivity,Dormant,android/telephony/TelephonyManager.DATA_ACTIVITY_DORMANT,4
-1,Android.Telephony.DataActivity,In,android/telephony/TelephonyManager.DATA_ACTIVITY_IN,1
-1,Android.Telephony.DataActivity,Inout,android/telephony/TelephonyManager.DATA_ACTIVITY_INOUT,3
-1,Android.Telephony.DataActivity,None,android/telephony/TelephonyManager.DATA_ACTIVITY_NONE,0
-1,Android.Telephony.DataActivity,Out,android/telephony/TelephonyManager.DATA_ACTIVITY_OUT,2
-4,Android.Telephony.PhoneType,Cdma,android/telephony/TelephonyManager.PHONE_TYPE_CDMA,2
-1,Android.Telephony.PhoneType,Gsm,android/telephony/TelephonyManager.PHONE_TYPE_GSM,1
-1,Android.Telephony.PhoneType,None,android/telephony/TelephonyManager.PHONE_TYPE_NONE,0
-11,Android.Telephony.PhoneType,Sip,android/telephony/TelephonyManager.PHONE_TYPE_SIP,3
-1,Android.Telephony.SimState,Absent,android/telephony/TelephonyManager.SIM_STATE_ABSENT,1
+10,Android.Telephony.PhoneStateListenerFlags,CellLocation,android/telephony/PhoneStateListener.LISTEN_CELL_LOCATION,16
+10,Android.Telephony.PhoneStateListenerFlags,DataActivity,android/telephony/PhoneStateListener.LISTEN_DATA_ACTIVITY,128
+10,Android.Telephony.PhoneStateListenerFlags,DataConnectionState,android/telephony/PhoneStateListener.LISTEN_DATA_CONNECTION_STATE,64
+10,Android.Telephony.PhoneStateListenerFlags,MessageWaitingIndicator,android/telephony/PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR,4
+10,Android.Telephony.PhoneStateListenerFlags,None,android/telephony/PhoneStateListener.LISTEN_NONE,0
+10,Android.Telephony.PhoneStateListenerFlags,ServiceState,android/telephony/PhoneStateListener.LISTEN_SERVICE_STATE,1
+10,Android.Telephony.PhoneStateListenerFlags,SignalStrength,android/telephony/PhoneStateListener.LISTEN_SIGNAL_STRENGTH,2
+10,Android.Telephony.PhoneStateListenerFlags,SignalStrengths,android/telephony/PhoneStateListener.LISTEN_SIGNAL_STRENGTHS,256
+10,Android.Telephony.PhoneState,EmergencyOnly,android/telephony/ServiceState.STATE_EMERGENCY_ONLY,2
+10,Android.Telephony.PhoneState,InService,android/telephony/ServiceState.STATE_IN_SERVICE,0
+10,Android.Telephony.PhoneState,OutOfService,android/telephony/ServiceState.STATE_OUT_OF_SERVICE,1
+10,Android.Telephony.PhoneState,PowerOff,android/telephony/ServiceState.STATE_POWER_OFF,3
+10,Android.Telephony.SmsEncoding,SixteenBit,android/telephony/SmsMessage.ENCODING_16BIT,3
+10,Android.Telephony.SmsEncoding,SevenBit,android/telephony/SmsMessage.ENCODING_7BIT,1
+10,Android.Telephony.SmsEncoding,EightBit,android/telephony/SmsMessage.ENCODING_8BIT,2
+10,Android.Telephony.SmsEncoding,Unknown,android/telephony/SmsMessage.ENCODING_UNKNOWN,0
+10,Android.Telephony.CallState,Idle,android/telephony/TelephonyManager.CALL_STATE_IDLE,0
+10,Android.Telephony.CallState,Offhook,android/telephony/TelephonyManager.CALL_STATE_OFFHOOK,2
+10,Android.Telephony.CallState,Ringing,android/telephony/TelephonyManager.CALL_STATE_RINGING,1
+10,Android.Telephony.DataConnectionStatus,Connected,android/telephony/TelephonyManager.DATA_CONNECTED,2
+10,Android.Telephony.DataConnectionStatus,Connecting,android/telephony/TelephonyManager.DATA_CONNECTING,1
+10,Android.Telephony.DataConnectionStatus,Disconnected,android/telephony/TelephonyManager.DATA_DISCONNECTED,0
+10,Android.Telephony.DataConnectionStatus,Suspended,android/telephony/TelephonyManager.DATA_SUSPENDED,3
+10,Android.Telephony.DataActivity,Dormant,android/telephony/TelephonyManager.DATA_ACTIVITY_DORMANT,4
+10,Android.Telephony.DataActivity,In,android/telephony/TelephonyManager.DATA_ACTIVITY_IN,1
+10,Android.Telephony.DataActivity,Inout,android/telephony/TelephonyManager.DATA_ACTIVITY_INOUT,3
+10,Android.Telephony.DataActivity,None,android/telephony/TelephonyManager.DATA_ACTIVITY_NONE,0
+10,Android.Telephony.DataActivity,Out,android/telephony/TelephonyManager.DATA_ACTIVITY_OUT,2
+10,Android.Telephony.PhoneType,Cdma,android/telephony/TelephonyManager.PHONE_TYPE_CDMA,2
+10,Android.Telephony.PhoneType,Gsm,android/telephony/TelephonyManager.PHONE_TYPE_GSM,1
+10,Android.Telephony.PhoneType,None,android/telephony/TelephonyManager.PHONE_TYPE_NONE,0
+15,Android.Telephony.PhoneType,Sip,android/telephony/TelephonyManager.PHONE_TYPE_SIP,3
+10,Android.Telephony.SimState,Absent,android/telephony/TelephonyManager.SIM_STATE_ABSENT,1
 26,Android.Telephony.SimState,CardIoError,android/telephony/TelephonyManager.SIM_STATE_CARD_IO_ERROR,8
 26,Android.Telephony.SimState,CardRestricted,android/telephony/TelephonyManager.SIM_STATE_CARD_RESTRICTED,9
-1,Android.Telephony.SimState,NetworkLocked,android/telephony/TelephonyManager.SIM_STATE_NETWORK_LOCKED,4
+10,Android.Telephony.SimState,NetworkLocked,android/telephony/TelephonyManager.SIM_STATE_NETWORK_LOCKED,4
 26,Android.Telephony.SimState,NotReady,android/telephony/TelephonyManager.SIM_STATE_NOT_READY,6
 26,Android.Telephony.SimState,PermDisabled,android/telephony/TelephonyManager.SIM_STATE_PERM_DISABLED,7
-1,Android.Telephony.SimState,PinRequired,android/telephony/TelephonyManager.SIM_STATE_PIN_REQUIRED,2
-1,Android.Telephony.SimState,PukRequired,android/telephony/TelephonyManager.SIM_STATE_PUK_REQUIRED,3
-1,Android.Telephony.SimState,Ready,android/telephony/TelephonyManager.SIM_STATE_READY,5
-1,Android.Telephony.SimState,Unknown,android/telephony/TelephonyManager.SIM_STATE_UNKNOWN,0
-1,Android.Telephony.Gsm.SmsEncoding,SixteenBit,android/telephony/gsm/SmsMessage.ENCODING_16BIT,3
-1,Android.Telephony.Gsm.SmsEncoding,SevenBit,android/telephony/gsm/SmsMessage.ENCODING_7BIT,1
-1,Android.Telephony.Gsm.SmsEncoding,EightBit,android/telephony/gsm/SmsMessage.ENCODING_8BIT,2
-1,Android.Telephony.Gsm.SmsEncoding,Unknown,android/telephony/gsm/SmsMessage.ENCODING_UNKNOWN,0
-1,Android.Test.TestResult,Error,android/test/InstrumentationTestRunner.REPORT_VALUE_RESULT_ERROR,-1
-1,Android.Test.TestResult,Failure,android/test/InstrumentationTestRunner.REPORT_VALUE_RESULT_FAILURE,-2
-1,Android.Test.TestResult,Ok,android/test/InstrumentationTestRunner.REPORT_VALUE_RESULT_OK,0
-1,Android.Test.TestResult,Start,android/test/InstrumentationTestRunner.REPORT_VALUE_RESULT_START,1
-1,Android.Text.TextLayoutDirection,LeftToRight,android/text/Layout.DIR_LEFT_TO_RIGHT,1
-1,Android.Text.TextLayoutDirection,RightToLeft,android/text/Layout.DIR_RIGHT_TO_LEFT,-1
-3,Android.Text.SpanTypes,Composing,I:android/text/Spanned.SPAN_COMPOSING,256
-1,Android.Text.SpanTypes,ExclusiveExclusive,I:android/text/Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,33
-1,Android.Text.SpanTypes,ExclusiveInclusive,I:android/text/Spanned.SPAN_EXCLUSIVE_INCLUSIVE,34
-1,Android.Text.SpanTypes,InclusiveExclusive,I:android/text/Spanned.SPAN_INCLUSIVE_EXCLUSIVE,17
-1,Android.Text.SpanTypes,InclusiveInclusive,I:android/text/Spanned.SPAN_INCLUSIVE_INCLUSIVE,18
-3,Android.Text.SpanTypes,Intermediate,I:android/text/Spanned.SPAN_INTERMEDIATE,512
-1,Android.Text.SpanTypes,MarkMark,I:android/text/Spanned.SPAN_MARK_MARK,17
-1,Android.Text.SpanTypes,MarkPoint,I:android/text/Spanned.SPAN_MARK_POINT,18
-1,Android.Text.SpanTypes,Paragraph,I:android/text/Spanned.SPAN_PARAGRAPH,51
-1,Android.Text.SpanTypes,PointMark,I:android/text/Spanned.SPAN_POINT_MARK,33
-3,Android.Text.SpanTypes,PointMarkMask,I:android/text/Spanned.SPAN_POINT_MARK_MASK,51
-1,Android.Text.SpanTypes,PointPoint,I:android/text/Spanned.SPAN_POINT_POINT,34
-1,Android.Text.SpanTypes,Priority,I:android/text/Spanned.SPAN_PRIORITY,16711680
-1,Android.Text.SpanTypes,PriorityShift,I:android/text/Spanned.SPAN_PRIORITY_SHIFT,16
-1,Android.Text.SpanTypes,User,I:android/text/Spanned.SPAN_USER,-16777216
-1,Android.Text.SpanTypes,UserShift,I:android/text/Spanned.SPAN_USER_SHIFT,24
-3,Android.Text.Format.FormatStyleFlags,TwelveHour,android/text/format/DateUtils.FORMAT_12HOUR,64
-3,Android.Text.Format.FormatStyleFlags,TwentyFourHour,android/text/format/DateUtils.FORMAT_24HOUR,128
-3,Android.Text.Format.FormatStyleFlags,AbbrevAll,android/text/format/DateUtils.FORMAT_ABBREV_ALL,524288
-3,Android.Text.Format.FormatStyleFlags,AbbrevMonth,android/text/format/DateUtils.FORMAT_ABBREV_MONTH,65536
-3,Android.Text.Format.FormatStyleFlags,AbbrevRelative,android/text/format/DateUtils.FORMAT_ABBREV_RELATIVE,262144
-3,Android.Text.Format.FormatStyleFlags,AbbrevTime,android/text/format/DateUtils.FORMAT_ABBREV_TIME,16384
-3,Android.Text.Format.FormatStyleFlags,AbbrevWeekday,android/text/format/DateUtils.FORMAT_ABBREV_WEEKDAY,32768
-3,Android.Text.Format.FormatStyleFlags,CapAmpm,android/text/format/DateUtils.FORMAT_CAP_AMPM,256
-3,Android.Text.Format.FormatStyleFlags,CapMidnight,android/text/format/DateUtils.FORMAT_CAP_MIDNIGHT,4096
-3,Android.Text.Format.FormatStyleFlags,CapNoon,android/text/format/DateUtils.FORMAT_CAP_NOON,1024
-3,Android.Text.Format.FormatStyleFlags,CapNoonMidnight,android/text/format/DateUtils.FORMAT_CAP_NOON_MIDNIGHT,5120
-3,Android.Text.Format.FormatStyleFlags,NoMidnight,android/text/format/DateUtils.FORMAT_NO_MIDNIGHT,2048
-3,Android.Text.Format.FormatStyleFlags,NoMonthDay,android/text/format/DateUtils.FORMAT_NO_MONTH_DAY,32
-3,Android.Text.Format.FormatStyleFlags,NoNoon,android/text/format/DateUtils.FORMAT_NO_NOON,512
-3,Android.Text.Format.FormatStyleFlags,NoNoonMidnight,android/text/format/DateUtils.FORMAT_NO_NOON_MIDNIGHT,2560
-3,Android.Text.Format.FormatStyleFlags,NoYear,android/text/format/DateUtils.FORMAT_NO_YEAR,8
-3,Android.Text.Format.FormatStyleFlags,NumericDate,android/text/format/DateUtils.FORMAT_NUMERIC_DATE,131072
-3,Android.Text.Format.FormatStyleFlags,ShowDate,android/text/format/DateUtils.FORMAT_SHOW_DATE,16
-3,Android.Text.Format.FormatStyleFlags,ShowTime,android/text/format/DateUtils.FORMAT_SHOW_TIME,1
-3,Android.Text.Format.FormatStyleFlags,ShowWeekday,android/text/format/DateUtils.FORMAT_SHOW_WEEKDAY,2
-3,Android.Text.Format.FormatStyleFlags,ShowYear,android/text/format/DateUtils.FORMAT_SHOW_YEAR,4
-3,Android.Text.Format.FormatStyleFlags,Utc,android/text/format/DateUtils.FORMAT_UTC,8192
-3,Android.Text.Format.AbbreviationLength,Long,android/text/format/DateUtils.LENGTH_LONG,10
-3,Android.Text.Format.AbbreviationLength,Medium,android/text/format/DateUtils.LENGTH_MEDIUM,20
-3,Android.Text.Format.AbbreviationLength,Short,android/text/format/DateUtils.LENGTH_SHORT,30
-3,Android.Text.Format.AbbreviationLength,Shorter,android/text/format/DateUtils.LENGTH_SHORTER,40
-3,Android.Text.Format.AbbreviationLength,Shortest,android/text/format/DateUtils.LENGTH_SHORTEST,50
-3,Android.Text.Format.DayOfWeek,Sunday,android/text/format/Time.SUNDAY,0
-3,Android.Text.Format.DayOfWeek,Monday,android/text/format/Time.MONDAY,1
-3,Android.Text.Format.DayOfWeek,Tuesday,android/text/format/Time.TUESDAY,2
-3,Android.Text.Format.DayOfWeek,Wednesday,android/text/format/Time.WEDNESDAY,3
-3,Android.Text.Format.DayOfWeek,Thursday,android/text/format/Time.THURSDAY,4
-3,Android.Text.Format.DayOfWeek,Friday,android/text/format/Time.FRIDAY,5
-3,Android.Text.Format.DayOfWeek,Saturday,android/text/format/Time.SATURDAY,6
-11,Android.Text.Format.DayOfWeek,MondayBeforeJulianEpoch,android/text/format/Time.MONDAY_BEFORE_JULIAN_EPOCH,2440585
-3,Android.Text.Format.TimeFormatValues,Hour,android/text/format/Time.HOUR,3
-3,Android.Text.Format.TimeFormatValues,Minute,android/text/format/Time.MINUTE,2
-3,Android.Text.Format.TimeFormatValues,Month,android/text/format/Time.MONTH,5
-3,Android.Text.Format.TimeFormatValues,MonthDay,android/text/format/Time.MONTH_DAY,4
-3,Android.Text.Format.TimeFormatValues,Second,android/text/format/Time.SECOND,1
-3,Android.Text.Format.TimeFormatValues,Weekday,android/text/format/Time.WEEK_DAY,7
-3,Android.Text.Format.TimeFormatValues,WeekNum,android/text/format/Time.WEEK_NUM,9
-3,Android.Text.Format.TimeFormatValues,Year,android/text/format/Time.YEAR,6
-3,Android.Text.Format.TimeFormatValues,YearDay,android/text/format/Time.YEAR_DAY,8
-1,Android.Text.Method.MetaStates,AltLocked,android/text/method/MetaKeyKeyListener.META_ALT_LOCKED,512
-1,Android.Text.Method.MetaStates,AltOn,android/text/method/MetaKeyKeyListener.META_ALT_ON,2
-1,Android.Text.Method.MetaStates,CapLocked,android/text/method/MetaKeyKeyListener.META_CAP_LOCKED,256
-1,Android.Text.Method.MetaStates,ShiftOn,android/text/method/MetaKeyKeyListener.META_SHIFT_ON,1
-1,Android.Text.Method.MetaStates,SymLocked,android/text/method/MetaKeyKeyListener.META_SYM_LOCKED,1024
-1,Android.Text.Method.MetaStates,SymOn,android/text/method/MetaKeyKeyListener.META_SYM_ON,4
-3,Android.Text.Style.SpanAlign,Baseline,android/text/style/DynamicDrawableSpan.ALIGN_BASELINE,1
-3,Android.Text.Style.SpanAlign,Bottom,android/text/style/DynamicDrawableSpan.ALIGN_BOTTOM,0
-1,Android.Text.Util.MatchOptions,All,android/text/util/Linkify.ALL,15
-1,Android.Text.Util.MatchOptions,EmailAddresses,android/text/util/Linkify.EMAIL_ADDRESSES,2
-1,Android.Text.Util.MatchOptions,MapAddresses,android/text/util/Linkify.MAP_ADDRESSES,8
-1,Android.Text.Util.MatchOptions,PhoneNumbers,android/text/util/Linkify.PHONE_NUMBERS,4
-1,Android.Text.Util.MatchOptions,WebUrls,android/text/util/Linkify.WEB_URLS,1
-1,Android.Util.LogPriority,Assert,android/util/Log.ASSERT,7
-1,Android.Util.LogPriority,Debug,android/util/Log.DEBUG,3
-1,Android.Util.LogPriority,Error,android/util/Log.ERROR,6
-1,Android.Util.LogPriority,Info,android/util/Log.INFO,4
-1,Android.Util.LogPriority,Verbose,android/util/Log.VERBOSE,2
-1,Android.Util.LogPriority,Warn,android/util/Log.WARN,5
-1,Android.Util.ComplexType,MantissaMask,android/util/TypedValue.COMPLEX_MANTISSA_MASK,16777215
-1,Android.Util.ComplexType,MantissaShift,android/util/TypedValue.COMPLEX_MANTISSA_SHIFT,8
-1,Android.Util.ComplexType,Radix0p23,android/util/TypedValue.COMPLEX_RADIX_0p23,3
-1,Android.Util.ComplexType,Radix16p7,android/util/TypedValue.COMPLEX_RADIX_16p7,1
-1,Android.Util.ComplexType,Radix23p0,android/util/TypedValue.COMPLEX_RADIX_23p0,0
-1,Android.Util.ComplexType,Radix8p15,android/util/TypedValue.COMPLEX_RADIX_8p15,2
-1,Android.Util.ComplexType,RadixMask,android/util/TypedValue.COMPLEX_RADIX_MASK,3
-1,Android.Util.ComplexType,RadixShift,android/util/TypedValue.COMPLEX_RADIX_SHIFT,4
+10,Android.Telephony.SimState,PinRequired,android/telephony/TelephonyManager.SIM_STATE_PIN_REQUIRED,2
+10,Android.Telephony.SimState,PukRequired,android/telephony/TelephonyManager.SIM_STATE_PUK_REQUIRED,3
+10,Android.Telephony.SimState,Ready,android/telephony/TelephonyManager.SIM_STATE_READY,5
+10,Android.Telephony.SimState,Unknown,android/telephony/TelephonyManager.SIM_STATE_UNKNOWN,0
+10,Android.Telephony.Gsm.SmsEncoding,SixteenBit,android/telephony/gsm/SmsMessage.ENCODING_16BIT,3
+10,Android.Telephony.Gsm.SmsEncoding,SevenBit,android/telephony/gsm/SmsMessage.ENCODING_7BIT,1
+10,Android.Telephony.Gsm.SmsEncoding,EightBit,android/telephony/gsm/SmsMessage.ENCODING_8BIT,2
+10,Android.Telephony.Gsm.SmsEncoding,Unknown,android/telephony/gsm/SmsMessage.ENCODING_UNKNOWN,0
+10,Android.Test.TestResult,Error,android/test/InstrumentationTestRunner.REPORT_VALUE_RESULT_ERROR,-1
+10,Android.Test.TestResult,Failure,android/test/InstrumentationTestRunner.REPORT_VALUE_RESULT_FAILURE,-2
+10,Android.Test.TestResult,Ok,android/test/InstrumentationTestRunner.REPORT_VALUE_RESULT_OK,0
+10,Android.Test.TestResult,Start,android/test/InstrumentationTestRunner.REPORT_VALUE_RESULT_START,1
+10,Android.Text.TextLayoutDirection,LeftToRight,android/text/Layout.DIR_LEFT_TO_RIGHT,1
+10,Android.Text.TextLayoutDirection,RightToLeft,android/text/Layout.DIR_RIGHT_TO_LEFT,-1
+10,Android.Text.SpanTypes,Composing,I:android/text/Spanned.SPAN_COMPOSING,256
+10,Android.Text.SpanTypes,ExclusiveExclusive,I:android/text/Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,33
+10,Android.Text.SpanTypes,ExclusiveInclusive,I:android/text/Spanned.SPAN_EXCLUSIVE_INCLUSIVE,34
+10,Android.Text.SpanTypes,InclusiveExclusive,I:android/text/Spanned.SPAN_INCLUSIVE_EXCLUSIVE,17
+10,Android.Text.SpanTypes,InclusiveInclusive,I:android/text/Spanned.SPAN_INCLUSIVE_INCLUSIVE,18
+10,Android.Text.SpanTypes,Intermediate,I:android/text/Spanned.SPAN_INTERMEDIATE,512
+10,Android.Text.SpanTypes,MarkMark,I:android/text/Spanned.SPAN_MARK_MARK,17
+10,Android.Text.SpanTypes,MarkPoint,I:android/text/Spanned.SPAN_MARK_POINT,18
+10,Android.Text.SpanTypes,Paragraph,I:android/text/Spanned.SPAN_PARAGRAPH,51
+10,Android.Text.SpanTypes,PointMark,I:android/text/Spanned.SPAN_POINT_MARK,33
+10,Android.Text.SpanTypes,PointMarkMask,I:android/text/Spanned.SPAN_POINT_MARK_MASK,51
+10,Android.Text.SpanTypes,PointPoint,I:android/text/Spanned.SPAN_POINT_POINT,34
+10,Android.Text.SpanTypes,Priority,I:android/text/Spanned.SPAN_PRIORITY,16711680
+10,Android.Text.SpanTypes,PriorityShift,I:android/text/Spanned.SPAN_PRIORITY_SHIFT,16
+10,Android.Text.SpanTypes,User,I:android/text/Spanned.SPAN_USER,-16777216
+10,Android.Text.SpanTypes,UserShift,I:android/text/Spanned.SPAN_USER_SHIFT,24
+10,Android.Text.Format.FormatStyleFlags,TwelveHour,android/text/format/DateUtils.FORMAT_12HOUR,64
+10,Android.Text.Format.FormatStyleFlags,TwentyFourHour,android/text/format/DateUtils.FORMAT_24HOUR,128
+10,Android.Text.Format.FormatStyleFlags,AbbrevAll,android/text/format/DateUtils.FORMAT_ABBREV_ALL,524288
+10,Android.Text.Format.FormatStyleFlags,AbbrevMonth,android/text/format/DateUtils.FORMAT_ABBREV_MONTH,65536
+10,Android.Text.Format.FormatStyleFlags,AbbrevRelative,android/text/format/DateUtils.FORMAT_ABBREV_RELATIVE,262144
+10,Android.Text.Format.FormatStyleFlags,AbbrevTime,android/text/format/DateUtils.FORMAT_ABBREV_TIME,16384
+10,Android.Text.Format.FormatStyleFlags,AbbrevWeekday,android/text/format/DateUtils.FORMAT_ABBREV_WEEKDAY,32768
+10,Android.Text.Format.FormatStyleFlags,CapAmpm,android/text/format/DateUtils.FORMAT_CAP_AMPM,256
+10,Android.Text.Format.FormatStyleFlags,CapMidnight,android/text/format/DateUtils.FORMAT_CAP_MIDNIGHT,4096
+10,Android.Text.Format.FormatStyleFlags,CapNoon,android/text/format/DateUtils.FORMAT_CAP_NOON,1024
+10,Android.Text.Format.FormatStyleFlags,CapNoonMidnight,android/text/format/DateUtils.FORMAT_CAP_NOON_MIDNIGHT,5120
+10,Android.Text.Format.FormatStyleFlags,NoMidnight,android/text/format/DateUtils.FORMAT_NO_MIDNIGHT,2048
+10,Android.Text.Format.FormatStyleFlags,NoMonthDay,android/text/format/DateUtils.FORMAT_NO_MONTH_DAY,32
+10,Android.Text.Format.FormatStyleFlags,NoNoon,android/text/format/DateUtils.FORMAT_NO_NOON,512
+10,Android.Text.Format.FormatStyleFlags,NoNoonMidnight,android/text/format/DateUtils.FORMAT_NO_NOON_MIDNIGHT,2560
+10,Android.Text.Format.FormatStyleFlags,NoYear,android/text/format/DateUtils.FORMAT_NO_YEAR,8
+10,Android.Text.Format.FormatStyleFlags,NumericDate,android/text/format/DateUtils.FORMAT_NUMERIC_DATE,131072
+10,Android.Text.Format.FormatStyleFlags,ShowDate,android/text/format/DateUtils.FORMAT_SHOW_DATE,16
+10,Android.Text.Format.FormatStyleFlags,ShowTime,android/text/format/DateUtils.FORMAT_SHOW_TIME,1
+10,Android.Text.Format.FormatStyleFlags,ShowWeekday,android/text/format/DateUtils.FORMAT_SHOW_WEEKDAY,2
+10,Android.Text.Format.FormatStyleFlags,ShowYear,android/text/format/DateUtils.FORMAT_SHOW_YEAR,4
+10,Android.Text.Format.FormatStyleFlags,Utc,android/text/format/DateUtils.FORMAT_UTC,8192
+10,Android.Text.Format.AbbreviationLength,Long,android/text/format/DateUtils.LENGTH_LONG,10
+10,Android.Text.Format.AbbreviationLength,Medium,android/text/format/DateUtils.LENGTH_MEDIUM,20
+10,Android.Text.Format.AbbreviationLength,Short,android/text/format/DateUtils.LENGTH_SHORT,30
+10,Android.Text.Format.AbbreviationLength,Shorter,android/text/format/DateUtils.LENGTH_SHORTER,40
+10,Android.Text.Format.AbbreviationLength,Shortest,android/text/format/DateUtils.LENGTH_SHORTEST,50
+10,Android.Text.Format.DayOfWeek,Sunday,android/text/format/Time.SUNDAY,0
+10,Android.Text.Format.DayOfWeek,Monday,android/text/format/Time.MONDAY,1
+10,Android.Text.Format.DayOfWeek,Tuesday,android/text/format/Time.TUESDAY,2
+10,Android.Text.Format.DayOfWeek,Wednesday,android/text/format/Time.WEDNESDAY,3
+10,Android.Text.Format.DayOfWeek,Thursday,android/text/format/Time.THURSDAY,4
+10,Android.Text.Format.DayOfWeek,Friday,android/text/format/Time.FRIDAY,5
+10,Android.Text.Format.DayOfWeek,Saturday,android/text/format/Time.SATURDAY,6
+15,Android.Text.Format.DayOfWeek,MondayBeforeJulianEpoch,android/text/format/Time.MONDAY_BEFORE_JULIAN_EPOCH,2440585
+10,Android.Text.Format.TimeFormatValues,Hour,android/text/format/Time.HOUR,3
+10,Android.Text.Format.TimeFormatValues,Minute,android/text/format/Time.MINUTE,2
+10,Android.Text.Format.TimeFormatValues,Month,android/text/format/Time.MONTH,5
+10,Android.Text.Format.TimeFormatValues,MonthDay,android/text/format/Time.MONTH_DAY,4
+10,Android.Text.Format.TimeFormatValues,Second,android/text/format/Time.SECOND,1
+10,Android.Text.Format.TimeFormatValues,Weekday,android/text/format/Time.WEEK_DAY,7
+10,Android.Text.Format.TimeFormatValues,WeekNum,android/text/format/Time.WEEK_NUM,9
+10,Android.Text.Format.TimeFormatValues,Year,android/text/format/Time.YEAR,6
+10,Android.Text.Format.TimeFormatValues,YearDay,android/text/format/Time.YEAR_DAY,8
+10,Android.Text.Method.MetaStates,AltLocked,android/text/method/MetaKeyKeyListener.META_ALT_LOCKED,512
+10,Android.Text.Method.MetaStates,AltOn,android/text/method/MetaKeyKeyListener.META_ALT_ON,2
+10,Android.Text.Method.MetaStates,CapLocked,android/text/method/MetaKeyKeyListener.META_CAP_LOCKED,256
+10,Android.Text.Method.MetaStates,ShiftOn,android/text/method/MetaKeyKeyListener.META_SHIFT_ON,1
+10,Android.Text.Method.MetaStates,SymLocked,android/text/method/MetaKeyKeyListener.META_SYM_LOCKED,1024
+10,Android.Text.Method.MetaStates,SymOn,android/text/method/MetaKeyKeyListener.META_SYM_ON,4
+10,Android.Text.Style.SpanAlign,Baseline,android/text/style/DynamicDrawableSpan.ALIGN_BASELINE,1
+10,Android.Text.Style.SpanAlign,Bottom,android/text/style/DynamicDrawableSpan.ALIGN_BOTTOM,0
+10,Android.Text.Util.MatchOptions,All,android/text/util/Linkify.ALL,15
+10,Android.Text.Util.MatchOptions,EmailAddresses,android/text/util/Linkify.EMAIL_ADDRESSES,2
+10,Android.Text.Util.MatchOptions,MapAddresses,android/text/util/Linkify.MAP_ADDRESSES,8
+10,Android.Text.Util.MatchOptions,PhoneNumbers,android/text/util/Linkify.PHONE_NUMBERS,4
+10,Android.Text.Util.MatchOptions,WebUrls,android/text/util/Linkify.WEB_URLS,1
+10,Android.Util.LogPriority,Assert,android/util/Log.ASSERT,7
+10,Android.Util.LogPriority,Debug,android/util/Log.DEBUG,3
+10,Android.Util.LogPriority,Error,android/util/Log.ERROR,6
+10,Android.Util.LogPriority,Info,android/util/Log.INFO,4
+10,Android.Util.LogPriority,Verbose,android/util/Log.VERBOSE,2
+10,Android.Util.LogPriority,Warn,android/util/Log.WARN,5
+10,Android.Util.ComplexType,MantissaMask,android/util/TypedValue.COMPLEX_MANTISSA_MASK,16777215
+10,Android.Util.ComplexType,MantissaShift,android/util/TypedValue.COMPLEX_MANTISSA_SHIFT,8
+10,Android.Util.ComplexType,Radix0p23,android/util/TypedValue.COMPLEX_RADIX_0p23,3
+10,Android.Util.ComplexType,Radix16p7,android/util/TypedValue.COMPLEX_RADIX_16p7,1
+10,Android.Util.ComplexType,Radix23p0,android/util/TypedValue.COMPLEX_RADIX_23p0,0
+10,Android.Util.ComplexType,Radix8p15,android/util/TypedValue.COMPLEX_RADIX_8p15,2
+10,Android.Util.ComplexType,RadixMask,android/util/TypedValue.COMPLEX_RADIX_MASK,3
+10,Android.Util.ComplexType,RadixShift,android/util/TypedValue.COMPLEX_RADIX_SHIFT,4
 21,Android.Views.DisplayState,Doze,android/view/Display.STATE_DOZE,3
 21,Android.Views.DisplayState,DozeSuspend,android/view/Display.STATE_DOZE_SUSPEND,4
+20,Android.Views.DisplayState,Dozing,android/view/Display.STATE_DOZING,3
 20,Android.Views.DisplayState,Off,android/view/Display.STATE_OFF,1
 20,Android.Views.DisplayState,On,android/view/Display.STATE_ON,2
 20,Android.Views.DisplayState,Unknown,android/view/Display.STATE_UNKNOWN,0
 26,Android.Views.DisplayState,Vr,android/view/Display.STATE_VR,5
-11,Android.Views.DragAction,Drop,android/view/DragEvent.ACTION_DROP,3
-11,Android.Views.DragAction,Ended,android/view/DragEvent.ACTION_DRAG_ENDED,4
-11,Android.Views.DragAction,Entered,android/view/DragEvent.ACTION_DRAG_ENTERED,5
-11,Android.Views.DragAction,Exited,android/view/DragEvent.ACTION_DRAG_EXITED,6
-11,Android.Views.DragAction,Location,android/view/DragEvent.ACTION_DRAG_LOCATION,2
-11,Android.Views.DragAction,Started,android/view/DragEvent.ACTION_DRAG_STARTED,1
-1,Android.Views.KeyboardType,Alpha,android/view/KeyCharacterMap.ALPHA,3
-1,Android.Views.KeyboardType,BuiltInKeyboard,android/view/KeyCharacterMap.BUILT_IN_KEYBOARD,0
-11,Android.Views.KeyboardType,Full,android/view/KeyCharacterMap.FULL,4
-1,Android.Views.KeyboardType,Numeric,android/view/KeyCharacterMap.NUMERIC,1
-1,Android.Views.KeyboardType,Predictive,android/view/KeyCharacterMap.PREDICTIVE,2
-11,Android.Views.KeyboardType,SpecialFunction,android/view/KeyCharacterMap.SPECIAL_FUNCTION,5
-11,Android.Views.KeyboardType,VirtualKeyboard,android/view/KeyCharacterMap.VIRTUAL_KEYBOARD,-1
-11,Android.Views.KeyModifierBehavior,Chorded,android/view/KeyCharacterMap.MODIFIER_BEHAVIOR_CHORDED,0
-11,Android.Views.KeyModifierBehavior,ChordedOrToggled,android/view/KeyCharacterMap.MODIFIER_BEHAVIOR_CHORDED_OR_TOGGLED,1
-1,Android.Views.SoundEffects,Click,android/view/SoundEffectConstants.CLICK,0
-1,Android.Views.SoundEffects,NavigationDown,android/view/SoundEffectConstants.NAVIGATION_DOWN,4
-1,Android.Views.SoundEffects,NavigationLeft,android/view/SoundEffectConstants.NAVIGATION_LEFT,1
-1,Android.Views.SoundEffects,NavigationRight,android/view/SoundEffectConstants.NAVIGATION_RIGHT,3
-1,Android.Views.SoundEffects,NavigationUp,android/view/SoundEffectConstants.NAVIGATION_UP,2
-1,Android.Views.SurfaceOrientation,Rotation0,android/view/Surface.ROTATION_0,0
-1,Android.Views.SurfaceOrientation,Rotation180,android/view/Surface.ROTATION_180,2
-1,Android.Views.SurfaceOrientation,Rotation270,android/view/Surface.ROTATION_270,3
-1,Android.Views.SurfaceOrientation,Rotation90,android/view/Surface.ROTATION_90,1
-1,Android.Views.TouchableRegion,Above,android/view/TouchDelegate.ABOVE,1
-1,Android.Views.TouchableRegion,Below,android/view/TouchDelegate.BELOW,2
-1,Android.Views.TouchableRegion,ToLeft,android/view/TouchDelegate.TO_LEFT,4
-1,Android.Views.TouchableRegion,ToRight,android/view/TouchDelegate.TO_RIGHT,8
-1,Android.Views.DrawingCacheQuality,Auto,android/view/View.DRAWING_CACHE_QUALITY_AUTO,0
-1,Android.Views.DrawingCacheQuality,High,android/view/View.DRAWING_CACHE_QUALITY_HIGH,1048576
-1,Android.Views.DrawingCacheQuality,Low,android/view/View.DRAWING_CACHE_QUALITY_LOW,524288
-1,Android.Views.FocusSearchDirection,Backward,android/view/View.FOCUS_BACKWARD,1
-1,Android.Views.FocusSearchDirection,Down,android/view/View.FOCUS_DOWN,130
-1,Android.Views.FocusSearchDirection,Forward,android/view/View.FOCUS_FORWARD,2
-1,Android.Views.FocusSearchDirection,Left,android/view/View.FOCUS_LEFT,17
-1,Android.Views.FocusSearchDirection,Right,android/view/View.FOCUS_RIGHT,66
-1,Android.Views.FocusSearchDirection,Up,android/view/View.FOCUS_UP,33
-4,Android.Views.FocusablesFlags,All,android/view/View.FOCUSABLES_ALL,0
-4,Android.Views.FocusablesFlags,TouchMode,android/view/View.FOCUSABLES_TOUCH_MODE,1
-11,Android.Views.LayerType,Hardware,android/view/View.LAYER_TYPE_HARDWARE,2
-11,Android.Views.LayerType,None,android/view/View.LAYER_TYPE_NONE,0
-11,Android.Views.LayerType,Software,android/view/View.LAYER_TYPE_SOFTWARE,1
-11,Android.Views.ScrollbarPosition,Default,android/view/View.SCROLLBAR_POSITION_DEFAULT,0
-11,Android.Views.ScrollbarPosition,Left,android/view/View.SCROLLBAR_POSITION_LEFT,1
-11,Android.Views.ScrollbarPosition,Right,android/view/View.SCROLLBAR_POSITION_RIGHT,2
-1,Android.Views.ScrollbarStyles,InsideInset,android/view/View.SCROLLBARS_INSIDE_INSET,16777216
-1,Android.Views.ScrollbarStyles,InsideOverlay,android/view/View.SCROLLBARS_INSIDE_OVERLAY,0
-1,Android.Views.ScrollbarStyles,OutsideInset,android/view/View.SCROLLBARS_OUTSIDE_INSET,50331648
-1,Android.Views.ScrollbarStyles,OutsideOverlay,android/view/View.SCROLLBARS_OUTSIDE_OVERLAY,33554432
-11,Android.Views.StatusBarVisibility,Hidden,android/view/View.STATUS_BAR_HIDDEN,1
-11,Android.Views.StatusBarVisibility,Visible,android/view/View.STATUS_BAR_VISIBLE,0
-1,Android.Views.ViewStates,Gone,android/view/View.GONE,8
-1,Android.Views.ViewStates,Visible,android/view/View.VISIBLE,0
-1,Android.Views.ViewStates,Invisible,android/view/View.INVISIBLE,4
-1,Android.Views.MeasureSpecMode,AtMost,android/view/View.MeasureSpec.AT_MOST,-2147483648
-1,Android.Views.MeasureSpecMode,Exactly,android/view/View.MeasureSpec.EXACTLY,1073741824
-1,Android.Views.MeasureSpecMode,Unspecified,android/view/View.MeasureSpec.UNSPECIFIED,0
-1,Android.Views.DescendantFocusability,AfterDescendants,android/view/ViewGroup.FOCUS_AFTER_DESCENDANTS,262144
-1,Android.Views.DescendantFocusability,BeforeDescendants,android/view/ViewGroup.FOCUS_BEFORE_DESCENDANTS,131072
-1,Android.Views.DescendantFocusability,BlockDescendants,android/view/ViewGroup.FOCUS_BLOCK_DESCENDANTS,393216
-1,Android.Views.PersistentDrawingCaches,AllCaches,android/view/ViewGroup.PERSISTENT_ALL_CACHES,3
-1,Android.Views.PersistentDrawingCaches,AnimationCache,android/view/ViewGroup.PERSISTENT_ANIMATION_CACHE,1
-1,Android.Views.PersistentDrawingCaches,NoCache,android/view/ViewGroup.PERSISTENT_NO_CACHE,0
-1,Android.Views.PersistentDrawingCaches,ScrollingCache,android/view/ViewGroup.PERSISTENT_SCROLLING_CACHE,2
-1,Android.Views.WindowFeatures,DefaultFeatures,android/view/Window.DEFAULT_FEATURES,65
-11,Android.Views.WindowFeatures,ActionBar,android/view/Window.FEATURE_ACTION_BAR,8
-11,Android.Views.WindowFeatures,ActionBarOverlay,android/view/Window.FEATURE_ACTION_BAR_OVERLAY,9
-11,Android.Views.WindowFeatures,ActionModeOverlay,android/view/Window.FEATURE_ACTION_MODE_OVERLAY,10
+15,Android.Views.DragAction,Drop,android/view/DragEvent.ACTION_DROP,3
+15,Android.Views.DragAction,Ended,android/view/DragEvent.ACTION_DRAG_ENDED,4
+15,Android.Views.DragAction,Entered,android/view/DragEvent.ACTION_DRAG_ENTERED,5
+15,Android.Views.DragAction,Exited,android/view/DragEvent.ACTION_DRAG_EXITED,6
+15,Android.Views.DragAction,Location,android/view/DragEvent.ACTION_DRAG_LOCATION,2
+15,Android.Views.DragAction,Started,android/view/DragEvent.ACTION_DRAG_STARTED,1
+10,Android.Views.KeyboardType,Alpha,android/view/KeyCharacterMap.ALPHA,3
+10,Android.Views.KeyboardType,BuiltInKeyboard,android/view/KeyCharacterMap.BUILT_IN_KEYBOARD,0
+15,Android.Views.KeyboardType,Full,android/view/KeyCharacterMap.FULL,4
+10,Android.Views.KeyboardType,Numeric,android/view/KeyCharacterMap.NUMERIC,1
+10,Android.Views.KeyboardType,Predictive,android/view/KeyCharacterMap.PREDICTIVE,2
+15,Android.Views.KeyboardType,SpecialFunction,android/view/KeyCharacterMap.SPECIAL_FUNCTION,5
+15,Android.Views.KeyboardType,VirtualKeyboard,android/view/KeyCharacterMap.VIRTUAL_KEYBOARD,-1
+15,Android.Views.KeyModifierBehavior,Chorded,android/view/KeyCharacterMap.MODIFIER_BEHAVIOR_CHORDED,0
+15,Android.Views.KeyModifierBehavior,ChordedOrToggled,android/view/KeyCharacterMap.MODIFIER_BEHAVIOR_CHORDED_OR_TOGGLED,1
+10,Android.Views.SoundEffects,Click,android/view/SoundEffectConstants.CLICK,0
+10,Android.Views.SoundEffects,NavigationDown,android/view/SoundEffectConstants.NAVIGATION_DOWN,4
+10,Android.Views.SoundEffects,NavigationLeft,android/view/SoundEffectConstants.NAVIGATION_LEFT,1
+10,Android.Views.SoundEffects,NavigationRight,android/view/SoundEffectConstants.NAVIGATION_RIGHT,3
+10,Android.Views.SoundEffects,NavigationUp,android/view/SoundEffectConstants.NAVIGATION_UP,2
+10,Android.Views.SurfaceOrientation,Rotation0,android/view/Surface.ROTATION_0,0
+10,Android.Views.SurfaceOrientation,Rotation180,android/view/Surface.ROTATION_180,2
+10,Android.Views.SurfaceOrientation,Rotation270,android/view/Surface.ROTATION_270,3
+10,Android.Views.SurfaceOrientation,Rotation90,android/view/Surface.ROTATION_90,1
+10,Android.Views.TouchableRegion,Above,android/view/TouchDelegate.ABOVE,1
+10,Android.Views.TouchableRegion,Below,android/view/TouchDelegate.BELOW,2
+10,Android.Views.TouchableRegion,ToLeft,android/view/TouchDelegate.TO_LEFT,4
+10,Android.Views.TouchableRegion,ToRight,android/view/TouchDelegate.TO_RIGHT,8
+10,Android.Views.DrawingCacheQuality,Auto,android/view/View.DRAWING_CACHE_QUALITY_AUTO,0
+10,Android.Views.DrawingCacheQuality,High,android/view/View.DRAWING_CACHE_QUALITY_HIGH,1048576
+10,Android.Views.DrawingCacheQuality,Low,android/view/View.DRAWING_CACHE_QUALITY_LOW,524288
+10,Android.Views.FocusSearchDirection,Backward,android/view/View.FOCUS_BACKWARD,1
+10,Android.Views.FocusSearchDirection,Down,android/view/View.FOCUS_DOWN,130
+10,Android.Views.FocusSearchDirection,Forward,android/view/View.FOCUS_FORWARD,2
+10,Android.Views.FocusSearchDirection,Left,android/view/View.FOCUS_LEFT,17
+10,Android.Views.FocusSearchDirection,Right,android/view/View.FOCUS_RIGHT,66
+10,Android.Views.FocusSearchDirection,Up,android/view/View.FOCUS_UP,33
+10,Android.Views.FocusablesFlags,All,android/view/View.FOCUSABLES_ALL,0
+10,Android.Views.FocusablesFlags,TouchMode,android/view/View.FOCUSABLES_TOUCH_MODE,1
+15,Android.Views.LayerType,Hardware,android/view/View.LAYER_TYPE_HARDWARE,2
+15,Android.Views.LayerType,None,android/view/View.LAYER_TYPE_NONE,0
+15,Android.Views.LayerType,Software,android/view/View.LAYER_TYPE_SOFTWARE,1
+15,Android.Views.ScrollbarPosition,Default,android/view/View.SCROLLBAR_POSITION_DEFAULT,0
+15,Android.Views.ScrollbarPosition,Left,android/view/View.SCROLLBAR_POSITION_LEFT,1
+15,Android.Views.ScrollbarPosition,Right,android/view/View.SCROLLBAR_POSITION_RIGHT,2
+10,Android.Views.ScrollbarStyles,InsideInset,android/view/View.SCROLLBARS_INSIDE_INSET,16777216
+10,Android.Views.ScrollbarStyles,InsideOverlay,android/view/View.SCROLLBARS_INSIDE_OVERLAY,0
+10,Android.Views.ScrollbarStyles,OutsideInset,android/view/View.SCROLLBARS_OUTSIDE_INSET,50331648
+10,Android.Views.ScrollbarStyles,OutsideOverlay,android/view/View.SCROLLBARS_OUTSIDE_OVERLAY,33554432
+15,Android.Views.StatusBarVisibility,Hidden,android/view/View.STATUS_BAR_HIDDEN,1
+15,Android.Views.StatusBarVisibility,Visible,android/view/View.STATUS_BAR_VISIBLE,0
+10,Android.Views.ViewStates,Gone,android/view/View.GONE,8
+10,Android.Views.ViewStates,Visible,android/view/View.VISIBLE,0
+10,Android.Views.ViewStates,Invisible,android/view/View.INVISIBLE,4
+10,Android.Views.MeasureSpecMode,AtMost,android/view/View.MeasureSpec.AT_MOST,-2147483648
+10,Android.Views.MeasureSpecMode,Exactly,android/view/View.MeasureSpec.EXACTLY,1073741824
+10,Android.Views.MeasureSpecMode,Unspecified,android/view/View.MeasureSpec.UNSPECIFIED,0
+10,Android.Views.DescendantFocusability,AfterDescendants,android/view/ViewGroup.FOCUS_AFTER_DESCENDANTS,262144
+10,Android.Views.DescendantFocusability,BeforeDescendants,android/view/ViewGroup.FOCUS_BEFORE_DESCENDANTS,131072
+10,Android.Views.DescendantFocusability,BlockDescendants,android/view/ViewGroup.FOCUS_BLOCK_DESCENDANTS,393216
+10,Android.Views.PersistentDrawingCaches,AllCaches,android/view/ViewGroup.PERSISTENT_ALL_CACHES,3
+10,Android.Views.PersistentDrawingCaches,AnimationCache,android/view/ViewGroup.PERSISTENT_ANIMATION_CACHE,1
+10,Android.Views.PersistentDrawingCaches,NoCache,android/view/ViewGroup.PERSISTENT_NO_CACHE,0
+10,Android.Views.PersistentDrawingCaches,ScrollingCache,android/view/ViewGroup.PERSISTENT_SCROLLING_CACHE,2
+10,Android.Views.WindowFeatures,DefaultFeatures,android/view/Window.DEFAULT_FEATURES,65
+15,Android.Views.WindowFeatures,ActionBar,android/view/Window.FEATURE_ACTION_BAR,8
+15,Android.Views.WindowFeatures,ActionBarOverlay,android/view/Window.FEATURE_ACTION_BAR_OVERLAY,9
+15,Android.Views.WindowFeatures,ActionModeOverlay,android/view/Window.FEATURE_ACTION_MODE_OVERLAY,10
 21,Android.Views.WindowFeatures,ActivityTransitions,android/view/Window.FEATURE_ACTIVITY_TRANSITIONS,13
 21,Android.Views.WindowFeatures,ContentTransitions,android/view/Window.FEATURE_CONTENT_TRANSITIONS,12
-1,Android.Views.WindowFeatures,ContextMenu,android/view/Window.FEATURE_CONTEXT_MENU,6
-1,Android.Views.WindowFeatures,CustomTitle,android/view/Window.FEATURE_CUSTOM_TITLE,7
-1,Android.Views.WindowFeatures,IndeterminateProgress,android/view/Window.FEATURE_INDETERMINATE_PROGRESS,5
-1,Android.Views.WindowFeatures,LeftIcon,android/view/Window.FEATURE_LEFT_ICON,3
-1,Android.Views.WindowFeatures,NoTitle,android/view/Window.FEATURE_NO_TITLE,1
-1,Android.Views.WindowFeatures,OptionsPanel,android/view/Window.FEATURE_OPTIONS_PANEL,0
-1,Android.Views.WindowFeatures,Progress,android/view/Window.FEATURE_PROGRESS,2
-1,Android.Views.WindowFeatures,RightIcon,android/view/Window.FEATURE_RIGHT_ICON,4
+10,Android.Views.WindowFeatures,ContextMenu,android/view/Window.FEATURE_CONTEXT_MENU,6
+10,Android.Views.WindowFeatures,CustomTitle,android/view/Window.FEATURE_CUSTOM_TITLE,7
+10,Android.Views.WindowFeatures,IndeterminateProgress,android/view/Window.FEATURE_INDETERMINATE_PROGRESS,5
+10,Android.Views.WindowFeatures,LeftIcon,android/view/Window.FEATURE_LEFT_ICON,3
+10,Android.Views.WindowFeatures,NoTitle,android/view/Window.FEATURE_NO_TITLE,1
+10,Android.Views.WindowFeatures,OptionsPanel,android/view/Window.FEATURE_OPTIONS_PANEL,0
+10,Android.Views.WindowFeatures,Progress,android/view/Window.FEATURE_PROGRESS,2
+10,Android.Views.WindowFeatures,RightIcon,android/view/Window.FEATURE_RIGHT_ICON,4
 20,Android.Views.WindowFeatures,SwipeToDismiss,android/view/Window.FEATURE_SWIPE_TO_DISMISS,11
 0,Android.Views.MenuAppendFlags,None,,0
-1,Android.Views.MenuAppendFlags,AppendToGroup,I:android/view/Menu.FLAG_APPEND_TO_GROUP,1
-1,Android.Views.SurfaceType,Gpu,I:android/view/SurfaceHolder.SURFACE_TYPE_GPU,2
-1,Android.Views.SurfaceType,Hardware,I:android/view/SurfaceHolder.SURFACE_TYPE_HARDWARE,1
-1,Android.Views.SurfaceType,Normal,I:android/view/SurfaceHolder.SURFACE_TYPE_NORMAL,0
-1,Android.Views.SurfaceType,PushBuffers,I:android/view/SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS,3
-1,Android.Views.Animations.RepeatMode,Restart,android/view/animation/Animation.RESTART,1
-1,Android.Views.Animations.RepeatMode,Reverse,android/view/animation/Animation.REVERSE,2
-1,Android.Views.Animations.Dimension,Absolute,android/view/animation/Animation.ABSOLUTE,0
-1,Android.Views.Animations.Dimension,RelativeToParent,android/view/animation/Animation.RELATIVE_TO_PARENT,2
-1,Android.Views.Animations.Dimension,RelativeToSelf,android/view/animation/Animation.RELATIVE_TO_SELF,1
-1,Android.Views.Animations.ContentZorder,Bottom,android/view/animation/Animation.ZORDER_BOTTOM,-1
-1,Android.Views.Animations.ContentZorder,Normal,android/view/animation/Animation.ZORDER_NORMAL,0
-1,Android.Views.Animations.ContentZorder,Top,android/view/animation/Animation.ZORDER_TOP,1
-1,Android.Views.Animations.Direction,BottomToTop,android/view/animation/GridLayoutAnimationController.DIRECTION_BOTTOM_TO_TOP,2
-1,Android.Views.Animations.Direction,HorizontalMask,android/view/animation/GridLayoutAnimationController.DIRECTION_HORIZONTAL_MASK,1
-1,Android.Views.Animations.Direction,LeftToRight,android/view/animation/GridLayoutAnimationController.DIRECTION_LEFT_TO_RIGHT,0
-1,Android.Views.Animations.Direction,RightToLeft,android/view/animation/GridLayoutAnimationController.DIRECTION_RIGHT_TO_LEFT,1
-1,Android.Views.Animations.Direction,TopToBottom,android/view/animation/GridLayoutAnimationController.DIRECTION_TOP_TO_BOTTOM,0
-1,Android.Views.Animations.Direction,VerticalMask,android/view/animation/GridLayoutAnimationController.DIRECTION_VERTICAL_MASK,2
-1,Android.Views.Animations.Priority,Column,android/view/animation/GridLayoutAnimationController.PRIORITY_COLUMN,1
-1,Android.Views.Animations.Priority,None,android/view/animation/GridLayoutAnimationController.PRIORITY_NONE,0
-1,Android.Views.Animations.Priority,Row,android/view/animation/GridLayoutAnimationController.PRIORITY_ROW,2
-1,Android.Views.Animations.DelayOrder,Normal,android/view/animation/LayoutAnimationController.ORDER_NORMAL,0
-1,Android.Views.Animations.DelayOrder,Random,android/view/animation/LayoutAnimationController.ORDER_RANDOM,2
-1,Android.Views.Animations.DelayOrder,Reverse,android/view/animation/LayoutAnimationController.ORDER_REVERSE,1
-1,Android.Views.Animations.TransformationTypes,Alpha,android/view/animation/Transformation.TYPE_ALPHA,1
-1,Android.Views.Animations.TransformationTypes,Both,android/view/animation/Transformation.TYPE_BOTH,3
-1,Android.Views.Animations.TransformationTypes,Identity,android/view/animation/Transformation.TYPE_IDENTITY,0
-1,Android.Views.Animations.TransformationTypes,Matrix,android/view/animation/Transformation.TYPE_MATRIX,2
-3,Android.Views.InputMethods.ImeAction,ImeMaskAction,android/view/inputmethod/EditorInfo.IME_MASK_ACTION,255
-3,Android.Views.InputMethods.ImeAction,ImeNull,android/view/inputmethod/EditorInfo.IME_NULL,0
-3,Android.Views.InputMethods.ImeAction,Done,android/view/inputmethod/EditorInfo.IME_ACTION_DONE,6
-3,Android.Views.InputMethods.ImeAction,Go,android/view/inputmethod/EditorInfo.IME_ACTION_GO,2
-3,Android.Views.InputMethods.ImeAction,Next,android/view/inputmethod/EditorInfo.IME_ACTION_NEXT,5
-3,Android.Views.InputMethods.ImeAction,None,android/view/inputmethod/EditorInfo.IME_ACTION_NONE,1
-11,Android.Views.InputMethods.ImeAction,Previous,android/view/inputmethod/EditorInfo.IME_ACTION_PREVIOUS,7
-3,Android.Views.InputMethods.ImeAction,Search,android/view/inputmethod/EditorInfo.IME_ACTION_SEARCH,3
-3,Android.Views.InputMethods.ImeAction,Send,android/view/inputmethod/EditorInfo.IME_ACTION_SEND,4
-3,Android.Views.InputMethods.ImeAction,Unspecified,android/view/inputmethod/EditorInfo.IME_ACTION_UNSPECIFIED,0
-3,Android.Views.InputMethods.ExtractedTextFlags,Selecting,android/view/inputmethod/ExtractedText.FLAG_SELECTING,2
-3,Android.Views.InputMethods.ExtractedTextFlags,SingleLine,android/view/inputmethod/ExtractedText.FLAG_SINGLE_LINE,1
+10,Android.Views.MenuAppendFlags,AppendToGroup,I:android/view/Menu.FLAG_APPEND_TO_GROUP,1
+10,Android.Views.SurfaceType,Gpu,I:android/view/SurfaceHolder.SURFACE_TYPE_GPU,2
+10,Android.Views.SurfaceType,Hardware,I:android/view/SurfaceHolder.SURFACE_TYPE_HARDWARE,1
+10,Android.Views.SurfaceType,Normal,I:android/view/SurfaceHolder.SURFACE_TYPE_NORMAL,0
+10,Android.Views.SurfaceType,PushBuffers,I:android/view/SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS,3
+10,Android.Views.Animations.RepeatMode,Restart,android/view/animation/Animation.RESTART,1
+10,Android.Views.Animations.RepeatMode,Reverse,android/view/animation/Animation.REVERSE,2
+10,Android.Views.Animations.Dimension,Absolute,android/view/animation/Animation.ABSOLUTE,0
+10,Android.Views.Animations.Dimension,RelativeToParent,android/view/animation/Animation.RELATIVE_TO_PARENT,2
+10,Android.Views.Animations.Dimension,RelativeToSelf,android/view/animation/Animation.RELATIVE_TO_SELF,1
+10,Android.Views.Animations.ContentZorder,Bottom,android/view/animation/Animation.ZORDER_BOTTOM,-1
+10,Android.Views.Animations.ContentZorder,Normal,android/view/animation/Animation.ZORDER_NORMAL,0
+10,Android.Views.Animations.ContentZorder,Top,android/view/animation/Animation.ZORDER_TOP,1
+10,Android.Views.Animations.Direction,BottomToTop,android/view/animation/GridLayoutAnimationController.DIRECTION_BOTTOM_TO_TOP,2
+10,Android.Views.Animations.Direction,HorizontalMask,android/view/animation/GridLayoutAnimationController.DIRECTION_HORIZONTAL_MASK,1
+10,Android.Views.Animations.Direction,LeftToRight,android/view/animation/GridLayoutAnimationController.DIRECTION_LEFT_TO_RIGHT,0
+10,Android.Views.Animations.Direction,RightToLeft,android/view/animation/GridLayoutAnimationController.DIRECTION_RIGHT_TO_LEFT,1
+10,Android.Views.Animations.Direction,TopToBottom,android/view/animation/GridLayoutAnimationController.DIRECTION_TOP_TO_BOTTOM,0
+10,Android.Views.Animations.Direction,VerticalMask,android/view/animation/GridLayoutAnimationController.DIRECTION_VERTICAL_MASK,2
+10,Android.Views.Animations.Priority,Column,android/view/animation/GridLayoutAnimationController.PRIORITY_COLUMN,1
+10,Android.Views.Animations.Priority,None,android/view/animation/GridLayoutAnimationController.PRIORITY_NONE,0
+10,Android.Views.Animations.Priority,Row,android/view/animation/GridLayoutAnimationController.PRIORITY_ROW,2
+10,Android.Views.Animations.DelayOrder,Normal,android/view/animation/LayoutAnimationController.ORDER_NORMAL,0
+10,Android.Views.Animations.DelayOrder,Random,android/view/animation/LayoutAnimationController.ORDER_RANDOM,2
+10,Android.Views.Animations.DelayOrder,Reverse,android/view/animation/LayoutAnimationController.ORDER_REVERSE,1
+19,Android.Views.Animations.TransformationTypes,Alpha,android/view/animation/Transformation.TYPE_ALPHA,1
+19,Android.Views.Animations.TransformationTypes,Both,android/view/animation/Transformation.TYPE_BOTH,3
+19,Android.Views.Animations.TransformationTypes,Identity,android/view/animation/Transformation.TYPE_IDENTITY,0
+19,Android.Views.Animations.TransformationTypes,Matrix,android/view/animation/Transformation.TYPE_MATRIX,2
+10,Android.Views.InputMethods.ImeAction,ImeMaskAction,android/view/inputmethod/EditorInfo.IME_MASK_ACTION,255
+10,Android.Views.InputMethods.ImeAction,ImeNull,android/view/inputmethod/EditorInfo.IME_NULL,0
+10,Android.Views.InputMethods.ImeAction,Done,android/view/inputmethod/EditorInfo.IME_ACTION_DONE,6
+10,Android.Views.InputMethods.ImeAction,Go,android/view/inputmethod/EditorInfo.IME_ACTION_GO,2
+10,Android.Views.InputMethods.ImeAction,Next,android/view/inputmethod/EditorInfo.IME_ACTION_NEXT,5
+10,Android.Views.InputMethods.ImeAction,None,android/view/inputmethod/EditorInfo.IME_ACTION_NONE,1
+15,Android.Views.InputMethods.ImeAction,Previous,android/view/inputmethod/EditorInfo.IME_ACTION_PREVIOUS,7
+10,Android.Views.InputMethods.ImeAction,Search,android/view/inputmethod/EditorInfo.IME_ACTION_SEARCH,3
+10,Android.Views.InputMethods.ImeAction,Send,android/view/inputmethod/EditorInfo.IME_ACTION_SEND,4
+10,Android.Views.InputMethods.ImeAction,Unspecified,android/view/inputmethod/EditorInfo.IME_ACTION_UNSPECIFIED,0
+10,Android.Views.InputMethods.ExtractedTextFlags,Selecting,android/view/inputmethod/ExtractedText.FLAG_SELECTING,2
+10,Android.Views.InputMethods.ExtractedTextFlags,SingleLine,android/view/inputmethod/ExtractedText.FLAG_SINGLE_LINE,1
 0,Android.Views.InputMethods.ShowSoftInputFlags,None,,0
-3,Android.Views.InputMethods.ShowSoftInputFlags,Explicit,I:android/view/inputmethod/InputMethod.SHOW_EXPLICIT,1
-3,Android.Views.InputMethods.ShowSoftInputFlags,Forced,I:android/view/inputmethod/InputMethod.SHOW_FORCED,2
-1,Android.Webkit.CacheModes,CacheElseNetwork,android/webkit/WebSettings.LOAD_CACHE_ELSE_NETWORK,1
-1,Android.Webkit.CacheModes,CacheOnly,android/webkit/WebSettings.LOAD_CACHE_ONLY,3
-1,Android.Webkit.CacheModes,Default,android/webkit/WebSettings.LOAD_DEFAULT,-1
-1,Android.Webkit.CacheModes,Normal,android/webkit/WebSettings.LOAD_NORMAL,0
-1,Android.Webkit.CacheModes,NoCache,android/webkit/WebSettings.LOAD_NO_CACHE,2
+10,Android.Views.InputMethods.ShowSoftInputFlags,Explicit,I:android/view/inputmethod/InputMethod.SHOW_EXPLICIT,1
+10,Android.Views.InputMethods.ShowSoftInputFlags,Forced,I:android/view/inputmethod/InputMethod.SHOW_FORCED,2
+10,Android.Webkit.CacheModes,CacheElseNetwork,android/webkit/WebSettings.LOAD_CACHE_ELSE_NETWORK,1
+10,Android.Webkit.CacheModes,CacheOnly,android/webkit/WebSettings.LOAD_CACHE_ONLY,3
+10,Android.Webkit.CacheModes,Default,android/webkit/WebSettings.LOAD_DEFAULT,-1
+10,Android.Webkit.CacheModes,NoCache,android/webkit/WebSettings.LOAD_NO_CACHE,2
+10,Android.Webkit.CacheModes,Normal,android/webkit/WebSettings.LOAD_NORMAL,0
 26,Android.Webkit.RendererPriority,Bound,android/webkit/WebView.RENDERER_PRIORITY_BOUND,1
 26,Android.Webkit.RendererPriority,Important,android/webkit/WebView.RENDERER_PRIORITY_IMPORTANT,2
 26,Android.Webkit.RendererPriority,Waived,android/webkit/WebView.RENDERER_PRIORITY_WAIVED,0
-1,Android.Webkit.HitTestResult,AnchorType,android/webkit/WebView.HitTestResult.ANCHOR_TYPE,1
-1,Android.Webkit.HitTestResult,EditTextType,android/webkit/WebView.HitTestResult.EDIT_TEXT_TYPE,9
-1,Android.Webkit.HitTestResult,EmailType,android/webkit/WebView.HitTestResult.EMAIL_TYPE,4
-1,Android.Webkit.HitTestResult,GeoType,android/webkit/WebView.HitTestResult.GEO_TYPE,3
-1,Android.Webkit.HitTestResult,ImageAnchorType,android/webkit/WebView.HitTestResult.IMAGE_ANCHOR_TYPE,6
-1,Android.Webkit.HitTestResult,ImageType,android/webkit/WebView.HitTestResult.IMAGE_TYPE,5
-1,Android.Webkit.HitTestResult,PhoneType,android/webkit/WebView.HitTestResult.PHONE_TYPE,2
-1,Android.Webkit.HitTestResult,SrcAnchorType,android/webkit/WebView.HitTestResult.SRC_ANCHOR_TYPE,7
-1,Android.Webkit.HitTestResult,SrcImageAnchorType,android/webkit/WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE,8
-1,Android.Webkit.HitTestResult,UnknownType,android/webkit/WebView.HitTestResult.UNKNOWN_TYPE,0
-5,Android.Webkit.ClientError,Authentication,android/webkit/WebViewClient.ERROR_AUTHENTICATION,-4
-5,Android.Webkit.ClientError,BadUrl,android/webkit/WebViewClient.ERROR_BAD_URL,-12
-5,Android.Webkit.ClientError,Connect,android/webkit/WebViewClient.ERROR_CONNECT,-6
-5,Android.Webkit.ClientError,FailedSslHandshake,android/webkit/WebViewClient.ERROR_FAILED_SSL_HANDSHAKE,-11
-5,Android.Webkit.ClientError,File,android/webkit/WebViewClient.ERROR_FILE,-13
-5,Android.Webkit.ClientError,FileNotFound,android/webkit/WebViewClient.ERROR_FILE_NOT_FOUND,-14
-5,Android.Webkit.ClientError,HostLookup,android/webkit/WebViewClient.ERROR_HOST_LOOKUP,-2
-5,Android.Webkit.ClientError,Io,android/webkit/WebViewClient.ERROR_IO,-7
-5,Android.Webkit.ClientError,ProxyAuthentication,android/webkit/WebViewClient.ERROR_PROXY_AUTHENTICATION,-5
-5,Android.Webkit.ClientError,RedirectLoop,android/webkit/WebViewClient.ERROR_REDIRECT_LOOP,-9
-5,Android.Webkit.ClientError,Timeout,android/webkit/WebViewClient.ERROR_TIMEOUT,-8
-5,Android.Webkit.ClientError,TooManyRequests,android/webkit/WebViewClient.ERROR_TOO_MANY_REQUESTS,-15
-5,Android.Webkit.ClientError,Unknown,android/webkit/WebViewClient.ERROR_UNKNOWN,-1
+10,Android.Webkit.HitTestResult,AnchorType,android/webkit/WebView.HitTestResult.ANCHOR_TYPE,1
+10,Android.Webkit.HitTestResult,EditTextType,android/webkit/WebView.HitTestResult.EDIT_TEXT_TYPE,9
+10,Android.Webkit.HitTestResult,EmailType,android/webkit/WebView.HitTestResult.EMAIL_TYPE,4
+10,Android.Webkit.HitTestResult,GeoType,android/webkit/WebView.HitTestResult.GEO_TYPE,3
+10,Android.Webkit.HitTestResult,ImageAnchorType,android/webkit/WebView.HitTestResult.IMAGE_ANCHOR_TYPE,6
+10,Android.Webkit.HitTestResult,ImageType,android/webkit/WebView.HitTestResult.IMAGE_TYPE,5
+10,Android.Webkit.HitTestResult,PhoneType,android/webkit/WebView.HitTestResult.PHONE_TYPE,2
+10,Android.Webkit.HitTestResult,SrcAnchorType,android/webkit/WebView.HitTestResult.SRC_ANCHOR_TYPE,7
+10,Android.Webkit.HitTestResult,SrcImageAnchorType,android/webkit/WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE,8
+10,Android.Webkit.HitTestResult,UnknownType,android/webkit/WebView.HitTestResult.UNKNOWN_TYPE,0
+10,Android.Webkit.ClientError,Authentication,android/webkit/WebViewClient.ERROR_AUTHENTICATION,-4
+10,Android.Webkit.ClientError,BadUrl,android/webkit/WebViewClient.ERROR_BAD_URL,-12
+10,Android.Webkit.ClientError,Connect,android/webkit/WebViewClient.ERROR_CONNECT,-6
+10,Android.Webkit.ClientError,FailedSslHandshake,android/webkit/WebViewClient.ERROR_FAILED_SSL_HANDSHAKE,-11
+10,Android.Webkit.ClientError,File,android/webkit/WebViewClient.ERROR_FILE,-13
+10,Android.Webkit.ClientError,FileNotFound,android/webkit/WebViewClient.ERROR_FILE_NOT_FOUND,-14
+10,Android.Webkit.ClientError,HostLookup,android/webkit/WebViewClient.ERROR_HOST_LOOKUP,-2
+10,Android.Webkit.ClientError,Io,android/webkit/WebViewClient.ERROR_IO,-7
+10,Android.Webkit.ClientError,ProxyAuthentication,android/webkit/WebViewClient.ERROR_PROXY_AUTHENTICATION,-5
+10,Android.Webkit.ClientError,RedirectLoop,android/webkit/WebViewClient.ERROR_REDIRECT_LOOP,-9
+10,Android.Webkit.ClientError,Timeout,android/webkit/WebViewClient.ERROR_TIMEOUT,-8
+10,Android.Webkit.ClientError,TooManyRequests,android/webkit/WebViewClient.ERROR_TOO_MANY_REQUESTS,-15
+10,Android.Webkit.ClientError,Unknown,android/webkit/WebViewClient.ERROR_UNKNOWN,-1
 26,Android.Webkit.ClientError,UnsafeResource,android/webkit/WebViewClient.ERROR_UNSAFE_RESOURCE,-16
-5,Android.Webkit.ClientError,UnsupportedAuthScheme,android/webkit/WebViewClient.ERROR_UNSUPPORTED_AUTH_SCHEME,-3
-5,Android.Webkit.ClientError,UnsupportedScheme,android/webkit/WebViewClient.ERROR_UNSUPPORTED_SCHEME,-10
-1,Android.Widget.ChoiceMode,Multiple,android/widget/AbsListView.CHOICE_MODE_MULTIPLE,2
-11,Android.Widget.ChoiceMode,MultipleModal,android/widget/AbsListView.CHOICE_MODE_MULTIPLE_MODAL,3
-1,Android.Widget.ChoiceMode,None,android/widget/AbsListView.CHOICE_MODE_NONE,0
-1,Android.Widget.ChoiceMode,Single,android/widget/AbsListView.CHOICE_MODE_SINGLE,1
-1,Android.Widget.TranscriptMode,AlwaysScroll,android/widget/AbsListView.TRANSCRIPT_MODE_ALWAYS_SCROLL,2
-1,Android.Widget.TranscriptMode,Disabled,android/widget/AbsListView.TRANSCRIPT_MODE_DISABLED,0
-1,Android.Widget.TranscriptMode,Normal,android/widget/AbsListView.TRANSCRIPT_MODE_NORMAL,1
-1,Android.Widget.ItemViewType,HeaderOrFooter,android/widget/AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER,-2
-1,Android.Widget.ItemViewType,Ignore,android/widget/AdapterView.ITEM_VIEW_TYPE_IGNORE,-1
+10,Android.Webkit.ClientError,UnsupportedAuthScheme,android/webkit/WebViewClient.ERROR_UNSUPPORTED_AUTH_SCHEME,-3
+10,Android.Webkit.ClientError,UnsupportedScheme,android/webkit/WebViewClient.ERROR_UNSUPPORTED_SCHEME,-10
+27,Android.Webkit.SafeBrowsingThreat,Malware,android/webkit/WebViewClient.SAFE_BROWSING_THREAT_MALWARE,1
+27,Android.Webkit.SafeBrowsingThreat,Phishing,android/webkit/WebViewClient.SAFE_BROWSING_THREAT_PHISHING,2
+27,Android.Webkit.SafeBrowsingThreat,Unknown,android/webkit/WebViewClient.SAFE_BROWSING_THREAT_UNKNOWN,0
+27,Android.Webkit.SafeBrowsingThreat,UnwantedSoftware,android/webkit/WebViewClient.SAFE_BROWSING_THREAT_UNWANTED_SOFTWARE,3
+15,Android.Widget.ChoiceMode,Multiple,android/widget/AbsListView.CHOICE_MODE_MULTIPLE,2
+15,Android.Widget.ChoiceMode,MultipleModal,android/widget/AbsListView.CHOICE_MODE_MULTIPLE_MODAL,3
+15,Android.Widget.ChoiceMode,None,android/widget/AbsListView.CHOICE_MODE_NONE,0
+15,Android.Widget.ChoiceMode,Single,android/widget/AbsListView.CHOICE_MODE_SINGLE,1
+10,Android.Widget.TranscriptMode,AlwaysScroll,android/widget/AbsListView.TRANSCRIPT_MODE_ALWAYS_SCROLL,2
+10,Android.Widget.TranscriptMode,Disabled,android/widget/AbsListView.TRANSCRIPT_MODE_DISABLED,0
+10,Android.Widget.TranscriptMode,Normal,android/widget/AbsListView.TRANSCRIPT_MODE_NORMAL,1
+10,Android.Widget.ItemViewType,HeaderOrFooter,android/widget/AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER,-2
+10,Android.Widget.ItemViewType,Ignore,android/widget/AdapterView.ITEM_VIEW_TYPE_IGNORE,-1
 0,Android.Widget.CursorAdapterFlags,None,,0
-11,Android.Widget.CursorAdapterFlags,AutoRequery,android/widget/CursorAdapter.FLAG_AUTO_REQUERY,1
-11,Android.Widget.CursorAdapterFlags,RegisterContentObserver,android/widget/CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER,2
-1,Android.Widget.DialerMode,DigitsAndLetters,android/widget/DialerFilter.DIGITS_AND_LETTERS,1
-1,Android.Widget.DialerMode,DigitsAndLettersNoDigits,android/widget/DialerFilter.DIGITS_AND_LETTERS_NO_DIGITS,2
-1,Android.Widget.DialerMode,DigitsAndLettersNoLetters,android/widget/DialerFilter.DIGITS_AND_LETTERS_NO_LETTERS,3
-1,Android.Widget.DialerMode,DigitsOnly,android/widget/DialerFilter.DIGITS_ONLY,4
-1,Android.Widget.DialerMode,LettersOnly,android/widget/DialerFilter.LETTERS_ONLY,5
-1,Android.Widget.PackedPositionType,Child,android/widget/ExpandableListView.PACKED_POSITION_TYPE_CHILD,1
-1,Android.Widget.PackedPositionType,Group,android/widget/ExpandableListView.PACKED_POSITION_TYPE_GROUP,0
-1,Android.Widget.PackedPositionType,Null,android/widget/ExpandableListView.PACKED_POSITION_TYPE_NULL,2
-1,Android.Widget.StretchMode,AutoFit,android/widget/GridView.AUTO_FIT,-1
-1,Android.Widget.StretchMode,NoStretch,android/widget/GridView.NO_STRETCH,0
-1,Android.Widget.StretchMode,StretchColumnWidth,android/widget/GridView.STRETCH_COLUMN_WIDTH,2
-1,Android.Widget.StretchMode,StretchSpacing,android/widget/GridView.STRETCH_SPACING,1
-3,Android.Widget.StretchMode,StretchSpacingUniform,android/widget/GridView.STRETCH_SPACING_UNIFORM,3
-11,Android.Widget.ShowDividers,Beginning,android/widget/LinearLayout.SHOW_DIVIDER_BEGINNING,1
-11,Android.Widget.ShowDividers,End,android/widget/LinearLayout.SHOW_DIVIDER_END,4
-11,Android.Widget.ShowDividers,Middle,android/widget/LinearLayout.SHOW_DIVIDER_MIDDLE,2
-11,Android.Widget.ShowDividers,None,android/widget/LinearLayout.SHOW_DIVIDER_NONE,0
-1,Android.Widget.Orientation,Horizontal,android/widget/LinearLayout.HORIZONTAL,0
-1,Android.Widget.Orientation,Vertical,android/widget/LinearLayout.VERTICAL,1
-11,Android.Widget.ListPopupWindowInputMethodMode,FromFocusable,android/widget/ListPopupWindow.INPUT_METHOD_FROM_FOCUSABLE,0
-11,Android.Widget.ListPopupWindowInputMethodMode,Needed,android/widget/ListPopupWindow.INPUT_METHOD_NEEDED,1
-11,Android.Widget.ListPopupWindowInputMethodMode,NotNeeded,android/widget/ListPopupWindow.INPUT_METHOD_NOT_NEEDED,2
-3,Android.Widget.InputMethod,FromFocusable,android/widget/PopupWindow.INPUT_METHOD_FROM_FOCUSABLE,0
-3,Android.Widget.InputMethod,Needed,android/widget/PopupWindow.INPUT_METHOD_NEEDED,1
-3,Android.Widget.InputMethod,NotNeeded,android/widget/PopupWindow.INPUT_METHOD_NOT_NEEDED,2
-1,Android.Widget.LayoutRules,Above,android/widget/RelativeLayout.ABOVE,2
-1,Android.Widget.LayoutRules,AlignBaseline,android/widget/RelativeLayout.ALIGN_BASELINE,4
-1,Android.Widget.LayoutRules,AlignBottom,android/widget/RelativeLayout.ALIGN_BOTTOM,8
+15,Android.Widget.CursorAdapterFlags,AutoRequery,android/widget/CursorAdapter.FLAG_AUTO_REQUERY,1
+15,Android.Widget.CursorAdapterFlags,RegisterContentObserver,android/widget/CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER,2
+10,Android.Widget.DialerMode,DigitsAndLetters,android/widget/DialerFilter.DIGITS_AND_LETTERS,1
+10,Android.Widget.DialerMode,DigitsAndLettersNoDigits,android/widget/DialerFilter.DIGITS_AND_LETTERS_NO_DIGITS,2
+10,Android.Widget.DialerMode,DigitsAndLettersNoLetters,android/widget/DialerFilter.DIGITS_AND_LETTERS_NO_LETTERS,3
+10,Android.Widget.DialerMode,DigitsOnly,android/widget/DialerFilter.DIGITS_ONLY,4
+10,Android.Widget.DialerMode,LettersOnly,android/widget/DialerFilter.LETTERS_ONLY,5
+10,Android.Widget.PackedPositionType,Child,android/widget/ExpandableListView.PACKED_POSITION_TYPE_CHILD,1
+10,Android.Widget.PackedPositionType,Group,android/widget/ExpandableListView.PACKED_POSITION_TYPE_GROUP,0
+10,Android.Widget.PackedPositionType,Null,android/widget/ExpandableListView.PACKED_POSITION_TYPE_NULL,2
+10,Android.Widget.StretchMode,AutoFit,android/widget/GridView.AUTO_FIT,-1
+10,Android.Widget.StretchMode,NoStretch,android/widget/GridView.NO_STRETCH,0
+10,Android.Widget.StretchMode,StretchColumnWidth,android/widget/GridView.STRETCH_COLUMN_WIDTH,2
+10,Android.Widget.StretchMode,StretchSpacing,android/widget/GridView.STRETCH_SPACING,1
+10,Android.Widget.StretchMode,StretchSpacingUniform,android/widget/GridView.STRETCH_SPACING_UNIFORM,3
+15,Android.Widget.ShowDividers,Beginning,android/widget/LinearLayout.SHOW_DIVIDER_BEGINNING,1
+15,Android.Widget.ShowDividers,End,android/widget/LinearLayout.SHOW_DIVIDER_END,4
+15,Android.Widget.ShowDividers,Middle,android/widget/LinearLayout.SHOW_DIVIDER_MIDDLE,2
+15,Android.Widget.ShowDividers,None,android/widget/LinearLayout.SHOW_DIVIDER_NONE,0
+10,Android.Widget.Orientation,Horizontal,android/widget/LinearLayout.HORIZONTAL,0
+10,Android.Widget.Orientation,Vertical,android/widget/LinearLayout.VERTICAL,1
+15,Android.Widget.ListPopupWindowInputMethodMode,FromFocusable,android/widget/ListPopupWindow.INPUT_METHOD_FROM_FOCUSABLE,0
+15,Android.Widget.ListPopupWindowInputMethodMode,Needed,android/widget/ListPopupWindow.INPUT_METHOD_NEEDED,1
+15,Android.Widget.ListPopupWindowInputMethodMode,NotNeeded,android/widget/ListPopupWindow.INPUT_METHOD_NOT_NEEDED,2
+10,Android.Widget.InputMethod,FromFocusable,android/widget/PopupWindow.INPUT_METHOD_FROM_FOCUSABLE,0
+10,Android.Widget.InputMethod,Needed,android/widget/PopupWindow.INPUT_METHOD_NEEDED,1
+10,Android.Widget.InputMethod,NotNeeded,android/widget/PopupWindow.INPUT_METHOD_NOT_NEEDED,2
+10,Android.Widget.LayoutRules,Above,android/widget/RelativeLayout.ABOVE,2
+10,Android.Widget.LayoutRules,AlignBaseline,android/widget/RelativeLayout.ALIGN_BASELINE,4
+10,Android.Widget.LayoutRules,AlignBottom,android/widget/RelativeLayout.ALIGN_BOTTOM,8
 17,Android.Widget.LayoutRules,AlignEnd,android/widget/RelativeLayout.ALIGN_END,19
-1,Android.Widget.LayoutRules,AlignLeft,android/widget/RelativeLayout.ALIGN_LEFT,5
-1,Android.Widget.LayoutRules,AlignParentBottom,android/widget/RelativeLayout.ALIGN_PARENT_BOTTOM,12
+10,Android.Widget.LayoutRules,AlignLeft,android/widget/RelativeLayout.ALIGN_LEFT,5
+10,Android.Widget.LayoutRules,AlignParentBottom,android/widget/RelativeLayout.ALIGN_PARENT_BOTTOM,12
 17,Android.Widget.LayoutRules,AlignParentEnd,android/widget/RelativeLayout.ALIGN_PARENT_END,21
-1,Android.Widget.LayoutRules,AlignParentLeft,android/widget/RelativeLayout.ALIGN_PARENT_LEFT,9
-1,Android.Widget.LayoutRules,AlignParentRight,android/widget/RelativeLayout.ALIGN_PARENT_RIGHT,11
+10,Android.Widget.LayoutRules,AlignParentLeft,android/widget/RelativeLayout.ALIGN_PARENT_LEFT,9
+10,Android.Widget.LayoutRules,AlignParentRight,android/widget/RelativeLayout.ALIGN_PARENT_RIGHT,11
 17,Android.Widget.LayoutRules,AlignParentStart,android/widget/RelativeLayout.ALIGN_PARENT_START,20
-1,Android.Widget.LayoutRules,AlignParentTop,android/widget/RelativeLayout.ALIGN_PARENT_TOP,10
-1,Android.Widget.LayoutRules,AlignRight,android/widget/RelativeLayout.ALIGN_RIGHT,7
+10,Android.Widget.LayoutRules,AlignParentTop,android/widget/RelativeLayout.ALIGN_PARENT_TOP,10
+10,Android.Widget.LayoutRules,AlignRight,android/widget/RelativeLayout.ALIGN_RIGHT,7
 17,Android.Widget.LayoutRules,AlignStart,android/widget/RelativeLayout.ALIGN_START,18
-1,Android.Widget.LayoutRules,AlignTop,android/widget/RelativeLayout.ALIGN_TOP,6
-1,Android.Widget.LayoutRules,Below,android/widget/RelativeLayout.BELOW,3
-1,Android.Widget.LayoutRules,CenterHorizontal,android/widget/RelativeLayout.CENTER_HORIZONTAL,14
-1,Android.Widget.LayoutRules,CenterInParent,android/widget/RelativeLayout.CENTER_IN_PARENT,13
-1,Android.Widget.LayoutRules,CenterVertical,android/widget/RelativeLayout.CENTER_VERTICAL,15
+10,Android.Widget.LayoutRules,AlignTop,android/widget/RelativeLayout.ALIGN_TOP,6
+10,Android.Widget.LayoutRules,Below,android/widget/RelativeLayout.BELOW,3
+10,Android.Widget.LayoutRules,CenterHorizontal,android/widget/RelativeLayout.CENTER_HORIZONTAL,14
+10,Android.Widget.LayoutRules,CenterInParent,android/widget/RelativeLayout.CENTER_IN_PARENT,13
+10,Android.Widget.LayoutRules,CenterVertical,android/widget/RelativeLayout.CENTER_VERTICAL,15
 17,Android.Widget.LayoutRules,EndOf,android/widget/RelativeLayout.END_OF,17
-1,Android.Widget.LayoutRules,LeftOf,android/widget/RelativeLayout.LEFT_OF,0
-1,Android.Widget.LayoutRules,RightOf,android/widget/RelativeLayout.RIGHT_OF,1
+10,Android.Widget.LayoutRules,LeftOf,android/widget/RelativeLayout.LEFT_OF,0
+10,Android.Widget.LayoutRules,RightOf,android/widget/RelativeLayout.RIGHT_OF,1
 17,Android.Widget.LayoutRules,StartOf,android/widget/RelativeLayout.START_OF,16
-1,Android.Widget.LayoutRules,True,android/widget/RelativeLayout.TRUE,-1
-11,Android.Widget.SpinnerMode,Dialog,android/widget/Spinner.MODE_DIALOG,0
-11,Android.Widget.SpinnerMode,Dropdown,android/widget/Spinner.MODE_DROPDOWN,1
-1,Android.Widget.ToastLength,Long,android/widget/Toast.LENGTH_LONG,1
-1,Android.Widget.ToastLength,Short,android/widget/Toast.LENGTH_SHORT,0
+10,Android.Widget.LayoutRules,True,android/widget/RelativeLayout.TRUE,-1
+15,Android.Widget.SpinnerMode,Dialog,android/widget/Spinner.MODE_DIALOG,0
+15,Android.Widget.SpinnerMode,Dropdown,android/widget/Spinner.MODE_DROPDOWN,1
+10,Android.Widget.ToastLength,Long,android/widget/Toast.LENGTH_LONG,1
+10,Android.Widget.ToastLength,Short,android/widget/Toast.LENGTH_SHORT,0
 26,Android.Widget.AutoSizeTextType,None,android/widget/TextView.AUTO_SIZE_TEXT_TYPE_NONE,0
 26,Android.Widget.AutoSizeTextType,Uniform,android/widget/TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM,1
-1,Android.Widget.ScrollState,Fling,I:android/widget/AbsListView.OnScrollListener.SCROLL_STATE_FLING,2
-1,Android.Widget.ScrollState,Idle,I:android/widget/AbsListView.OnScrollListener.SCROLL_STATE_IDLE,0
-1,Android.Widget.ScrollState,TouchScroll,I:android/widget/AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL,1
-11,Android.Widget.NumberPickerScrollState,Fling,I:android/widget/NumberPicker.OnScrollListener.SCROLL_STATE_FLING,2
-11,Android.Widget.NumberPickerScrollState,Idle,I:android/widget/NumberPicker.OnScrollListener.SCROLL_STATE_IDLE,0
-11,Android.Widget.NumberPickerScrollState,TouchScroll,I:android/widget/NumberPicker.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL,1
+10,Android.Widget.ScrollState,Fling,I:android/widget/AbsListView.OnScrollListener.SCROLL_STATE_FLING,2
+10,Android.Widget.ScrollState,Idle,I:android/widget/AbsListView.OnScrollListener.SCROLL_STATE_IDLE,0
+10,Android.Widget.ScrollState,TouchScroll,I:android/widget/AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL,1
+15,Android.Widget.NumberPickerScrollState,Fling,I:android/widget/NumberPicker.OnScrollListener.SCROLL_STATE_FLING,2
+15,Android.Widget.NumberPickerScrollState,Idle,I:android/widget/NumberPicker.OnScrollListener.SCROLL_STATE_IDLE,0
+15,Android.Widget.NumberPickerScrollState,TouchScroll,I:android/widget/NumberPicker.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL,1
 23,Android.App.LockTaskMode,Locked,android/app/ActivityManager.LOCK_TASK_MODE_LOCKED,1
 23,Android.App.LockTaskMode,None,android/app/ActivityManager.LOCK_TASK_MODE_NONE,0
 23,Android.App.LockTaskMode,Pinned,android/app/ActivityManager.LOCK_TASK_MODE_PINNED,2
@@ -3118,9 +3090,12 @@
 23,Android.Hardware.Fingerprints.FingerprintState,ErrorCanceled,android/hardware/fingerprint/FingerprintManager.FINGERPRINT_ERROR_CANCELED,5
 23,Android.Hardware.Fingerprints.FingerprintState,ErrorHwUnavailable,android/hardware/fingerprint/FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE,1
 23,Android.Hardware.Fingerprints.FingerprintState,ErrorLockout,android/hardware/fingerprint/FingerprintManager.FINGERPRINT_ERROR_LOCKOUT,7
+27,Android.Hardware.Fingerprints.FingerprintState,ErrorLockoutPermanent,android/hardware/fingerprint/FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT,9
 23,Android.Hardware.Fingerprints.FingerprintState,ErrorNoSpace,android/hardware/fingerprint/FingerprintManager.FINGERPRINT_ERROR_NO_SPACE,4
 23,Android.Hardware.Fingerprints.FingerprintState,ErrorTimeout,android/hardware/fingerprint/FingerprintManager.FINGERPRINT_ERROR_TIMEOUT,3
 23,Android.Hardware.Fingerprints.FingerprintState,ErrorUnableToProcess,android/hardware/fingerprint/FingerprintManager.FINGERPRINT_ERROR_UNABLE_TO_PROCESS,2
+27,Android.Hardware.Fingerprints.FingerprintState,ErrorUserCanceled,android/hardware/fingerprint/FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED,10
+27,Android.Hardware.Fingerprints.FingerprintState,ErrorVendor,android/hardware/fingerprint/FingerprintManager.FINGERPRINT_ERROR_VENDOR,8
 23,Android.Media.AudioDeviceType,AuxLine,android/media/AudioDeviceInfo.TYPE_AUX_LINE,19
 23,Android.Media.AudioDeviceType,BluetoothA2dp,android/media/AudioDeviceInfo.TYPE_BLUETOOTH_A2DP,8
 23,Android.Media.AudioDeviceType,BluetoothSco,android/media/AudioDeviceInfo.TYPE_BLUETOOTH_SCO,7
@@ -3213,9 +3188,9 @@
 26,Android.Telecom.RttMode,Full,android/telecom/Call.RttCall.RTT_MODE_FULL,1
 26,Android.Telecom.RttMode,Hco,android/telecom/Call.RttCall.RTT_MODE_HCO,2
 26,Android.Telecom.RttMode,Vco,android/telecom/Call.RttCall.RTT_MODE_VCO,3
-24,Android.Telecom.CallCapability,CannotDowngradeVideoToAudio,android/telecom/Call.Details.CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO,4194304
 23,Android.Telecom.CallCapability,CanPauseVideo,android/telecom/Call.Details.CAPABILITY_CAN_PAUSE_VIDEO,1048576
 25,Android.Telecom.CallCapability,CanPullCall,android/telecom/Call.Details.CAPABILITY_CAN_PULL_CALL,8388608
+24,Android.Telecom.CallCapability,CannotDowngradeVideoToAudio,android/telecom/Call.Details.CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO,4194304
 23,Android.Telecom.CallCapability,DisconnectFromConference,android/telecom/Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE,8192
 23,Android.Telecom.CallCapability,Hold,android/telecom/Call.Details.CAPABILITY_HOLD,1
 23,Android.Telecom.CallCapability,ManageConference,android/telecom/Call.Details.CAPABILITY_MANAGE_CONFERENCE,128
@@ -3223,13 +3198,13 @@
 23,Android.Telecom.CallCapability,Mute,android/telecom/Call.Details.CAPABILITY_MUTE,64
 23,Android.Telecom.CallCapability,RespondViaText,android/telecom/Call.Details.CAPABILITY_RESPOND_VIA_TEXT,32
 23,Android.Telecom.CallCapability,SeparateFromConference,android/telecom/Call.Details.CAPABILITY_SEPARATE_FROM_CONFERENCE,4096
+23,Android.Telecom.CallCapability,SupportHold,android/telecom/Call.Details.CAPABILITY_SUPPORT_HOLD,2
 23,Android.Telecom.CallCapability,SupportsVtLocalBidirectional,android/telecom/Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL,768
 23,Android.Telecom.CallCapability,SupportsVtLocalRx,android/telecom/Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_RX,256
 23,Android.Telecom.CallCapability,SupportsVtLocalTx,android/telecom/Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_TX,512
 23,Android.Telecom.CallCapability,SupportsVtRemoteBidirectional,android/telecom/Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL,3072
 23,Android.Telecom.CallCapability,SupportsVtRemoteRx,android/telecom/Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_RX,1024
 23,Android.Telecom.CallCapability,SupportsVtRemoteTx,android/telecom/Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_TX,2048
-23,Android.Telecom.CallCapability,SupportHold,android/telecom/Call.Details.CAPABILITY_SUPPORT_HOLD,2
 23,Android.Telecom.CallCapability,SwapConference,android/telecom/Call.Details.CAPABILITY_SWAP_CONFERENCE,8
 23,Android.Telecom.CallProperty,Conference,android/telecom/Call.Details.PROPERTY_CONFERENCE,1
 23,Android.Telecom.CallProperty,EmergencyCallbackMode,android/telecom/Call.Details.PROPERTY_EMERGENCY_CALLBACK_MODE,4
@@ -3245,11 +3220,11 @@
 23,Android.Telecom.CallAudioRoute,Speaker,android/telecom/CallAudioState.ROUTE_SPEAKER,8
 23,Android.Telecom.CallAudioRoute,WiredHeadset,android/telecom/CallAudioState.ROUTE_WIRED_HEADSET,4
 23,Android.Telecom.CallAudioRoute,WiredOrEarpiece,android/telecom/CallAudioState.ROUTE_WIRED_OR_EARPIECE,5
-24,Android.Telecom.ConnectionCapability,CannotDowngradeVideoToAudio,android/telecom/Connection.CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO,8388608
 23,Android.Telecom.ConnectionCapability,CanPauseVideo,android/telecom/Connection.CAPABILITY_CAN_PAUSE_VIDEO,1048576
 25,Android.Telecom.ConnectionCapability,CanPullCall,android/telecom/Connection.CAPABILITY_CAN_PULL_CALL,16777216
 24,Android.Telecom.ConnectionCapability,CanSendResponseViaConnection,android/telecom/Connection.CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION,4194304
 23,Android.Telecom.ConnectionCapability,CanUpgradeToVideo,android/telecom/Connection.CAPABILITY_CAN_UPGRADE_TO_VIDEO,524288
+24,Android.Telecom.ConnectionCapability,CannotDowngradeVideoToAudio,android/telecom/Connection.CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO,8388608
 23,Android.Telecom.ConnectionCapability,DisconnectFromConference,android/telecom/Connection.CAPABILITY_DISCONNECT_FROM_CONFERENCE,8192
 23,Android.Telecom.ConnectionCapability,Hold,android/telecom/Connection.CAPABILITY_HOLD,1
 23,Android.Telecom.ConnectionCapability,ManageConference,android/telecom/Connection.CAPABILITY_MANAGE_CONFERENCE,128
@@ -3257,13 +3232,13 @@
 23,Android.Telecom.ConnectionCapability,Mute,android/telecom/Connection.CAPABILITY_MUTE,64
 23,Android.Telecom.ConnectionCapability,RespondViaText,android/telecom/Connection.CAPABILITY_RESPOND_VIA_TEXT,32
 23,Android.Telecom.ConnectionCapability,SeparateFromConference,android/telecom/Connection.CAPABILITY_SEPARATE_FROM_CONFERENCE,4096
+23,Android.Telecom.ConnectionCapability,SupportHold,android/telecom/Connection.CAPABILITY_SUPPORT_HOLD,2
 23,Android.Telecom.ConnectionCapability,SupportsVtLocalBidirectional,android/telecom/Connection.CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL,768
 23,Android.Telecom.ConnectionCapability,SupportsVtLocalRx,android/telecom/Connection.CAPABILITY_SUPPORTS_VT_LOCAL_RX,256
 23,Android.Telecom.ConnectionCapability,SupportsVtLocalTx,android/telecom/Connection.CAPABILITY_SUPPORTS_VT_LOCAL_TX,512
 23,Android.Telecom.ConnectionCapability,SupportsVtRemoteBidirectional,android/telecom/Connection.CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL,3072
 23,Android.Telecom.ConnectionCapability,SupportsVtRemoteRx,android/telecom/Connection.CAPABILITY_SUPPORTS_VT_REMOTE_RX,1024
 23,Android.Telecom.ConnectionCapability,SupportsVtRemoteTx,android/telecom/Connection.CAPABILITY_SUPPORTS_VT_REMOTE_TX,2048
-23,Android.Telecom.ConnectionCapability,SupportHold,android/telecom/Connection.CAPABILITY_SUPPORT_HOLD,2
 23,Android.Telecom.ConnectionCapability,SwapConference,android/telecom/Connection.CAPABILITY_SWAP_CONFERENCE,8
 23,Android.Telecom.ConnectionState,Active,android/telecom/Connection.STATE_ACTIVE,4
 23,Android.Telecom.ConnectionState,Dialing,android/telecom/Connection.STATE_DIALING,3
@@ -3344,38 +3319,47 @@
 26,Android.Views.Autofill.AutofillEventType,InputShown,android/view/autofill/AutofillManager.AutofillCallback.EVENT_INPUT_SHOWN,1
 26,Android.Views.Autofill.AutofillEventType,InputUnavailable,android/view/autofill/AutofillManager.AutofillCallback.EVENT_INPUT_UNAVAILABLE,3
 0,Android.Hardware.Fingerprints.FingerprintAuthenticationFlags,None,,0
+10,Android.Provider.HistoryProjection,BookmarkIndex,android/provider/Browser.HISTORY_PROJECTION_BOOKMARK_INDEX,4
+10,Android.Provider.HistoryProjection,DateIndex,android/provider/Browser.HISTORY_PROJECTION_DATE_INDEX,3
+10,Android.Provider.HistoryProjection,FaviconIndex,android/provider/Browser.HISTORY_PROJECTION_FAVICON_INDEX,6
+10,Android.Provider.HistoryProjection,IdIndex,android/provider/Browser.HISTORY_PROJECTION_ID_INDEX,0
+10,Android.Provider.HistoryProjection,TitleIndex,android/provider/Browser.HISTORY_PROJECTION_TITLE_INDEX,5
+10,Android.Provider.HistoryProjection,UrlIndex,android/provider/Browser.HISTORY_PROJECTION_URL_INDEX,1
+10,Android.Provider.HistoryProjection,VisitsIndex,android/provider/Browser.HISTORY_PROJECTION_VISITS_INDEX,2
+10,Android.Provider.SearchesProjection,DateIndex,android/provider/Browser.SEARCHES_PROJECTION_DATE_INDEX,2
+10,Android.Provider.SearchesProjection,SearchIndex,android/provider/Browser.SEARCHES_PROJECTION_SEARCH_INDEX,1
 23,Android.Provider.ContactsProviderStatus,Busy,android/provider/ContactsContract.ProviderStatus.STATUS_BUSY,1
 23,Android.Provider.ContactsProviderStatus,Empty,android/provider/ContactsContract.ProviderStatus.STATUS_EMPTY,2
 23,Android.Provider.ContactsProviderStatus,Normal,android/provider/ContactsContract.ProviderStatus.STATUS_NORMAL,0
 
 - ENTER TRANSIENT MODE -
 
-1,Java.Awt.Font.Ranges,AllRanges,java/awt/font/NumericShaper.ALL_RANGES,524287
-1,Java.Awt.Font.Ranges,Arabic,java/awt/font/NumericShaper.ARABIC,2
-1,Java.Awt.Font.Ranges,Bengali,java/awt/font/NumericShaper.BENGALI,16
-1,Java.Awt.Font.Ranges,Devanagari,java/awt/font/NumericShaper.DEVANAGARI,8
-1,Java.Awt.Font.Ranges,EasternArabic,java/awt/font/NumericShaper.EASTERN_ARABIC,4
-1,Java.Awt.Font.Ranges,Ethiopic,java/awt/font/NumericShaper.ETHIOPIC,65536
-1,Java.Awt.Font.Ranges,European,java/awt/font/NumericShaper.EUROPEAN,1
-1,Java.Awt.Font.Ranges,Gujarati,java/awt/font/NumericShaper.GUJARATI,64
-1,Java.Awt.Font.Ranges,Gurmukhi,java/awt/font/NumericShaper.GURMUKHI,32
-1,Java.Awt.Font.Ranges,Kannada,java/awt/font/NumericShaper.KANNADA,1024
-1,Java.Awt.Font.Ranges,Khmer,java/awt/font/NumericShaper.KHMER,131072
-1,Java.Awt.Font.Ranges,Lao,java/awt/font/NumericShaper.LAO,8192
-1,Java.Awt.Font.Ranges,Malayalam,java/awt/font/NumericShaper.MALAYALAM,2048
-1,Java.Awt.Font.Ranges,Mongolian,java/awt/font/NumericShaper.MONGOLIAN,262144
-1,Java.Awt.Font.Ranges,Myanmar,java/awt/font/NumericShaper.MYANMAR,32768
-1,Java.Awt.Font.Ranges,Oriya,java/awt/font/NumericShaper.ORIYA,128
-1,Java.Awt.Font.Ranges,Tamil,java/awt/font/NumericShaper.TAMIL,256
-1,Java.Awt.Font.Ranges,Telugu,java/awt/font/NumericShaper.TELUGU,512
-1,Java.Awt.Font.Ranges,Thai,java/awt/font/NumericShaper.THAI,4096
-1,Java.Awt.Font.Ranges,Tibetan,java/awt/font/NumericShaper.TIBETAN,16384
-1,Java.IO.ObjectStreamProtocol,Version1,I:java/io/ObjectStreamConstants.PROTOCOL_VERSION_1,1
-1,Java.IO.ObjectStreamProtocol,Version2,I:java/io/ObjectStreamConstants.PROTOCOL_VERSION_2,2
-1,Java.IO.TokenType,Eof,java/io/StreamTokenizer.TT_EOF,-1
-1,Java.IO.TokenType,Eol,java/io/StreamTokenizer.TT_EOL,10
-1,Java.IO.TokenType,Number,java/io/StreamTokenizer.TT_NUMBER,-2
-1,Java.IO.TokenType,Word,java/io/StreamTokenizer.TT_WORD,-3
+10,Java.Awt.Font.Ranges,AllRanges,java/awt/font/NumericShaper.ALL_RANGES,524287
+10,Java.Awt.Font.Ranges,Arabic,java/awt/font/NumericShaper.ARABIC,2
+10,Java.Awt.Font.Ranges,Bengali,java/awt/font/NumericShaper.BENGALI,16
+10,Java.Awt.Font.Ranges,Devanagari,java/awt/font/NumericShaper.DEVANAGARI,8
+10,Java.Awt.Font.Ranges,EasternArabic,java/awt/font/NumericShaper.EASTERN_ARABIC,4
+10,Java.Awt.Font.Ranges,Ethiopic,java/awt/font/NumericShaper.ETHIOPIC,65536
+10,Java.Awt.Font.Ranges,European,java/awt/font/NumericShaper.EUROPEAN,1
+10,Java.Awt.Font.Ranges,Gujarati,java/awt/font/NumericShaper.GUJARATI,64
+10,Java.Awt.Font.Ranges,Gurmukhi,java/awt/font/NumericShaper.GURMUKHI,32
+10,Java.Awt.Font.Ranges,Kannada,java/awt/font/NumericShaper.KANNADA,1024
+10,Java.Awt.Font.Ranges,Khmer,java/awt/font/NumericShaper.KHMER,131072
+10,Java.Awt.Font.Ranges,Lao,java/awt/font/NumericShaper.LAO,8192
+10,Java.Awt.Font.Ranges,Malayalam,java/awt/font/NumericShaper.MALAYALAM,2048
+10,Java.Awt.Font.Ranges,Mongolian,java/awt/font/NumericShaper.MONGOLIAN,262144
+10,Java.Awt.Font.Ranges,Myanmar,java/awt/font/NumericShaper.MYANMAR,32768
+10,Java.Awt.Font.Ranges,Oriya,java/awt/font/NumericShaper.ORIYA,128
+10,Java.Awt.Font.Ranges,Tamil,java/awt/font/NumericShaper.TAMIL,256
+10,Java.Awt.Font.Ranges,Telugu,java/awt/font/NumericShaper.TELUGU,512
+10,Java.Awt.Font.Ranges,Thai,java/awt/font/NumericShaper.THAI,4096
+10,Java.Awt.Font.Ranges,Tibetan,java/awt/font/NumericShaper.TIBETAN,16384
+10,Java.IO.ObjectStreamProtocol,Version1,I:java/io/ObjectStreamConstants.PROTOCOL_VERSION_1,1
+10,Java.IO.ObjectStreamProtocol,Version2,I:java/io/ObjectStreamConstants.PROTOCOL_VERSION_2,2
+10,Java.IO.TokenType,Eof,java/io/StreamTokenizer.TT_EOF,-1
+10,Java.IO.TokenType,Eol,java/io/StreamTokenizer.TT_EOL,10
+10,Java.IO.TokenType,Number,java/io/StreamTokenizer.TT_NUMBER,-2
+10,Java.IO.TokenType,Word,java/io/StreamTokenizer.TT_WORD,-3
 26,Java.Lang.Invoke.ReferenceKind,Getfield,I:java/lang/invoke/MethodHandleInfo.REF_getField,1
 26,Java.Lang.Invoke.ReferenceKind,Getstatic,I:java/lang/invoke/MethodHandleInfo.REF_getStatic,2
 26,Java.Lang.Invoke.ReferenceKind,Invokeinterface,I:java/lang/invoke/MethodHandleInfo.REF_invokeInterface,9
@@ -3389,121 +3373,121 @@
 26,Java.Lang.Invoke.MethodLookupModes,Private,java/lang/invoke/MethodHandles.Lookup.PRIVATE,2
 26,Java.Lang.Invoke.MethodLookupModes,Protected,java/lang/invoke/MethodHandles.Lookup.PROTECTED,4
 26,Java.Lang.Invoke.MethodLookupModes,Public,java/lang/invoke/MethodHandles.Lookup.PUBLIC,1
-1,Java.Math.RoundOptions,Ceiling,java/math/BigDecimal.ROUND_CEILING,2
-1,Java.Math.RoundOptions,Down,java/math/BigDecimal.ROUND_DOWN,1
-1,Java.Math.RoundOptions,Floor,java/math/BigDecimal.ROUND_FLOOR,3
-1,Java.Math.RoundOptions,HalfDown,java/math/BigDecimal.ROUND_HALF_DOWN,5
-1,Java.Math.RoundOptions,HalfEven,java/math/BigDecimal.ROUND_HALF_EVEN,6
-1,Java.Math.RoundOptions,HalfUp,java/math/BigDecimal.ROUND_HALF_UP,4
-1,Java.Math.RoundOptions,Unnecessary,java/math/BigDecimal.ROUND_UNNECESSARY,7
-1,Java.Math.RoundOptions,Up,java/math/BigDecimal.ROUND_UP,0
-1,Java.Net.HttpStatus,Accepted,java/net/HttpURLConnection.HTTP_ACCEPTED,202
-1,Java.Net.HttpStatus,BadGateway,java/net/HttpURLConnection.HTTP_BAD_GATEWAY,502
-1,Java.Net.HttpStatus,BadMethod,java/net/HttpURLConnection.HTTP_BAD_METHOD,405
-1,Java.Net.HttpStatus,BadRequest,java/net/HttpURLConnection.HTTP_BAD_REQUEST,400
-1,Java.Net.HttpStatus,ClientTimeout,java/net/HttpURLConnection.HTTP_CLIENT_TIMEOUT,408
-1,Java.Net.HttpStatus,Conflict,java/net/HttpURLConnection.HTTP_CONFLICT,409
-1,Java.Net.HttpStatus,Created,java/net/HttpURLConnection.HTTP_CREATED,201
-1,Java.Net.HttpStatus,EntityTooLarge,java/net/HttpURLConnection.HTTP_ENTITY_TOO_LARGE,413
-1,Java.Net.HttpStatus,Forbidden,java/net/HttpURLConnection.HTTP_FORBIDDEN,403
-1,Java.Net.HttpStatus,GatewayTimeout,java/net/HttpURLConnection.HTTP_GATEWAY_TIMEOUT,504
-1,Java.Net.HttpStatus,Gone,java/net/HttpURLConnection.HTTP_GONE,410
-1,Java.Net.HttpStatus,InternalError,java/net/HttpURLConnection.HTTP_INTERNAL_ERROR,500
-1,Java.Net.HttpStatus,LengthRequired,java/net/HttpURLConnection.HTTP_LENGTH_REQUIRED,411
-1,Java.Net.HttpStatus,MovedPerm,java/net/HttpURLConnection.HTTP_MOVED_PERM,301
-1,Java.Net.HttpStatus,MovedTemp,java/net/HttpURLConnection.HTTP_MOVED_TEMP,302
-1,Java.Net.HttpStatus,MultChoice,java/net/HttpURLConnection.HTTP_MULT_CHOICE,300
-1,Java.Net.HttpStatus,NotAcceptable,java/net/HttpURLConnection.HTTP_NOT_ACCEPTABLE,406
-1,Java.Net.HttpStatus,NotAuthoritative,java/net/HttpURLConnection.HTTP_NOT_AUTHORITATIVE,203
-1,Java.Net.HttpStatus,NotFound,java/net/HttpURLConnection.HTTP_NOT_FOUND,404
-1,Java.Net.HttpStatus,NotImplemented,java/net/HttpURLConnection.HTTP_NOT_IMPLEMENTED,501
-1,Java.Net.HttpStatus,NotModified,java/net/HttpURLConnection.HTTP_NOT_MODIFIED,304
-1,Java.Net.HttpStatus,NoContent,java/net/HttpURLConnection.HTTP_NO_CONTENT,204
-1,Java.Net.HttpStatus,Ok,java/net/HttpURLConnection.HTTP_OK,200
-1,Java.Net.HttpStatus,Partial,java/net/HttpURLConnection.HTTP_PARTIAL,206
-1,Java.Net.HttpStatus,PaymentRequired,java/net/HttpURLConnection.HTTP_PAYMENT_REQUIRED,402
-1,Java.Net.HttpStatus,PreconFailed,java/net/HttpURLConnection.HTTP_PRECON_FAILED,412
-1,Java.Net.HttpStatus,ProxyAuth,java/net/HttpURLConnection.HTTP_PROXY_AUTH,407
-1,Java.Net.HttpStatus,ReqTooLong,java/net/HttpURLConnection.HTTP_REQ_TOO_LONG,414
-1,Java.Net.HttpStatus,Reset,java/net/HttpURLConnection.HTTP_RESET,205
-1,Java.Net.HttpStatus,SeeOther,java/net/HttpURLConnection.HTTP_SEE_OTHER,303
-1,Java.Net.HttpStatus,ServerError,java/net/HttpURLConnection.HTTP_SERVER_ERROR,500
-1,Java.Net.HttpStatus,Unauthorized,java/net/HttpURLConnection.HTTP_UNAUTHORIZED,401
-1,Java.Net.HttpStatus,Unavailable,java/net/HttpURLConnection.HTTP_UNAVAILABLE,503
-1,Java.Net.HttpStatus,UnsupportedType,java/net/HttpURLConnection.HTTP_UNSUPPORTED_TYPE,415
-1,Java.Net.HttpStatus,UseProxy,java/net/HttpURLConnection.HTTP_USE_PROXY,305
-1,Java.Net.HttpStatus,Version,java/net/HttpURLConnection.HTTP_VERSION,505
-1,Java.Net.SocketOption,IpMulticastIf,I:java/net/SocketOptions.IP_MULTICAST_IF,16
-1,Java.Net.SocketOption,IpMulticastIf2,I:java/net/SocketOptions.IP_MULTICAST_IF2,31
-1,Java.Net.SocketOption,IpMulticastLoop,I:java/net/SocketOptions.IP_MULTICAST_LOOP,18
-1,Java.Net.SocketOption,IpTos,I:java/net/SocketOptions.IP_TOS,3
-1,Java.Net.SocketOption,SoBindaddr,I:java/net/SocketOptions.SO_BINDADDR,15
-1,Java.Net.SocketOption,SoBroadcast,I:java/net/SocketOptions.SO_BROADCAST,32
-1,Java.Net.SocketOption,SoKeepalive,I:java/net/SocketOptions.SO_KEEPALIVE,8
-1,Java.Net.SocketOption,SoLinger,I:java/net/SocketOptions.SO_LINGER,128
-1,Java.Net.SocketOption,SoOobinline,I:java/net/SocketOptions.SO_OOBINLINE,4099
-1,Java.Net.SocketOption,SoRcvbuf,I:java/net/SocketOptions.SO_RCVBUF,4098
-1,Java.Net.SocketOption,SoReuseaddr,I:java/net/SocketOptions.SO_REUSEADDR,4
-1,Java.Net.SocketOption,SoSndbuf,I:java/net/SocketOptions.SO_SNDBUF,4097
-1,Java.Net.SocketOption,SoTimeout,I:java/net/SocketOptions.SO_TIMEOUT,4102
-1,Java.Net.SocketOption,TcpNodelay,I:java/net/SocketOptions.TCP_NODELAY,1
+10,Java.Math.RoundOptions,Ceiling,java/math/BigDecimal.ROUND_CEILING,2
+10,Java.Math.RoundOptions,Down,java/math/BigDecimal.ROUND_DOWN,1
+10,Java.Math.RoundOptions,Floor,java/math/BigDecimal.ROUND_FLOOR,3
+10,Java.Math.RoundOptions,HalfDown,java/math/BigDecimal.ROUND_HALF_DOWN,5
+10,Java.Math.RoundOptions,HalfEven,java/math/BigDecimal.ROUND_HALF_EVEN,6
+10,Java.Math.RoundOptions,HalfUp,java/math/BigDecimal.ROUND_HALF_UP,4
+10,Java.Math.RoundOptions,Unnecessary,java/math/BigDecimal.ROUND_UNNECESSARY,7
+10,Java.Math.RoundOptions,Up,java/math/BigDecimal.ROUND_UP,0
+10,Java.Net.HttpStatus,Accepted,java/net/HttpURLConnection.HTTP_ACCEPTED,202
+10,Java.Net.HttpStatus,BadGateway,java/net/HttpURLConnection.HTTP_BAD_GATEWAY,502
+10,Java.Net.HttpStatus,BadMethod,java/net/HttpURLConnection.HTTP_BAD_METHOD,405
+10,Java.Net.HttpStatus,BadRequest,java/net/HttpURLConnection.HTTP_BAD_REQUEST,400
+10,Java.Net.HttpStatus,ClientTimeout,java/net/HttpURLConnection.HTTP_CLIENT_TIMEOUT,408
+10,Java.Net.HttpStatus,Conflict,java/net/HttpURLConnection.HTTP_CONFLICT,409
+10,Java.Net.HttpStatus,Created,java/net/HttpURLConnection.HTTP_CREATED,201
+10,Java.Net.HttpStatus,EntityTooLarge,java/net/HttpURLConnection.HTTP_ENTITY_TOO_LARGE,413
+10,Java.Net.HttpStatus,Forbidden,java/net/HttpURLConnection.HTTP_FORBIDDEN,403
+10,Java.Net.HttpStatus,GatewayTimeout,java/net/HttpURLConnection.HTTP_GATEWAY_TIMEOUT,504
+10,Java.Net.HttpStatus,Gone,java/net/HttpURLConnection.HTTP_GONE,410
+10,Java.Net.HttpStatus,InternalError,java/net/HttpURLConnection.HTTP_INTERNAL_ERROR,500
+10,Java.Net.HttpStatus,LengthRequired,java/net/HttpURLConnection.HTTP_LENGTH_REQUIRED,411
+10,Java.Net.HttpStatus,MovedPerm,java/net/HttpURLConnection.HTTP_MOVED_PERM,301
+10,Java.Net.HttpStatus,MovedTemp,java/net/HttpURLConnection.HTTP_MOVED_TEMP,302
+10,Java.Net.HttpStatus,MultChoice,java/net/HttpURLConnection.HTTP_MULT_CHOICE,300
+10,Java.Net.HttpStatus,NoContent,java/net/HttpURLConnection.HTTP_NO_CONTENT,204
+10,Java.Net.HttpStatus,NotAcceptable,java/net/HttpURLConnection.HTTP_NOT_ACCEPTABLE,406
+10,Java.Net.HttpStatus,NotAuthoritative,java/net/HttpURLConnection.HTTP_NOT_AUTHORITATIVE,203
+10,Java.Net.HttpStatus,NotFound,java/net/HttpURLConnection.HTTP_NOT_FOUND,404
+10,Java.Net.HttpStatus,NotImplemented,java/net/HttpURLConnection.HTTP_NOT_IMPLEMENTED,501
+10,Java.Net.HttpStatus,NotModified,java/net/HttpURLConnection.HTTP_NOT_MODIFIED,304
+10,Java.Net.HttpStatus,Ok,java/net/HttpURLConnection.HTTP_OK,200
+10,Java.Net.HttpStatus,Partial,java/net/HttpURLConnection.HTTP_PARTIAL,206
+10,Java.Net.HttpStatus,PaymentRequired,java/net/HttpURLConnection.HTTP_PAYMENT_REQUIRED,402
+10,Java.Net.HttpStatus,PreconFailed,java/net/HttpURLConnection.HTTP_PRECON_FAILED,412
+10,Java.Net.HttpStatus,ProxyAuth,java/net/HttpURLConnection.HTTP_PROXY_AUTH,407
+10,Java.Net.HttpStatus,ReqTooLong,java/net/HttpURLConnection.HTTP_REQ_TOO_LONG,414
+10,Java.Net.HttpStatus,Reset,java/net/HttpURLConnection.HTTP_RESET,205
+10,Java.Net.HttpStatus,SeeOther,java/net/HttpURLConnection.HTTP_SEE_OTHER,303
+10,Java.Net.HttpStatus,ServerError,java/net/HttpURLConnection.HTTP_SERVER_ERROR,500
+10,Java.Net.HttpStatus,Unauthorized,java/net/HttpURLConnection.HTTP_UNAUTHORIZED,401
+10,Java.Net.HttpStatus,Unavailable,java/net/HttpURLConnection.HTTP_UNAVAILABLE,503
+10,Java.Net.HttpStatus,UnsupportedType,java/net/HttpURLConnection.HTTP_UNSUPPORTED_TYPE,415
+10,Java.Net.HttpStatus,UseProxy,java/net/HttpURLConnection.HTTP_USE_PROXY,305
+10,Java.Net.HttpStatus,Version,java/net/HttpURLConnection.HTTP_VERSION,505
+10,Java.Net.SocketOption,IpMulticastIf,I:java/net/SocketOptions.IP_MULTICAST_IF,16
+10,Java.Net.SocketOption,IpMulticastIf2,I:java/net/SocketOptions.IP_MULTICAST_IF2,31
+10,Java.Net.SocketOption,IpMulticastLoop,I:java/net/SocketOptions.IP_MULTICAST_LOOP,18
+10,Java.Net.SocketOption,IpTos,I:java/net/SocketOptions.IP_TOS,3
+10,Java.Net.SocketOption,SoBindaddr,I:java/net/SocketOptions.SO_BINDADDR,15
+10,Java.Net.SocketOption,SoBroadcast,I:java/net/SocketOptions.SO_BROADCAST,32
+10,Java.Net.SocketOption,SoKeepalive,I:java/net/SocketOptions.SO_KEEPALIVE,8
+10,Java.Net.SocketOption,SoLinger,I:java/net/SocketOptions.SO_LINGER,128
+10,Java.Net.SocketOption,SoOobinline,I:java/net/SocketOptions.SO_OOBINLINE,4099
+10,Java.Net.SocketOption,SoRcvbuf,I:java/net/SocketOptions.SO_RCVBUF,4098
+10,Java.Net.SocketOption,SoReuseaddr,I:java/net/SocketOptions.SO_REUSEADDR,4
+10,Java.Net.SocketOption,SoSndbuf,I:java/net/SocketOptions.SO_SNDBUF,4097
+10,Java.Net.SocketOption,SoTimeout,I:java/net/SocketOptions.SO_TIMEOUT,4102
+10,Java.Net.SocketOption,TcpNodelay,I:java/net/SocketOptions.TCP_NODELAY,1
 0,Java.Net.IDNFlags,None,,0
-9,Java.Net.IDNFlags,AllowUnassigned,java/net/IDN.ALLOW_UNASSIGNED,1
-9,Java.Net.IDNFlags,UseStd3AsciiRules,java/net/IDN.USE_STD3_ASCII_RULES,2
+10,Java.Net.IDNFlags,AllowUnassigned,java/net/IDN.ALLOW_UNASSIGNED,1
+10,Java.Net.IDNFlags,UseStd3AsciiRules,java/net/IDN.USE_STD3_ASCII_RULES,2
 0,Java.Nio.Channels.Operations,None,,0
-1,Java.Nio.Channels.Operations,Accept,java/nio/channels/SelectionKey.OP_ACCEPT,16
-1,Java.Nio.Channels.Operations,Connect,java/nio/channels/SelectionKey.OP_CONNECT,8
-1,Java.Nio.Channels.Operations,Read,java/nio/channels/SelectionKey.OP_READ,1
-1,Java.Nio.Channels.Operations,Write,java/nio/channels/SelectionKey.OP_WRITE,4
-1,Java.Security.SignatureState,Sign,java/security/Signature.SIGN,2
-1,Java.Security.SignatureState,Uninitialized,java/security/Signature.UNINITIALIZED,0
-1,Java.Security.SignatureState,Verify,java/security/Signature.VERIFY,3
-9,Java.Util.CalendarStyle,AllStyles,java/util/Calendar.ALL_STYLES,0
-9,Java.Util.CalendarStyle,Long,java/util/Calendar.LONG,2
-9,Java.Util.CalendarStyle,Short,java/util/Calendar.SHORT,1
-1,Java.Util.CalendarField,AmPm,java/util/Calendar.AM_PM,9
-1,Java.Util.CalendarField,Date,java/util/Calendar.DATE,5
-1,Java.Util.CalendarField,DayOfMonth,java/util/Calendar.DAY_OF_MONTH,5
-1,Java.Util.CalendarField,DayOfWeek,java/util/Calendar.DAY_OF_WEEK,7
-1,Java.Util.CalendarField,DayOfWeekInMonth,java/util/Calendar.DAY_OF_WEEK_IN_MONTH,8
-1,Java.Util.CalendarField,DayOfYear,java/util/Calendar.DAY_OF_YEAR,6
-1,Java.Util.CalendarField,DstOffset,java/util/Calendar.DST_OFFSET,16
-1,Java.Util.CalendarField,Era,java/util/Calendar.ERA,0
-1,Java.Util.CalendarField,Hour,java/util/Calendar.HOUR,10
-1,Java.Util.CalendarField,HourOfDay,java/util/Calendar.HOUR_OF_DAY,11
-1,Java.Util.CalendarField,Millisecond,java/util/Calendar.MILLISECOND,14
-1,Java.Util.CalendarField,Minute,java/util/Calendar.MINUTE,12
-1,Java.Util.CalendarField,Month,java/util/Calendar.MONTH,2
-1,Java.Util.CalendarField,Second,java/util/Calendar.SECOND,13
-1,Java.Util.CalendarField,WeekOfMonth,java/util/Calendar.WEEK_OF_MONTH,4
-1,Java.Util.CalendarField,WeekOfYear,java/util/Calendar.WEEK_OF_YEAR,3
-1,Java.Util.CalendarField,Year,java/util/Calendar.YEAR,1
-1,Java.Util.CalendarField,ZoneOffset,java/util/Calendar.ZONE_OFFSET,15
-1,Java.Util.FormatFlags,Alternate,java/util/FormattableFlags.ALTERNATE,4
-1,Java.Util.FormatFlags,LeftJustify,java/util/FormattableFlags.LEFT_JUSTIFY,1
-1,Java.Util.FormatFlags,Uppercase,java/util/FormattableFlags.UPPERCASE,2
-1,Java.Util.TimeZoneStyle,Long,java/util/TimeZone.LONG,1
-1,Java.Util.TimeZoneStyle,Short,java/util/TimeZone.SHORT,0
-1,Java.Util.TimeZoneKind,StandardTime,java/util/SimpleTimeZone.STANDARD_TIME,1
-1,Java.Util.TimeZoneKind,UtcTime,java/util/SimpleTimeZone.UTC_TIME,2
-1,Java.Util.TimeZoneKind,WallTime,java/util/SimpleTimeZone.WALL_TIME,0
-1,Java.Util.Regex.RegexOptions,CanonEq,java/util/regex/Pattern.CANON_EQ,128
-1,Java.Util.Regex.RegexOptions,CaseInsensitive,java/util/regex/Pattern.CASE_INSENSITIVE,2
-1,Java.Util.Regex.RegexOptions,Comments,java/util/regex/Pattern.COMMENTS,4
-1,Java.Util.Regex.RegexOptions,Dotall,java/util/regex/Pattern.DOTALL,32
-1,Java.Util.Regex.RegexOptions,Literal,java/util/regex/Pattern.LITERAL,16
-1,Java.Util.Regex.RegexOptions,Multiline,java/util/regex/Pattern.MULTILINE,8
-1,Java.Util.Regex.RegexOptions,UnicodeCase,java/util/regex/Pattern.UNICODE_CASE,64
+10,Java.Nio.Channels.Operations,Accept,java/nio/channels/SelectionKey.OP_ACCEPT,16
+10,Java.Nio.Channels.Operations,Connect,java/nio/channels/SelectionKey.OP_CONNECT,8
+10,Java.Nio.Channels.Operations,Read,java/nio/channels/SelectionKey.OP_READ,1
+10,Java.Nio.Channels.Operations,Write,java/nio/channels/SelectionKey.OP_WRITE,4
+10,Java.Security.SignatureState,Sign,java/security/Signature.SIGN,2
+10,Java.Security.SignatureState,Uninitialized,java/security/Signature.UNINITIALIZED,0
+10,Java.Security.SignatureState,Verify,java/security/Signature.VERIFY,3
+10,Java.Util.CalendarStyle,AllStyles,java/util/Calendar.ALL_STYLES,0
+10,Java.Util.CalendarStyle,Long,java/util/Calendar.LONG,2
+10,Java.Util.CalendarStyle,Short,java/util/Calendar.SHORT,1
+10,Java.Util.CalendarField,AmPm,java/util/Calendar.AM_PM,9
+10,Java.Util.CalendarField,Date,java/util/Calendar.DATE,5
+10,Java.Util.CalendarField,DayOfMonth,java/util/Calendar.DAY_OF_MONTH,5
+10,Java.Util.CalendarField,DayOfWeek,java/util/Calendar.DAY_OF_WEEK,7
+10,Java.Util.CalendarField,DayOfWeekInMonth,java/util/Calendar.DAY_OF_WEEK_IN_MONTH,8
+10,Java.Util.CalendarField,DayOfYear,java/util/Calendar.DAY_OF_YEAR,6
+10,Java.Util.CalendarField,DstOffset,java/util/Calendar.DST_OFFSET,16
+10,Java.Util.CalendarField,Era,java/util/Calendar.ERA,0
+10,Java.Util.CalendarField,Hour,java/util/Calendar.HOUR,10
+10,Java.Util.CalendarField,HourOfDay,java/util/Calendar.HOUR_OF_DAY,11
+10,Java.Util.CalendarField,Millisecond,java/util/Calendar.MILLISECOND,14
+10,Java.Util.CalendarField,Minute,java/util/Calendar.MINUTE,12
+10,Java.Util.CalendarField,Month,java/util/Calendar.MONTH,2
+10,Java.Util.CalendarField,Second,java/util/Calendar.SECOND,13
+10,Java.Util.CalendarField,WeekOfMonth,java/util/Calendar.WEEK_OF_MONTH,4
+10,Java.Util.CalendarField,WeekOfYear,java/util/Calendar.WEEK_OF_YEAR,3
+10,Java.Util.CalendarField,Year,java/util/Calendar.YEAR,1
+10,Java.Util.CalendarField,ZoneOffset,java/util/Calendar.ZONE_OFFSET,15
+10,Java.Util.FormatFlags,Alternate,java/util/FormattableFlags.ALTERNATE,4
+10,Java.Util.FormatFlags,LeftJustify,java/util/FormattableFlags.LEFT_JUSTIFY,1
+10,Java.Util.FormatFlags,Uppercase,java/util/FormattableFlags.UPPERCASE,2
+10,Java.Util.TimeZoneStyle,Long,java/util/TimeZone.LONG,1
+10,Java.Util.TimeZoneStyle,Short,java/util/TimeZone.SHORT,0
+10,Java.Util.TimeZoneKind,StandardTime,java/util/SimpleTimeZone.STANDARD_TIME,1
+10,Java.Util.TimeZoneKind,UtcTime,java/util/SimpleTimeZone.UTC_TIME,2
+10,Java.Util.TimeZoneKind,WallTime,java/util/SimpleTimeZone.WALL_TIME,0
+10,Java.Util.Regex.RegexOptions,CanonEq,java/util/regex/Pattern.CANON_EQ,128
+10,Java.Util.Regex.RegexOptions,CaseInsensitive,java/util/regex/Pattern.CASE_INSENSITIVE,2
+10,Java.Util.Regex.RegexOptions,Comments,java/util/regex/Pattern.COMMENTS,4
+10,Java.Util.Regex.RegexOptions,Dotall,java/util/regex/Pattern.DOTALL,32
+10,Java.Util.Regex.RegexOptions,Literal,java/util/regex/Pattern.LITERAL,16
+10,Java.Util.Regex.RegexOptions,Multiline,java/util/regex/Pattern.MULTILINE,8
+10,Java.Util.Regex.RegexOptions,UnicodeCase,java/util/regex/Pattern.UNICODE_CASE,64
 24,Java.Util.Regex.RegexOptions,UnicodeCharacterClass,java/util/regex/Pattern.UNICODE_CHARACTER_CLASS,256
-1,Java.Util.Regex.RegexOptions,UnixLines,java/util/regex/Pattern.UNIX_LINES,1
-1,Javax.Crypto.KeyType,PrivateKey,javax/crypto/Cipher.PRIVATE_KEY,2
-1,Javax.Crypto.KeyType,PublicKey,javax/crypto/Cipher.PUBLIC_KEY,1
-1,Javax.Crypto.KeyType,SecretKey,javax/crypto/Cipher.SECRET_KEY,3
-1,Javax.Crypto.CipherMode,DecryptMode,javax/crypto/Cipher.DECRYPT_MODE,2
-1,Javax.Crypto.CipherMode,EncryptMode,javax/crypto/Cipher.ENCRYPT_MODE,1
-1,Javax.Crypto.CipherMode,UnwrapMode,javax/crypto/Cipher.UNWRAP_MODE,4
-1,Javax.Crypto.CipherMode,WrapMode,javax/crypto/Cipher.WRAP_MODE,3
-4,Android.AccessibilityServices.AccessibilityServiceFlags,Default,android/accessibilityservice/AccessibilityServiceInfo.DEFAULT,1
+10,Java.Util.Regex.RegexOptions,UnixLines,java/util/regex/Pattern.UNIX_LINES,1
+10,Javax.Crypto.KeyType,PrivateKey,javax/crypto/Cipher.PRIVATE_KEY,2
+10,Javax.Crypto.KeyType,PublicKey,javax/crypto/Cipher.PUBLIC_KEY,1
+10,Javax.Crypto.KeyType,SecretKey,javax/crypto/Cipher.SECRET_KEY,3
+10,Javax.Crypto.CipherMode,DecryptMode,javax/crypto/Cipher.DECRYPT_MODE,2
+10,Javax.Crypto.CipherMode,EncryptMode,javax/crypto/Cipher.ENCRYPT_MODE,1
+10,Javax.Crypto.CipherMode,UnwrapMode,javax/crypto/Cipher.UNWRAP_MODE,4
+10,Javax.Crypto.CipherMode,WrapMode,javax/crypto/Cipher.WRAP_MODE,3
+10,Android.AccessibilityServices.AccessibilityServiceFlags,Default,android/accessibilityservice/AccessibilityServiceInfo.DEFAULT,1
 26,Android.AccessibilityServices.AccessibilityServiceFlags,EnableAccessibilityVolume,android/accessibilityservice/AccessibilityServiceInfo.FLAG_ENABLE_ACCESSIBILITY_VOLUME,128
 16,Android.AccessibilityServices.AccessibilityServiceFlags,IncludeNotImportantViews,android/accessibilityservice/AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS,2
 18,Android.AccessibilityServices.AccessibilityServiceFlags,ReportViewIds,android/accessibilityservice/AccessibilityServiceInfo.FLAG_REPORT_VIEW_IDS,16
@@ -3521,77 +3505,77 @@
 26,Android.AccessibilityServices.AccessibilityServiceCapabilities,CanRequestFingerprintGestures,android/accessibilityservice/AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES,64
 18,Android.AccessibilityServices.AccessibilityServiceCapabilities,CanRequestTouchExploration,android/accessibilityservice/AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION,2
 18,Android.AccessibilityServices.AccessibilityServiceCapabilities,CanRetrieveWindowContent,android/accessibilityservice/AccessibilityServiceInfo.CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT,1
-5,Android.Accounts.ErrorCode,BadArguments,android/accounts/AccountManager.ERROR_CODE_BAD_ARGUMENTS,7
+10,Android.Accounts.ErrorCode,BadArguments,android/accounts/AccountManager.ERROR_CODE_BAD_ARGUMENTS,7
 18,Android.Accounts.ErrorCode,ErrorCodeBadAuthentication,android/accounts/AccountManager.ERROR_CODE_BAD_AUTHENTICATION,9
-5,Android.Accounts.ErrorCode,BadRequest,android/accounts/AccountManager.ERROR_CODE_BAD_REQUEST,8
-5,Android.Accounts.ErrorCode,Canceled,android/accounts/AccountManager.ERROR_CODE_CANCELED,4
-5,Android.Accounts.ErrorCode,InvalidResponse,android/accounts/AccountManager.ERROR_CODE_INVALID_RESPONSE,5
-5,Android.Accounts.ErrorCode,NetworkError,android/accounts/AccountManager.ERROR_CODE_NETWORK_ERROR,3
-5,Android.Accounts.ErrorCode,RemoteException,android/accounts/AccountManager.ERROR_CODE_REMOTE_EXCEPTION,1
-5,Android.Accounts.ErrorCode,UnsupportedOperation,android/accounts/AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,6
-11,Android.Animation.ValueAnimatorRepeatMode,Restart,android/animation/ValueAnimator.RESTART,1
-11,Android.Animation.ValueAnimatorRepeatMode,Reverse,android/animation/ValueAnimator.REVERSE,2
-11,Android.Animation.LayoutTransitionType,Appearing,android/animation/LayoutTransition.APPEARING,2
-11,Android.Animation.LayoutTransitionType,ChangeAppearing,android/animation/LayoutTransition.CHANGE_APPEARING,0
-11,Android.Animation.LayoutTransitionType,ChangeDisappearing,android/animation/LayoutTransition.CHANGE_DISAPPEARING,1
+10,Android.Accounts.ErrorCode,BadRequest,android/accounts/AccountManager.ERROR_CODE_BAD_REQUEST,8
+10,Android.Accounts.ErrorCode,Canceled,android/accounts/AccountManager.ERROR_CODE_CANCELED,4
+10,Android.Accounts.ErrorCode,InvalidResponse,android/accounts/AccountManager.ERROR_CODE_INVALID_RESPONSE,5
+10,Android.Accounts.ErrorCode,NetworkError,android/accounts/AccountManager.ERROR_CODE_NETWORK_ERROR,3
+10,Android.Accounts.ErrorCode,RemoteException,android/accounts/AccountManager.ERROR_CODE_REMOTE_EXCEPTION,1
+10,Android.Accounts.ErrorCode,UnsupportedOperation,android/accounts/AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,6
+15,Android.Animation.ValueAnimatorRepeatMode,Restart,android/animation/ValueAnimator.RESTART,1
+15,Android.Animation.ValueAnimatorRepeatMode,Reverse,android/animation/ValueAnimator.REVERSE,2
+15,Android.Animation.LayoutTransitionType,Appearing,android/animation/LayoutTransition.APPEARING,2
+15,Android.Animation.LayoutTransitionType,ChangeAppearing,android/animation/LayoutTransition.CHANGE_APPEARING,0
+15,Android.Animation.LayoutTransitionType,ChangeDisappearing,android/animation/LayoutTransition.CHANGE_DISAPPEARING,1
 16,Android.Animation.LayoutTransitionType,Changing,android/animation/LayoutTransition.CHANGING,4
-11,Android.Animation.LayoutTransitionType,Disappearing,android/animation/LayoutTransition.DISAPPEARING,3
-1,Android.App.ProcessError,Crashed,android/app/ActivityManager$ProcessErrorStateInfo.CRASHED,1
-1,Android.App.ProcessError,NotResponding,android/app/ActivityManager$ProcessErrorStateInfo.NOT_RESPONDING,2
-1,Android.App.ProcessError,NoError,android/app/ActivityManager$ProcessErrorStateInfo.NO_ERROR,0
-3,Android.App.Importance,Background,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_BACKGROUND,400
+15,Android.Animation.LayoutTransitionType,Disappearing,android/animation/LayoutTransition.DISAPPEARING,3
+10,Android.App.ProcessError,Crashed,android/app/ActivityManager$ProcessErrorStateInfo.CRASHED,1
+10,Android.App.ProcessError,NoError,android/app/ActivityManager$ProcessErrorStateInfo.NO_ERROR,0
+10,Android.App.ProcessError,NotResponding,android/app/ActivityManager$ProcessErrorStateInfo.NOT_RESPONDING,2
+10,Android.App.Importance,Background,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_BACKGROUND,400
 26,Android.App.Importance,Cached,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_CACHED,400
-3,Android.App.Importance,Empty,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_EMPTY,500
-3,Android.App.Importance,Foreground,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_FOREGROUND,100
+10,Android.App.Importance,Empty,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_EMPTY,500
+10,Android.App.Importance,Foreground,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_FOREGROUND,100
 23,Android.App.Importance,ForegroundService,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE,125
 21,Android.App.Importance,Gone,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_GONE,1000
-9,Android.App.Importance,Perceptible,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_PERCEPTIBLE,230
+10,Android.App.Importance,Perceptible,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_PERCEPTIBLE,230
 26,Android.App.Importance,PerceptiblePre26,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_PERCEPTIBLE_PRE_26,130
-3,Android.App.Importance,Service,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_SERVICE,300
+10,Android.App.Importance,Service,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_SERVICE,300
 23,Android.App.Importance,TopSleeping,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_TOP_SLEEPING,150
-3,Android.App.Importance,Visible,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_VISIBLE,200
-5,Android.App.ImportanceReason,ProviderInUse,android/app/ActivityManager$RunningAppProcessInfo.REASON_PROVIDER_IN_USE,1
-5,Android.App.ImportanceReason,ServiceInUse,android/app/ActivityManager$RunningAppProcessInfo.REASON_SERVICE_IN_USE,2
-5,Android.App.ImportanceReason,Unknown,android/app/ActivityManager$RunningAppProcessInfo.REASON_UNKNOWN,0
-5,Android.App.ServiceInfoFlags,Foreground,android/app/ActivityManager$RunningServiceInfo.FLAG_FOREGROUND,2
-5,Android.App.ServiceInfoFlags,PersistentProcess,android/app/ActivityManager$RunningServiceInfo.FLAG_PERSISTENT_PROCESS,8
-5,Android.App.ServiceInfoFlags,Started,android/app/ActivityManager$RunningServiceInfo.FLAG_STARTED,1
-5,Android.App.ServiceInfoFlags,SystemProcess,android/app/ActivityManager$RunningServiceInfo.FLAG_SYSTEM_PROCESS,4
-14,Android.App.ApplicationErrorReportType,Anr,android/app/ApplicationErrorReport.TYPE_ANR,2
-14,Android.App.ApplicationErrorReportType,Battery,android/app/ApplicationErrorReport.TYPE_BATTERY,3
-14,Android.App.ApplicationErrorReportType,Crash,android/app/ApplicationErrorReport.TYPE_CRASH,1
-14,Android.App.ApplicationErrorReportType,None,android/app/ApplicationErrorReport.TYPE_NONE,0
-14,Android.App.ApplicationErrorReportType,RunningService,android/app/ApplicationErrorReport.TYPE_RUNNING_SERVICE,5
+10,Android.App.Importance,Visible,android/app/ActivityManager$RunningAppProcessInfo.IMPORTANCE_VISIBLE,200
+10,Android.App.ImportanceReason,ProviderInUse,android/app/ActivityManager$RunningAppProcessInfo.REASON_PROVIDER_IN_USE,1
+10,Android.App.ImportanceReason,ServiceInUse,android/app/ActivityManager$RunningAppProcessInfo.REASON_SERVICE_IN_USE,2
+10,Android.App.ImportanceReason,Unknown,android/app/ActivityManager$RunningAppProcessInfo.REASON_UNKNOWN,0
+10,Android.App.ServiceInfoFlags,Foreground,android/app/ActivityManager$RunningServiceInfo.FLAG_FOREGROUND,2
+10,Android.App.ServiceInfoFlags,PersistentProcess,android/app/ActivityManager$RunningServiceInfo.FLAG_PERSISTENT_PROCESS,8
+10,Android.App.ServiceInfoFlags,Started,android/app/ActivityManager$RunningServiceInfo.FLAG_STARTED,1
+10,Android.App.ServiceInfoFlags,SystemProcess,android/app/ActivityManager$RunningServiceInfo.FLAG_SYSTEM_PROCESS,4
+15,Android.App.ApplicationErrorReportType,Anr,android/app/ApplicationErrorReport.TYPE_ANR,2
+15,Android.App.ApplicationErrorReportType,Battery,android/app/ApplicationErrorReport.TYPE_BATTERY,3
+15,Android.App.ApplicationErrorReportType,Crash,android/app/ApplicationErrorReport.TYPE_CRASH,1
+15,Android.App.ApplicationErrorReportType,None,android/app/ApplicationErrorReport.TYPE_NONE,0
+15,Android.App.ApplicationErrorReportType,RunningService,android/app/ApplicationErrorReport.TYPE_RUNNING_SERVICE,5
 19,Android.App.AppOpsManagerMode,Allowed,android/app/AppOpsManager.MODE_ALLOWED,0
 21,Android.App.AppOpsManagerMode,Default,android/app/AppOpsManager.MODE_DEFAULT,3
 19,Android.App.AppOpsManagerMode,Errored,android/app/AppOpsManager.MODE_ERRORED,2
 19,Android.App.AppOpsManagerMode,Ignored,android/app/AppOpsManager.MODE_IGNORED,1
-9,Android.App.DownloadError,CannotResume,android/app/DownloadManager.ERROR_CANNOT_RESUME,1008
-9,Android.App.DownloadError,DeviceNotFound,android/app/DownloadManager.ERROR_DEVICE_NOT_FOUND,1007
-9,Android.App.DownloadError,FileAlreadyExists,android/app/DownloadManager.ERROR_FILE_ALREADY_EXISTS,1009
-9,Android.App.DownloadError,FileError,android/app/DownloadManager.ERROR_FILE_ERROR,1001
-9,Android.App.DownloadError,HttpDataError,android/app/DownloadManager.ERROR_HTTP_DATA_ERROR,1004
-9,Android.App.DownloadError,InsufficientSpace,android/app/DownloadManager.ERROR_INSUFFICIENT_SPACE,1006
-9,Android.App.DownloadError,TooManyRedirects,android/app/DownloadManager.ERROR_TOO_MANY_REDIRECTS,1005
-9,Android.App.DownloadError,UnhandledHttpCode,android/app/DownloadManager.ERROR_UNHANDLED_HTTP_CODE,1002
-9,Android.App.DownloadError,Unknown,android/app/DownloadManager.ERROR_UNKNOWN,1000
-9,Android.App.DownloadPausedReason,QueuedForWifi,android/app/DownloadManager.PAUSED_QUEUED_FOR_WIFI,3
-9,Android.App.DownloadPausedReason,Unknown,android/app/DownloadManager.PAUSED_UNKNOWN,4
-9,Android.App.DownloadPausedReason,WaitingForNetwork,android/app/DownloadManager.PAUSED_WAITING_FOR_NETWORK,2
-9,Android.App.DownloadPausedReason,WaitingToRetry,android/app/DownloadManager.PAUSED_WAITING_TO_RETRY,1
-9,Android.App.DownloadStatus,Failed,android/app/DownloadManager.STATUS_FAILED,16
-9,Android.App.DownloadStatus,Paused,android/app/DownloadManager.STATUS_PAUSED,4
-9,Android.App.DownloadStatus,Pending,android/app/DownloadManager.STATUS_PENDING,1
-9,Android.App.DownloadStatus,Running,android/app/DownloadManager.STATUS_RUNNING,2
-9,Android.App.DownloadStatus,Successful,android/app/DownloadManager.STATUS_SUCCESSFUL,8
-9,Android.App.DownloadNetwork,Mobile,android/app/DownloadManager.Request.NETWORK_MOBILE,1
-9,Android.App.DownloadNetwork,Wifi,android/app/DownloadManager.Request.NETWORK_WIFI,2
-11,Android.App.DownloadVisibility,Hidden,android/app/DownloadManager.Request.VISIBILITY_HIDDEN,2
-11,Android.App.DownloadVisibility,Visible,android/app/DownloadManager.Request.VISIBILITY_VISIBLE,0
-11,Android.App.DownloadVisibility,VisibleNotifyCompleted,android/app/DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED,1
-12,Android.App.DownloadVisibility,VisibleNotifyOnlyCompletion,android/app/DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_ONLY_COMPLETION,3
+10,Android.App.DownloadError,CannotResume,android/app/DownloadManager.ERROR_CANNOT_RESUME,1008
+10,Android.App.DownloadError,DeviceNotFound,android/app/DownloadManager.ERROR_DEVICE_NOT_FOUND,1007
+10,Android.App.DownloadError,FileAlreadyExists,android/app/DownloadManager.ERROR_FILE_ALREADY_EXISTS,1009
+10,Android.App.DownloadError,FileError,android/app/DownloadManager.ERROR_FILE_ERROR,1001
+10,Android.App.DownloadError,HttpDataError,android/app/DownloadManager.ERROR_HTTP_DATA_ERROR,1004
+10,Android.App.DownloadError,InsufficientSpace,android/app/DownloadManager.ERROR_INSUFFICIENT_SPACE,1006
+10,Android.App.DownloadError,TooManyRedirects,android/app/DownloadManager.ERROR_TOO_MANY_REDIRECTS,1005
+10,Android.App.DownloadError,UnhandledHttpCode,android/app/DownloadManager.ERROR_UNHANDLED_HTTP_CODE,1002
+10,Android.App.DownloadError,Unknown,android/app/DownloadManager.ERROR_UNKNOWN,1000
+10,Android.App.DownloadPausedReason,QueuedForWifi,android/app/DownloadManager.PAUSED_QUEUED_FOR_WIFI,3
+10,Android.App.DownloadPausedReason,Unknown,android/app/DownloadManager.PAUSED_UNKNOWN,4
+10,Android.App.DownloadPausedReason,WaitingForNetwork,android/app/DownloadManager.PAUSED_WAITING_FOR_NETWORK,2
+10,Android.App.DownloadPausedReason,WaitingToRetry,android/app/DownloadManager.PAUSED_WAITING_TO_RETRY,1
+10,Android.App.DownloadStatus,Failed,android/app/DownloadManager.STATUS_FAILED,16
+10,Android.App.DownloadStatus,Paused,android/app/DownloadManager.STATUS_PAUSED,4
+10,Android.App.DownloadStatus,Pending,android/app/DownloadManager.STATUS_PENDING,1
+10,Android.App.DownloadStatus,Running,android/app/DownloadManager.STATUS_RUNNING,2
+10,Android.App.DownloadStatus,Successful,android/app/DownloadManager.STATUS_SUCCESSFUL,8
+10,Android.App.DownloadNetwork,Mobile,android/app/DownloadManager.Request.NETWORK_MOBILE,1
+10,Android.App.DownloadNetwork,Wifi,android/app/DownloadManager.Request.NETWORK_WIFI,2
+15,Android.App.DownloadVisibility,Hidden,android/app/DownloadManager.Request.VISIBILITY_HIDDEN,2
+15,Android.App.DownloadVisibility,Visible,android/app/DownloadManager.Request.VISIBILITY_VISIBLE,0
+15,Android.App.DownloadVisibility,VisibleNotifyCompleted,android/app/DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED,1
+15,Android.App.DownloadVisibility,VisibleNotifyOnlyCompletion,android/app/DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_ONLY_COMPLETION,3
 0,Android.App.PopBackStackFlags,None,,0
-11,Android.App.PopBackStackFlags,Inclusive,android/app/FragmentManager.POP_BACK_STACK_INCLUSIVE,1
+15,Android.App.PopBackStackFlags,Inclusive,android/app/FragmentManager.POP_BACK_STACK_INCLUSIVE,1
 18,Android.App.UiAutomationRotation,Freeze0,android/app/UiAutomation.ROTATION_FREEZE_0,0
 18,Android.App.UiAutomationRotation,Freeze180,android/app/UiAutomation.ROTATION_FREEZE_180,2
 18,Android.App.UiAutomationRotation,Freeze270,android/app/UiAutomation.ROTATION_FREEZE_270,3
@@ -3599,89 +3583,89 @@
 18,Android.App.UiAutomationRotation,FreezeCurrent,android/app/UiAutomation.ROTATION_FREEZE_CURRENT,-1
 18,Android.App.UiAutomationRotation,Unfreeze,android/app/UiAutomation.ROTATION_UNFREEZE,-2
 0,Android.App.DisableCarModeFlags,None,,0
-8,Android.App.DisableCarModeFlags,GoHome,android/app/UiModeManager.DISABLE_CAR_MODE_GO_HOME,1
+10,Android.App.DisableCarModeFlags,GoHome,android/app/UiModeManager.DISABLE_CAR_MODE_GO_HOME,1
 0,Android.App.EnableCarModeFlags,None,,0
 21,Android.App.EnableCarModeFlags,AllowSleep,android/app/UiModeManager.ENABLE_CAR_MODE_ALLOW_SLEEP,2
-8,Android.App.EnableCarModeFlags,GoCarHome,android/app/UiModeManager.ENABLE_CAR_MODE_GO_CAR_HOME,1
-8,Android.App.UiNightMode,Auto,android/app/UiModeManager.MODE_NIGHT_AUTO,0
-8,Android.App.UiNightMode,No,android/app/UiModeManager.MODE_NIGHT_NO,1
-8,Android.App.UiNightMode,Yes,android/app/UiModeManager.MODE_NIGHT_YES,2
+10,Android.App.EnableCarModeFlags,GoCarHome,android/app/UiModeManager.ENABLE_CAR_MODE_GO_CAR_HOME,1
+10,Android.App.UiNightMode,Auto,android/app/UiModeManager.MODE_NIGHT_AUTO,0
+10,Android.App.UiNightMode,No,android/app/UiModeManager.MODE_NIGHT_NO,1
+10,Android.App.UiNightMode,Yes,android/app/UiModeManager.MODE_NIGHT_YES,2
 0,Android.App.BreadCrumbClickFlags,None,,0
-11,Android.App.Admin.DeviceAdminUses,EncryptedStorage,android/app/admin/DeviceAdminInfo.USES_ENCRYPTED_STORAGE,7
-14,Android.App.Admin.DeviceAdminUses,PolicyDisableCamera,android/app/admin/DeviceAdminInfo.USES_POLICY_DISABLE_CAMERA,8
+15,Android.App.Admin.DeviceAdminUses,EncryptedStorage,android/app/admin/DeviceAdminInfo.USES_ENCRYPTED_STORAGE,7
+15,Android.App.Admin.DeviceAdminUses,PolicyDisableCamera,android/app/admin/DeviceAdminInfo.USES_POLICY_DISABLE_CAMERA,8
 17,Android.App.Admin.DeviceAdminUses,PolicyDisableKeyguardFeatures,android/app/admin/DeviceAdminInfo.USES_POLICY_DISABLE_KEYGUARD_FEATURES,9
-11,Android.App.Admin.DeviceAdminUses,PolicyExpirePassword,android/app/admin/DeviceAdminInfo.USES_POLICY_EXPIRE_PASSWORD,6
-8,Android.App.Admin.DeviceAdminUses,PolicyForceLock,android/app/admin/DeviceAdminInfo.USES_POLICY_FORCE_LOCK,3
-8,Android.App.Admin.DeviceAdminUses,PolicyLimitPassword,android/app/admin/DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD,0
-8,Android.App.Admin.DeviceAdminUses,PolicyResetPassword,android/app/admin/DeviceAdminInfo.USES_POLICY_RESET_PASSWORD,2
-8,Android.App.Admin.DeviceAdminUses,PolicyWatchLogin,android/app/admin/DeviceAdminInfo.USES_POLICY_WATCH_LOGIN,1
-8,Android.App.Admin.DeviceAdminUses,PolicyWipeData,android/app/admin/DeviceAdminInfo.USES_POLICY_WIPE_DATA,4
+15,Android.App.Admin.DeviceAdminUses,PolicyExpirePassword,android/app/admin/DeviceAdminInfo.USES_POLICY_EXPIRE_PASSWORD,6
+10,Android.App.Admin.DeviceAdminUses,PolicyForceLock,android/app/admin/DeviceAdminInfo.USES_POLICY_FORCE_LOCK,3
+10,Android.App.Admin.DeviceAdminUses,PolicyLimitPassword,android/app/admin/DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD,0
+10,Android.App.Admin.DeviceAdminUses,PolicyResetPassword,android/app/admin/DeviceAdminInfo.USES_POLICY_RESET_PASSWORD,2
+10,Android.App.Admin.DeviceAdminUses,PolicyWatchLogin,android/app/admin/DeviceAdminInfo.USES_POLICY_WATCH_LOGIN,1
+10,Android.App.Admin.DeviceAdminUses,PolicyWipeData,android/app/admin/DeviceAdminInfo.USES_POLICY_WIPE_DATA,4
 0,Android.App.Admin.DevicePolicyManagerFlags,None,,0
 26,Android.App.Admin.DevicePolicyManagerFlags,EvictCredentialEncryptionKey,android/app/admin/DevicePolicyManager.FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY,1
 21,Android.App.Admin.DevicePolicyManagerFlags,ManagedCanAccessParent,android/app/admin/DevicePolicyManager.FLAG_MANAGED_CAN_ACCESS_PARENT,2
 21,Android.App.Admin.DevicePolicyManagerFlags,ParentCanAccessManaged,android/app/admin/DevicePolicyManager.FLAG_PARENT_CAN_ACCESS_MANAGED,1
 23,Android.App.Admin.ResetPasswordFlags,DoNotAskCredentialsOnBoot,android/app/admin/DevicePolicyManager.RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT,2
-8,Android.App.Admin.ResetPasswordFlags,RequireEntry,android/app/admin/DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY,1
+10,Android.App.Admin.ResetPasswordFlags,RequireEntry,android/app/admin/DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY,1
 0,Android.App.Admin.WipeDataFlags,None,,0
-9,Android.App.Admin.WipeDataFlags,WipeExternalStorage,android/app/admin/DevicePolicyManager.WIPE_EXTERNAL_STORAGE,1
+10,Android.App.Admin.WipeDataFlags,WipeExternalStorage,android/app/admin/DevicePolicyManager.WIPE_EXTERNAL_STORAGE,1
 22,Android.App.Admin.WipeDataFlags,WipeResetProtectionData,android/app/admin/DevicePolicyManager.WIPE_RESET_PROTECTION_DATA,2
-14,Android.App.Backup.BackupFileType,Directory,android/app/backup/BackupAgent.TYPE_DIRECTORY,2
-14,Android.App.Backup.BackupFileType,File,android/app/backup/BackupAgent.TYPE_FILE,1
+15,Android.App.Backup.BackupFileType,Directory,android/app/backup/BackupAgent.TYPE_DIRECTORY,2
+15,Android.App.Backup.BackupFileType,File,android/app/backup/BackupAgent.TYPE_FILE,1
 17,Android.Appwidget.AppWidgetCategory,HomeScreen,android/appwidget/AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN,1
 17,Android.Appwidget.AppWidgetCategory,Keyguard,android/appwidget/AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD,2
 21,Android.Appwidget.AppWidgetCategory,Searchbox,android/appwidget/AppWidgetProviderInfo.WIDGET_CATEGORY_SEARCHBOX,4
-11,Android.Bluetooth.A2dpState,NotPlaying,android/bluetooth/BluetoothA2dp.STATE_NOT_PLAYING,11
-11,Android.Bluetooth.A2dpState,Playing,android/bluetooth/BluetoothA2dp.STATE_PLAYING,10
-5,Android.Bluetooth.DeviceClass,AudioVideoCamcorder,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_CAMCORDER,1076
-5,Android.Bluetooth.DeviceClass,AudioVideoCarAudio,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO,1056
-5,Android.Bluetooth.DeviceClass,AudioVideoHandsfree,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE,1032
-5,Android.Bluetooth.DeviceClass,AudioVideoHeadphones,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_HEADPHONES,1048
-5,Android.Bluetooth.DeviceClass,AudioVideoHifiAudio,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_HIFI_AUDIO,1064
-5,Android.Bluetooth.DeviceClass,AudioVideoLoudspeaker,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_LOUDSPEAKER,1044
-5,Android.Bluetooth.DeviceClass,AudioVideoMicrophone,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_MICROPHONE,1040
-5,Android.Bluetooth.DeviceClass,AudioVideoPortableAudio,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_PORTABLE_AUDIO,1052
-5,Android.Bluetooth.DeviceClass,AudioVideoSetTopBox,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_SET_TOP_BOX,1060
-5,Android.Bluetooth.DeviceClass,AudioVideoUncategorized,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_UNCATEGORIZED,1024
-5,Android.Bluetooth.DeviceClass,AudioVideoVcr,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VCR,1068
-5,Android.Bluetooth.DeviceClass,AudioVideoVideoCamera,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_CAMERA,1072
-5,Android.Bluetooth.DeviceClass,AudioVideoVideoConferencing,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_CONFERENCING,1088
-5,Android.Bluetooth.DeviceClass,AudioVideoVideoDisplayAndLoudspeaker,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_DISPLAY_AND_LOUDSPEAKER,1084
-5,Android.Bluetooth.DeviceClass,AudioVideoVideoGamingToy,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_GAMING_TOY,1096
-5,Android.Bluetooth.DeviceClass,AudioVideoVideoMonitor,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_MONITOR,1080
-5,Android.Bluetooth.DeviceClass,AudioVideoWearableHeadset,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET,1028
-5,Android.Bluetooth.DeviceClass,ComputerDesktop,android/bluetooth/BluetoothClass.Device.COMPUTER_DESKTOP,260
-5,Android.Bluetooth.DeviceClass,ComputerHandheldPcPda,android/bluetooth/BluetoothClass.Device.COMPUTER_HANDHELD_PC_PDA,272
-5,Android.Bluetooth.DeviceClass,ComputerLaptop,android/bluetooth/BluetoothClass.Device.COMPUTER_LAPTOP,268
-5,Android.Bluetooth.DeviceClass,ComputerPalmSizePcPda,android/bluetooth/BluetoothClass.Device.COMPUTER_PALM_SIZE_PC_PDA,276
-5,Android.Bluetooth.DeviceClass,ComputerServer,android/bluetooth/BluetoothClass.Device.COMPUTER_SERVER,264
-5,Android.Bluetooth.DeviceClass,ComputerUncategorized,android/bluetooth/BluetoothClass.Device.COMPUTER_UNCATEGORIZED,256
-5,Android.Bluetooth.DeviceClass,ComputerWearable,android/bluetooth/BluetoothClass.Device.COMPUTER_WEARABLE,280
-5,Android.Bluetooth.DeviceClass,HealthBloodPressure,android/bluetooth/BluetoothClass.Device.HEALTH_BLOOD_PRESSURE,2308
-5,Android.Bluetooth.DeviceClass,HealthDataDisplay,android/bluetooth/BluetoothClass.Device.HEALTH_DATA_DISPLAY,2332
-5,Android.Bluetooth.DeviceClass,HealthGlucose,android/bluetooth/BluetoothClass.Device.HEALTH_GLUCOSE,2320
-5,Android.Bluetooth.DeviceClass,HealthPulseOximeter,android/bluetooth/BluetoothClass.Device.HEALTH_PULSE_OXIMETER,2324
-5,Android.Bluetooth.DeviceClass,HealthPulseRate,android/bluetooth/BluetoothClass.Device.HEALTH_PULSE_RATE,2328
-5,Android.Bluetooth.DeviceClass,HealthThermometer,android/bluetooth/BluetoothClass.Device.HEALTH_THERMOMETER,2312
-5,Android.Bluetooth.DeviceClass,HealthUncategorized,android/bluetooth/BluetoothClass.Device.HEALTH_UNCATEGORIZED,2304
-5,Android.Bluetooth.DeviceClass,HealthWeighing,android/bluetooth/BluetoothClass.Device.HEALTH_WEIGHING,2316
-5,Android.Bluetooth.DeviceClass,PhoneCellular,android/bluetooth/BluetoothClass.Device.PHONE_CELLULAR,516
-5,Android.Bluetooth.DeviceClass,PhoneCordless,android/bluetooth/BluetoothClass.Device.PHONE_CORDLESS,520
-5,Android.Bluetooth.DeviceClass,PhoneIsdn,android/bluetooth/BluetoothClass.Device.PHONE_ISDN,532
-5,Android.Bluetooth.DeviceClass,PhoneModemOrGateway,android/bluetooth/BluetoothClass.Device.PHONE_MODEM_OR_GATEWAY,528
-5,Android.Bluetooth.DeviceClass,PhoneSmart,android/bluetooth/BluetoothClass.Device.PHONE_SMART,524
-5,Android.Bluetooth.DeviceClass,PhoneUncategorized,android/bluetooth/BluetoothClass.Device.PHONE_UNCATEGORIZED,512
-5,Android.Bluetooth.DeviceClass,ToyController,android/bluetooth/BluetoothClass.Device.TOY_CONTROLLER,2064
-5,Android.Bluetooth.DeviceClass,ToyDollActionFigure,android/bluetooth/BluetoothClass.Device.TOY_DOLL_ACTION_FIGURE,2060
-5,Android.Bluetooth.DeviceClass,ToyGame,android/bluetooth/BluetoothClass.Device.TOY_GAME,2068
-5,Android.Bluetooth.DeviceClass,ToyRobot,android/bluetooth/BluetoothClass.Device.TOY_ROBOT,2052
-5,Android.Bluetooth.DeviceClass,ToyUncategorized,android/bluetooth/BluetoothClass.Device.TOY_UNCATEGORIZED,2048
-5,Android.Bluetooth.DeviceClass,ToyVehicle,android/bluetooth/BluetoothClass.Device.TOY_VEHICLE,2056
-5,Android.Bluetooth.DeviceClass,WearableGlasses,android/bluetooth/BluetoothClass.Device.WEARABLE_GLASSES,1812
-5,Android.Bluetooth.DeviceClass,WearableHelmet,android/bluetooth/BluetoothClass.Device.WEARABLE_HELMET,1808
-5,Android.Bluetooth.DeviceClass,WearableJacket,android/bluetooth/BluetoothClass.Device.WEARABLE_JACKET,1804
-5,Android.Bluetooth.DeviceClass,WearablePager,android/bluetooth/BluetoothClass.Device.WEARABLE_PAGER,1800
-5,Android.Bluetooth.DeviceClass,WearableUncategorized,android/bluetooth/BluetoothClass.Device.WEARABLE_UNCATEGORIZED,1792
-5,Android.Bluetooth.DeviceClass,WearableWristWatch,android/bluetooth/BluetoothClass.Device.WEARABLE_WRIST_WATCH,1796
+15,Android.Bluetooth.A2dpState,NotPlaying,android/bluetooth/BluetoothA2dp.STATE_NOT_PLAYING,11
+15,Android.Bluetooth.A2dpState,Playing,android/bluetooth/BluetoothA2dp.STATE_PLAYING,10
+10,Android.Bluetooth.DeviceClass,AudioVideoCamcorder,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_CAMCORDER,1076
+10,Android.Bluetooth.DeviceClass,AudioVideoCarAudio,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO,1056
+10,Android.Bluetooth.DeviceClass,AudioVideoHandsfree,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE,1032
+10,Android.Bluetooth.DeviceClass,AudioVideoHeadphones,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_HEADPHONES,1048
+10,Android.Bluetooth.DeviceClass,AudioVideoHifiAudio,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_HIFI_AUDIO,1064
+10,Android.Bluetooth.DeviceClass,AudioVideoLoudspeaker,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_LOUDSPEAKER,1044
+10,Android.Bluetooth.DeviceClass,AudioVideoMicrophone,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_MICROPHONE,1040
+10,Android.Bluetooth.DeviceClass,AudioVideoPortableAudio,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_PORTABLE_AUDIO,1052
+10,Android.Bluetooth.DeviceClass,AudioVideoSetTopBox,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_SET_TOP_BOX,1060
+10,Android.Bluetooth.DeviceClass,AudioVideoUncategorized,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_UNCATEGORIZED,1024
+10,Android.Bluetooth.DeviceClass,AudioVideoVcr,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VCR,1068
+10,Android.Bluetooth.DeviceClass,AudioVideoVideoCamera,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_CAMERA,1072
+10,Android.Bluetooth.DeviceClass,AudioVideoVideoConferencing,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_CONFERENCING,1088
+10,Android.Bluetooth.DeviceClass,AudioVideoVideoDisplayAndLoudspeaker,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_DISPLAY_AND_LOUDSPEAKER,1084
+10,Android.Bluetooth.DeviceClass,AudioVideoVideoGamingToy,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_GAMING_TOY,1096
+10,Android.Bluetooth.DeviceClass,AudioVideoVideoMonitor,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_VIDEO_MONITOR,1080
+10,Android.Bluetooth.DeviceClass,AudioVideoWearableHeadset,android/bluetooth/BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET,1028
+10,Android.Bluetooth.DeviceClass,ComputerDesktop,android/bluetooth/BluetoothClass.Device.COMPUTER_DESKTOP,260
+10,Android.Bluetooth.DeviceClass,ComputerHandheldPcPda,android/bluetooth/BluetoothClass.Device.COMPUTER_HANDHELD_PC_PDA,272
+10,Android.Bluetooth.DeviceClass,ComputerLaptop,android/bluetooth/BluetoothClass.Device.COMPUTER_LAPTOP,268
+10,Android.Bluetooth.DeviceClass,ComputerPalmSizePcPda,android/bluetooth/BluetoothClass.Device.COMPUTER_PALM_SIZE_PC_PDA,276
+10,Android.Bluetooth.DeviceClass,ComputerServer,android/bluetooth/BluetoothClass.Device.COMPUTER_SERVER,264
+10,Android.Bluetooth.DeviceClass,ComputerUncategorized,android/bluetooth/BluetoothClass.Device.COMPUTER_UNCATEGORIZED,256
+10,Android.Bluetooth.DeviceClass,ComputerWearable,android/bluetooth/BluetoothClass.Device.COMPUTER_WEARABLE,280
+10,Android.Bluetooth.DeviceClass,HealthBloodPressure,android/bluetooth/BluetoothClass.Device.HEALTH_BLOOD_PRESSURE,2308
+10,Android.Bluetooth.DeviceClass,HealthDataDisplay,android/bluetooth/BluetoothClass.Device.HEALTH_DATA_DISPLAY,2332
+10,Android.Bluetooth.DeviceClass,HealthGlucose,android/bluetooth/BluetoothClass.Device.HEALTH_GLUCOSE,2320
+10,Android.Bluetooth.DeviceClass,HealthPulseOximeter,android/bluetooth/BluetoothClass.Device.HEALTH_PULSE_OXIMETER,2324
+10,Android.Bluetooth.DeviceClass,HealthPulseRate,android/bluetooth/BluetoothClass.Device.HEALTH_PULSE_RATE,2328
+10,Android.Bluetooth.DeviceClass,HealthThermometer,android/bluetooth/BluetoothClass.Device.HEALTH_THERMOMETER,2312
+10,Android.Bluetooth.DeviceClass,HealthUncategorized,android/bluetooth/BluetoothClass.Device.HEALTH_UNCATEGORIZED,2304
+10,Android.Bluetooth.DeviceClass,HealthWeighing,android/bluetooth/BluetoothClass.Device.HEALTH_WEIGHING,2316
+10,Android.Bluetooth.DeviceClass,PhoneCellular,android/bluetooth/BluetoothClass.Device.PHONE_CELLULAR,516
+10,Android.Bluetooth.DeviceClass,PhoneCordless,android/bluetooth/BluetoothClass.Device.PHONE_CORDLESS,520
+10,Android.Bluetooth.DeviceClass,PhoneIsdn,android/bluetooth/BluetoothClass.Device.PHONE_ISDN,532
+10,Android.Bluetooth.DeviceClass,PhoneModemOrGateway,android/bluetooth/BluetoothClass.Device.PHONE_MODEM_OR_GATEWAY,528
+10,Android.Bluetooth.DeviceClass,PhoneSmart,android/bluetooth/BluetoothClass.Device.PHONE_SMART,524
+10,Android.Bluetooth.DeviceClass,PhoneUncategorized,android/bluetooth/BluetoothClass.Device.PHONE_UNCATEGORIZED,512
+10,Android.Bluetooth.DeviceClass,ToyController,android/bluetooth/BluetoothClass.Device.TOY_CONTROLLER,2064
+10,Android.Bluetooth.DeviceClass,ToyDollActionFigure,android/bluetooth/BluetoothClass.Device.TOY_DOLL_ACTION_FIGURE,2060
+10,Android.Bluetooth.DeviceClass,ToyGame,android/bluetooth/BluetoothClass.Device.TOY_GAME,2068
+10,Android.Bluetooth.DeviceClass,ToyRobot,android/bluetooth/BluetoothClass.Device.TOY_ROBOT,2052
+10,Android.Bluetooth.DeviceClass,ToyUncategorized,android/bluetooth/BluetoothClass.Device.TOY_UNCATEGORIZED,2048
+10,Android.Bluetooth.DeviceClass,ToyVehicle,android/bluetooth/BluetoothClass.Device.TOY_VEHICLE,2056
+10,Android.Bluetooth.DeviceClass,WearableGlasses,android/bluetooth/BluetoothClass.Device.WEARABLE_GLASSES,1812
+10,Android.Bluetooth.DeviceClass,WearableHelmet,android/bluetooth/BluetoothClass.Device.WEARABLE_HELMET,1808
+10,Android.Bluetooth.DeviceClass,WearableJacket,android/bluetooth/BluetoothClass.Device.WEARABLE_JACKET,1804
+10,Android.Bluetooth.DeviceClass,WearablePager,android/bluetooth/BluetoothClass.Device.WEARABLE_PAGER,1800
+10,Android.Bluetooth.DeviceClass,WearableUncategorized,android/bluetooth/BluetoothClass.Device.WEARABLE_UNCATEGORIZED,1792
+10,Android.Bluetooth.DeviceClass,WearableWristWatch,android/bluetooth/BluetoothClass.Device.WEARABLE_WRIST_WATCH,1796
 18,Android.Bluetooth.BluetoothDeviceType,Classic,android/bluetooth/BluetoothDevice.DEVICE_TYPE_CLASSIC,1
 18,Android.Bluetooth.BluetoothDeviceType,Dual,android/bluetooth/BluetoothDevice.DEVICE_TYPE_DUAL,3
 18,Android.Bluetooth.BluetoothDeviceType,Le,android/bluetooth/BluetoothDevice.DEVICE_TYPE_LE,2
@@ -3736,77 +3720,77 @@
 18,Android.Bluetooth.GattDescriptorPermission,WriteSignedMitm,android/bluetooth/BluetoothGattDescriptor.PERMISSION_WRITE_SIGNED_MITM,256
 18,Android.Bluetooth.GattServiceType,Primary,android/bluetooth/BluetoothGattService.SERVICE_TYPE_PRIMARY,0
 18,Android.Bluetooth.GattServiceType,Secondary,android/bluetooth/BluetoothGattService.SERVICE_TYPE_SECONDARY,1
-11,Android.Bluetooth.AtCommand,TypeAction,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_ACTION,4
-11,Android.Bluetooth.AtCommand,TypeBasic,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_BASIC,3
-11,Android.Bluetooth.AtCommand,TypeRead,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_READ,0
-11,Android.Bluetooth.AtCommand,TypeSet,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_SET,2
-11,Android.Bluetooth.AtCommand,TypeTest,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_TEST,1
-11,Android.Bluetooth.HeadsetAudioState,AudioConnected,android/bluetooth/BluetoothHeadset.STATE_AUDIO_CONNECTED,12
-11,Android.Bluetooth.HeadsetAudioState,AudioConnecting,android/bluetooth/BluetoothHeadset.STATE_AUDIO_CONNECTING,11
-11,Android.Bluetooth.HeadsetAudioState,AudioDisconnected,android/bluetooth/BluetoothHeadset.STATE_AUDIO_DISCONNECTED,10
-14,Android.Bluetooth.HealthApplicationConfig,RegistrationFailure,android/bluetooth/BluetoothHealth.APP_CONFIG_REGISTRATION_FAILURE,1
-14,Android.Bluetooth.HealthApplicationConfig,RegistrationSuccess,android/bluetooth/BluetoothHealth.APP_CONFIG_REGISTRATION_SUCCESS,0
-14,Android.Bluetooth.HealthApplicationConfig,UnregistrationFailure,android/bluetooth/BluetoothHealth.APP_CONFIG_UNREGISTRATION_FAILURE,3
-14,Android.Bluetooth.HealthApplicationConfig,UnregistrationSuccess,android/bluetooth/BluetoothHealth.APP_CONFIG_UNREGISTRATION_SUCCESS,2
-14,Android.Bluetooth.HealthChannelType,Reliable,android/bluetooth/BluetoothHealth.CHANNEL_TYPE_RELIABLE,10
-14,Android.Bluetooth.HealthChannelType,Streaming,android/bluetooth/BluetoothHealth.CHANNEL_TYPE_STREAMING,11
-14,Android.Bluetooth.HealthState,ChannelConnected,android/bluetooth/BluetoothHealth.STATE_CHANNEL_CONNECTED,2
-14,Android.Bluetooth.HealthState,ChannelConnecting,android/bluetooth/BluetoothHealth.STATE_CHANNEL_CONNECTING,1
-14,Android.Bluetooth.HealthState,ChannelDisconnected,android/bluetooth/BluetoothHealth.STATE_CHANNEL_DISCONNECTED,0
-14,Android.Bluetooth.HealthState,ChannelDisconnecting,android/bluetooth/BluetoothHealth.STATE_CHANNEL_DISCONNECTING,3
-14,Android.Bluetooth.RoleType,SinkRole,android/bluetooth/BluetoothHealth.SINK_ROLE,2
-14,Android.Bluetooth.RoleType,SourceRole,android/bluetooth/BluetoothHealth.SOURCE_ROLE,1
-11,Android.Bluetooth.ProfileType,A2dp,I:android/bluetooth/BluetoothProfile.A2DP,2
+15,Android.Bluetooth.AtCommand,TypeAction,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_ACTION,4
+15,Android.Bluetooth.AtCommand,TypeBasic,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_BASIC,3
+15,Android.Bluetooth.AtCommand,TypeRead,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_READ,0
+15,Android.Bluetooth.AtCommand,TypeSet,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_SET,2
+15,Android.Bluetooth.AtCommand,TypeTest,android/bluetooth/BluetoothHeadset.AT_CMD_TYPE_TEST,1
+15,Android.Bluetooth.HeadsetAudioState,AudioConnected,android/bluetooth/BluetoothHeadset.STATE_AUDIO_CONNECTED,12
+15,Android.Bluetooth.HeadsetAudioState,AudioConnecting,android/bluetooth/BluetoothHeadset.STATE_AUDIO_CONNECTING,11
+15,Android.Bluetooth.HeadsetAudioState,AudioDisconnected,android/bluetooth/BluetoothHeadset.STATE_AUDIO_DISCONNECTED,10
+15,Android.Bluetooth.HealthApplicationConfig,RegistrationFailure,android/bluetooth/BluetoothHealth.APP_CONFIG_REGISTRATION_FAILURE,1
+15,Android.Bluetooth.HealthApplicationConfig,RegistrationSuccess,android/bluetooth/BluetoothHealth.APP_CONFIG_REGISTRATION_SUCCESS,0
+15,Android.Bluetooth.HealthApplicationConfig,UnregistrationFailure,android/bluetooth/BluetoothHealth.APP_CONFIG_UNREGISTRATION_FAILURE,3
+15,Android.Bluetooth.HealthApplicationConfig,UnregistrationSuccess,android/bluetooth/BluetoothHealth.APP_CONFIG_UNREGISTRATION_SUCCESS,2
+15,Android.Bluetooth.HealthChannelType,Reliable,android/bluetooth/BluetoothHealth.CHANNEL_TYPE_RELIABLE,10
+15,Android.Bluetooth.HealthChannelType,Streaming,android/bluetooth/BluetoothHealth.CHANNEL_TYPE_STREAMING,11
+15,Android.Bluetooth.HealthState,ChannelConnected,android/bluetooth/BluetoothHealth.STATE_CHANNEL_CONNECTED,2
+15,Android.Bluetooth.HealthState,ChannelConnecting,android/bluetooth/BluetoothHealth.STATE_CHANNEL_CONNECTING,1
+15,Android.Bluetooth.HealthState,ChannelDisconnected,android/bluetooth/BluetoothHealth.STATE_CHANNEL_DISCONNECTED,0
+15,Android.Bluetooth.HealthState,ChannelDisconnecting,android/bluetooth/BluetoothHealth.STATE_CHANNEL_DISCONNECTING,3
+15,Android.Bluetooth.RoleType,SinkRole,android/bluetooth/BluetoothHealth.SINK_ROLE,2
+15,Android.Bluetooth.RoleType,SourceRole,android/bluetooth/BluetoothHealth.SOURCE_ROLE,1
+15,Android.Bluetooth.ProfileType,A2dp,I:android/bluetooth/BluetoothProfile.A2DP,2
 18,Android.Bluetooth.ProfileType,Gatt,I:android/bluetooth/BluetoothProfile.GATT,7
 18,Android.Bluetooth.ProfileType,GattServer,I:android/bluetooth/BluetoothProfile.GATT_SERVER,8
-11,Android.Bluetooth.ProfileType,Headset,I:android/bluetooth/BluetoothProfile.HEADSET,1
-14,Android.Bluetooth.ProfileType,Health,I:android/bluetooth/BluetoothProfile.HEALTH,3
+15,Android.Bluetooth.ProfileType,Headset,I:android/bluetooth/BluetoothProfile.HEADSET,1
+15,Android.Bluetooth.ProfileType,Health,I:android/bluetooth/BluetoothProfile.HEALTH,3
 23,Android.Bluetooth.ProfileType,Sap,I:android/bluetooth/BluetoothProfile.SAP,10
-14,Android.Content.TrimMemory,Background,I:android/content/ComponentCallbacks2.TRIM_MEMORY_BACKGROUND,40
-14,Android.Content.TrimMemory,Complete,I:android/content/ComponentCallbacks2.TRIM_MEMORY_COMPLETE,80
-14,Android.Content.TrimMemory,Moderate,I:android/content/ComponentCallbacks2.TRIM_MEMORY_MODERATE,60
+15,Android.Content.TrimMemory,Background,I:android/content/ComponentCallbacks2.TRIM_MEMORY_BACKGROUND,40
+15,Android.Content.TrimMemory,Complete,I:android/content/ComponentCallbacks2.TRIM_MEMORY_COMPLETE,80
+15,Android.Content.TrimMemory,Moderate,I:android/content/ComponentCallbacks2.TRIM_MEMORY_MODERATE,60
 16,Android.Content.TrimMemory,RunningCritical,I:android/content/ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL,15
 16,Android.Content.TrimMemory,RunningLow,I:android/content/ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW,10
 16,Android.Content.TrimMemory,RunningModerate,I:android/content/ComponentCallbacks2.TRIM_MEMORY_RUNNING_MODERATE,5
-14,Android.Content.TrimMemory,UiHidden,I:android/content/ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN,20
-8,Android.Content.SyncObserverType,Active,android/content/ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE,4
-8,Android.Content.SyncObserverType,Pending,android/content/ContentResolver.SYNC_OBSERVER_TYPE_PENDING,2
-8,Android.Content.SyncObserverType,Settings,android/content/ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS,1
+15,Android.Content.TrimMemory,UiHidden,I:android/content/ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN,20
+10,Android.Content.SyncObserverType,Active,android/content/ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE,4
+10,Android.Content.SyncObserverType,Pending,android/content/ContentResolver.SYNC_OBSERVER_TYPE_PENDING,2
+10,Android.Content.SyncObserverType,Settings,android/content/ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS,1
 26,Android.Content.QuerySortDirection,Ascending,android/content/ContentResolver.QUERY_SORT_DIRECTION_ASCENDING,0
 26,Android.Content.QuerySortDirection,Descending,android/content/ContentResolver.QUERY_SORT_DIRECTION_DESCENDING,1
-1,Android.Content.DialogButtonTypeObsoleted,Button1,I:android/content/DialogInterface.BUTTON1,-1
-1,Android.Content.DialogButtonTypeObsoleted,Button2,I:android/content/DialogInterface.BUTTON2,-2
-1,Android.Content.DialogButtonTypeObsoleted,Button3,I:android/content/DialogInterface.BUTTON3,-3
-3,Android.Content.DialogButtonType,Negative,I:android/content/DialogInterface.BUTTON_NEGATIVE,-2
-3,Android.Content.DialogButtonType,Neutral,I:android/content/DialogInterface.BUTTON_NEUTRAL,-3
-3,Android.Content.DialogButtonType,Positive,I:android/content/DialogInterface.BUTTON_POSITIVE,-1
+10,Android.Content.DialogButtonTypeObsoleted,Button1,I:android/content/DialogInterface.BUTTON1,-1
+10,Android.Content.DialogButtonTypeObsoleted,Button2,I:android/content/DialogInterface.BUTTON2,-2
+10,Android.Content.DialogButtonTypeObsoleted,Button3,I:android/content/DialogInterface.BUTTON3,-3
+10,Android.Content.DialogButtonType,Negative,I:android/content/DialogInterface.BUTTON_NEGATIVE,-2
+10,Android.Content.DialogButtonType,Neutral,I:android/content/DialogInterface.BUTTON_NEUTRAL,-3
+10,Android.Content.DialogButtonType,Positive,I:android/content/DialogInterface.BUTTON_POSITIVE,-1
 0,Android.Content.IntentUriType,None,,0
-4,Android.Content.IntentUriType,Scheme,android/content/Intent.URI_INTENT_SCHEME,1
+10,Android.Content.IntentUriType,Scheme,android/content/Intent.URI_INTENT_SCHEME,1
 22,Android.Content.IntentUriType,AllowUnsafe,android/content/Intent.URI_ALLOW_UNSAFE,4
 22,Android.Content.IntentUriType,AndroidAppScheme,android/content/Intent.URI_ANDROID_APP_SCHEME,2
 0,Android.Content.IntentFilterPriority,None,,0
-1,Android.Content.IntentFilterPriority,HighPriority,android/content/IntentFilter.SYSTEM_HIGH_PRIORITY,1000
-1,Android.Content.IntentFilterPriority,LowPriority,android/content/IntentFilter.SYSTEM_LOW_PRIORITY,-1000
+10,Android.Content.IntentFilterPriority,HighPriority,android/content/IntentFilter.SYSTEM_HIGH_PRIORITY,1000
+10,Android.Content.IntentFilterPriority,LowPriority,android/content/IntentFilter.SYSTEM_LOW_PRIORITY,-1000
 0,Android.Content.PM.InputFeature,None,,0
-3,Android.Content.PM.InputFeature,FiveWayNav,android/content/pm/ConfigurationInfo.INPUT_FEATURE_FIVE_WAY_NAV,2
-3,Android.Content.PM.InputFeature,HardKeyboard,android/content/pm/ConfigurationInfo.INPUT_FEATURE_HARD_KEYBOARD,1
+10,Android.Content.PM.InputFeature,FiveWayNav,android/content/pm/ConfigurationInfo.INPUT_FEATURE_FIVE_WAY_NAV,2
+10,Android.Content.PM.InputFeature,HardKeyboard,android/content/pm/ConfigurationInfo.INPUT_FEATURE_HARD_KEYBOARD,1
 0,Android.Content.PM.FeatureFlags,None,,0
-5,Android.Content.PM.FeatureFlags,Required,android/content/pm/FeatureInfo.FLAG_REQUIRED,1
+10,Android.Content.PM.FeatureFlags,Required,android/content/pm/FeatureInfo.FLAG_REQUIRED,1
 26,Android.Content.PM.PinItemRequestType,Appwidget,android/content/pm/LauncherApps.PinItemRequest.REQUEST_TYPE_APPWIDGET,2
 26,Android.Content.PM.PinItemRequestType,Shortcut,android/content/pm/LauncherApps.PinItemRequest.REQUEST_TYPE_SHORTCUT,1
 0,Android.Content.PM.ComponentEnableOption,None,,0
-1,Android.Content.PM.ComponentEnableOption,DontKillApp,android/content/pm/PackageManager.DONT_KILL_APP,1
-14,Android.Content.PM.PackageInstallVerification,Allow,android/content/pm/PackageManager.VERIFICATION_ALLOW,1
-14,Android.Content.PM.PackageInstallVerification,Reject,android/content/pm/PackageManager.VERIFICATION_REJECT,-1
+10,Android.Content.PM.ComponentEnableOption,DontKillApp,android/content/pm/PackageManager.DONT_KILL_APP,1
+15,Android.Content.PM.PackageInstallVerification,Allow,android/content/pm/PackageManager.VERIFICATION_ALLOW,1
+15,Android.Content.PM.PackageInstallVerification,Reject,android/content/pm/PackageManager.VERIFICATION_REJECT,-1
 24,Android.Content.PM.ServiceInfoFlags,ExternalService,android/content/pm/ServiceInfo.FLAG_EXTERNAL_SERVICE,4
 16,Android.Content.PM.ServiceInfoFlags,IsolatedProcess,android/content/pm/ServiceInfo.FLAG_ISOLATED_PROCESS,2
 17,Android.Content.PM.ServiceInfoFlags,SingleUser,android/content/pm/ServiceInfo.FLAG_SINGLE_USER,1073741824
-14,Android.Content.PM.ServiceInfoFlags,StopWithTask,android/content/pm/ServiceInfo.FLAG_STOP_WITH_TASK,1
+15,Android.Content.PM.ServiceInfoFlags,StopWithTask,android/content/pm/ServiceInfo.FLAG_STOP_WITH_TASK,1
 26,Android.Content.PM.SharedLibraryType,Builtin,android/content/pm/SharedLibraryInfo.TYPE_BUILTIN,0
 26,Android.Content.PM.SharedLibraryType,Dynamic,android/content/pm/SharedLibraryInfo.TYPE_DYNAMIC,1
 26,Android.Content.PM.SharedLibraryType,Static,android/content/pm/SharedLibraryInfo.TYPE_STATIC,2
 0,Android.Content.Res.ObbFlags,None,,0
-9,Android.Content.Res.ObbFlags,Overlay,android/content/res/ObbInfo.OBB_OVERLAY,1
+10,Android.Content.Res.ObbFlags,Overlay,android/content/res/ObbInfo.OBB_OVERLAY,1
 26,Android.Content.Res.ColorMode,HdrMask,android/content/res/Configuration.COLOR_MODE_HDR_MASK,12
 26,Android.Content.Res.ColorMode,HdrNo,android/content/res/Configuration.COLOR_MODE_HDR_NO,4
 26,Android.Content.Res.ColorMode,HdrShift,android/content/res/Configuration.COLOR_MODE_HDR_SHIFT,2
@@ -3817,19 +3801,19 @@
 26,Android.Content.Res.ColorMode,WideColorGamutNo,android/content/res/Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_NO,1
 26,Android.Content.Res.ColorMode,WideColorGamutUndefined,android/content/res/Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_UNDEFINED,0
 26,Android.Content.Res.ColorMode,WideColorGamutYes,android/content/res/Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES,2
-13,Android.Content.Res.Screen,HeightDpUndefined,android/content/res/Configuration.SCREEN_HEIGHT_DP_UNDEFINED,0
-13,Android.Content.Res.Screen,WidthDpUndefined,android/content/res/Configuration.SCREEN_WIDTH_DP_UNDEFINED,0
-8,Android.Content.Res.UiMode,NightMask,android/content/res/Configuration.UI_MODE_NIGHT_MASK,48
-8,Android.Content.Res.UiMode,NightNo,android/content/res/Configuration.UI_MODE_NIGHT_NO,16
-8,Android.Content.Res.UiMode,NightUndefined,android/content/res/Configuration.UI_MODE_NIGHT_UNDEFINED,0
-8,Android.Content.Res.UiMode,NightYes,android/content/res/Configuration.UI_MODE_NIGHT_YES,32
+15,Android.Content.Res.Screen,HeightDpUndefined,android/content/res/Configuration.SCREEN_HEIGHT_DP_UNDEFINED,0
+15,Android.Content.Res.Screen,WidthDpUndefined,android/content/res/Configuration.SCREEN_WIDTH_DP_UNDEFINED,0
+10,Android.Content.Res.UiMode,NightMask,android/content/res/Configuration.UI_MODE_NIGHT_MASK,48
+10,Android.Content.Res.UiMode,NightNo,android/content/res/Configuration.UI_MODE_NIGHT_NO,16
+10,Android.Content.Res.UiMode,NightUndefined,android/content/res/Configuration.UI_MODE_NIGHT_UNDEFINED,0
+10,Android.Content.Res.UiMode,NightYes,android/content/res/Configuration.UI_MODE_NIGHT_YES,32
 16,Android.Content.Res.UiMode,TypeAppliance,android/content/res/Configuration.UI_MODE_TYPE_APPLIANCE,5
-8,Android.Content.Res.UiMode,TypeCar,android/content/res/Configuration.UI_MODE_TYPE_CAR,3
-8,Android.Content.Res.UiMode,TypeDesk,android/content/res/Configuration.UI_MODE_TYPE_DESK,2
-8,Android.Content.Res.UiMode,TypeMask,android/content/res/Configuration.UI_MODE_TYPE_MASK,15
-8,Android.Content.Res.UiMode,TypeNormal,android/content/res/Configuration.UI_MODE_TYPE_NORMAL,1
-13,Android.Content.Res.UiMode,TypeTelevision,android/content/res/Configuration.UI_MODE_TYPE_TELEVISION,4
-8,Android.Content.Res.UiMode,TypeUndefined,android/content/res/Configuration.UI_MODE_TYPE_UNDEFINED,0
+10,Android.Content.Res.UiMode,TypeCar,android/content/res/Configuration.UI_MODE_TYPE_CAR,3
+10,Android.Content.Res.UiMode,TypeDesk,android/content/res/Configuration.UI_MODE_TYPE_DESK,2
+10,Android.Content.Res.UiMode,TypeMask,android/content/res/Configuration.UI_MODE_TYPE_MASK,15
+10,Android.Content.Res.UiMode,TypeNormal,android/content/res/Configuration.UI_MODE_TYPE_NORMAL,1
+15,Android.Content.Res.UiMode,TypeTelevision,android/content/res/Configuration.UI_MODE_TYPE_TELEVISION,4
+10,Android.Content.Res.UiMode,TypeUndefined,android/content/res/Configuration.UI_MODE_TYPE_UNDEFINED,0
 26,Android.Content.Res.UiMode,TypeVrHeadset,android/content/res/Configuration.UI_MODE_TYPE_VR_HEADSET,7
 20,Android.Content.Res.UiMode,TypeWatch,android/content/res/Configuration.UI_MODE_TYPE_WATCH,6
 18,Android.Content.RestrictionEntryType,Boolean,android/content/RestrictionEntry.TYPE_BOOLEAN,1
@@ -3840,90 +3824,103 @@
 18,Android.Content.RestrictionEntryType,MultiSelect,android/content/RestrictionEntry.TYPE_MULTI_SELECT,4
 18,Android.Content.RestrictionEntryType,Null,android/content/RestrictionEntry.TYPE_NULL,0
 21,Android.Content.RestrictionEntryType,String,android/content/RestrictionEntry.TYPE_STRING,6
-8,Android.Database.Sqlite.Conflict,Abort,android/database/sqlite/SQLiteDatabase.CONFLICT_ABORT,2
-8,Android.Database.Sqlite.Conflict,Fail,android/database/sqlite/SQLiteDatabase.CONFLICT_FAIL,3
-8,Android.Database.Sqlite.Conflict,Ignore,android/database/sqlite/SQLiteDatabase.CONFLICT_IGNORE,4
-8,Android.Database.Sqlite.Conflict,None,android/database/sqlite/SQLiteDatabase.CONFLICT_NONE,0
-8,Android.Database.Sqlite.Conflict,Replace,android/database/sqlite/SQLiteDatabase.CONFLICT_REPLACE,5
-8,Android.Database.Sqlite.Conflict,Rollback,android/database/sqlite/SQLiteDatabase.CONFLICT_ROLLBACK,1
-12,Android.Drm.DrmErrorEventType,AcquireDrmInfoFailed,android/drm/DrmErrorEvent.TYPE_ACQUIRE_DRM_INFO_FAILED,2008
-11,Android.Drm.DrmErrorEventType,NotSupported,android/drm/DrmErrorEvent.TYPE_NOT_SUPPORTED,2003
-11,Android.Drm.DrmErrorEventType,NoInternetConnection,android/drm/DrmErrorEvent.TYPE_NO_INTERNET_CONNECTION,2005
-11,Android.Drm.DrmErrorEventType,OutOfMemory,android/drm/DrmErrorEvent.TYPE_OUT_OF_MEMORY,2004
-11,Android.Drm.DrmErrorEventType,ProcessDrmInfoFailed,android/drm/DrmErrorEvent.TYPE_PROCESS_DRM_INFO_FAILED,2006
-11,Android.Drm.DrmErrorEventType,RemoveAllRightsFailed,android/drm/DrmErrorEvent.TYPE_REMOVE_ALL_RIGHTS_FAILED,2007
-11,Android.Drm.DrmErrorEventType,RightsNotInstalled,android/drm/DrmErrorEvent.TYPE_RIGHTS_NOT_INSTALLED,2001
-11,Android.Drm.DrmErrorEventType,RightsRenewalNotAllowed,android/drm/DrmErrorEvent.TYPE_RIGHTS_RENEWAL_NOT_ALLOWED,2002
-11,Android.Drm.DrmEventType,AllRightsRemoved,android/drm/DrmEvent.TYPE_ALL_RIGHTS_REMOVED,1001
-11,Android.Drm.DrmEventType,DrmInfoProcessed,android/drm/DrmEvent.TYPE_DRM_INFO_PROCESSED,1002
-11,Android.Drm.DrmInfoEventType,AccountAlreadyRegistered,android/drm/DrmInfoEvent.TYPE_ACCOUNT_ALREADY_REGISTERED,5
-11,Android.Drm.DrmInfoEventType,AlreadyRegisteredByAnotherAccount,android/drm/DrmInfoEvent.TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT,1
-11,Android.Drm.DrmInfoEventType,RemoveRights,android/drm/DrmInfoEvent.TYPE_REMOVE_RIGHTS,2
-11,Android.Drm.DrmInfoEventType,RightsInstalled,android/drm/DrmInfoEvent.TYPE_RIGHTS_INSTALLED,3
-12,Android.Drm.DrmInfoEventType,RightsRemoved,android/drm/DrmInfoEvent.TYPE_RIGHTS_REMOVED,6
-11,Android.Drm.DrmInfoEventType,WaitForRights,android/drm/DrmInfoEvent.TYPE_WAIT_FOR_RIGHTS,4
-1,Android.Graphics.Drawables.ClipDrawableOrientation,Horizontal,android/graphics/drawable/ClipDrawable.HORIZONTAL,1
-1,Android.Graphics.Drawables.ClipDrawableOrientation,Vertical,android/graphics/drawable/ClipDrawable.VERTICAL,2
+10,Android.Database.Sqlite.Conflict,Abort,android/database/sqlite/SQLiteDatabase.CONFLICT_ABORT,2
+10,Android.Database.Sqlite.Conflict,Fail,android/database/sqlite/SQLiteDatabase.CONFLICT_FAIL,3
+10,Android.Database.Sqlite.Conflict,Ignore,android/database/sqlite/SQLiteDatabase.CONFLICT_IGNORE,4
+10,Android.Database.Sqlite.Conflict,None,android/database/sqlite/SQLiteDatabase.CONFLICT_NONE,0
+10,Android.Database.Sqlite.Conflict,Replace,android/database/sqlite/SQLiteDatabase.CONFLICT_REPLACE,5
+10,Android.Database.Sqlite.Conflict,Rollback,android/database/sqlite/SQLiteDatabase.CONFLICT_ROLLBACK,1
+15,Android.Drm.DrmErrorEventType,AcquireDrmInfoFailed,android/drm/DrmErrorEvent.TYPE_ACQUIRE_DRM_INFO_FAILED,2008
+15,Android.Drm.DrmErrorEventType,NoInternetConnection,android/drm/DrmErrorEvent.TYPE_NO_INTERNET_CONNECTION,2005
+15,Android.Drm.DrmErrorEventType,NotSupported,android/drm/DrmErrorEvent.TYPE_NOT_SUPPORTED,2003
+15,Android.Drm.DrmErrorEventType,OutOfMemory,android/drm/DrmErrorEvent.TYPE_OUT_OF_MEMORY,2004
+15,Android.Drm.DrmErrorEventType,ProcessDrmInfoFailed,android/drm/DrmErrorEvent.TYPE_PROCESS_DRM_INFO_FAILED,2006
+15,Android.Drm.DrmErrorEventType,RemoveAllRightsFailed,android/drm/DrmErrorEvent.TYPE_REMOVE_ALL_RIGHTS_FAILED,2007
+15,Android.Drm.DrmErrorEventType,RightsNotInstalled,android/drm/DrmErrorEvent.TYPE_RIGHTS_NOT_INSTALLED,2001
+15,Android.Drm.DrmErrorEventType,RightsRenewalNotAllowed,android/drm/DrmErrorEvent.TYPE_RIGHTS_RENEWAL_NOT_ALLOWED,2002
+15,Android.Drm.DrmEventType,AllRightsRemoved,android/drm/DrmEvent.TYPE_ALL_RIGHTS_REMOVED,1001
+15,Android.Drm.DrmEventType,DrmInfoProcessed,android/drm/DrmEvent.TYPE_DRM_INFO_PROCESSED,1002
+15,Android.Drm.DrmInfoEventType,AccountAlreadyRegistered,android/drm/DrmInfoEvent.TYPE_ACCOUNT_ALREADY_REGISTERED,5
+15,Android.Drm.DrmInfoEventType,AlreadyRegisteredByAnotherAccount,android/drm/DrmInfoEvent.TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT,1
+15,Android.Drm.DrmInfoEventType,RemoveRights,android/drm/DrmInfoEvent.TYPE_REMOVE_RIGHTS,2
+15,Android.Drm.DrmInfoEventType,RightsInstalled,android/drm/DrmInfoEvent.TYPE_RIGHTS_INSTALLED,3
+15,Android.Drm.DrmInfoEventType,RightsRemoved,android/drm/DrmInfoEvent.TYPE_RIGHTS_REMOVED,6
+15,Android.Drm.DrmInfoEventType,WaitForRights,android/drm/DrmInfoEvent.TYPE_WAIT_FOR_RIGHTS,4
+10,Android.Graphics.Drawables.ClipDrawableOrientation,Horizontal,android/graphics/drawable/ClipDrawable.HORIZONTAL,1
+10,Android.Graphics.Drawables.ClipDrawableOrientation,Vertical,android/graphics/drawable/ClipDrawable.VERTICAL,2
 21,Android.Graphics.Drawables.LayerDrawablePaddingMode,Nest,android/graphics/drawable/LayerDrawable.PADDING_MODE_NEST,0
 21,Android.Graphics.Drawables.LayerDrawablePaddingMode,Stack,android/graphics/drawable/LayerDrawable.PADDING_MODE_STACK,1
-23,Android.Graphics.ImageFormatType,Depth16,android/graphics/ImageFormat.DEPTH16,1144402265
 23,Android.Graphics.ImageFormatType,DepthPointCloud,android/graphics/ImageFormat.DEPTH_POINT_CLOUD,257
-23,Android.Graphics.ImageFormatType,FlexRgba8888,android/graphics/ImageFormat.FLEX_RGBA_8888,42
+23,Android.Graphics.ImageFormatType,Depth16,android/graphics/ImageFormat.DEPTH16,1144402265
 23,Android.Graphics.ImageFormatType,FlexRgb888,android/graphics/ImageFormat.FLEX_RGB_888,41
-8,Android.Graphics.ImageFormatType,Jpeg,android/graphics/ImageFormat.JPEG,256
-8,Android.Graphics.ImageFormatType,Nv16,android/graphics/ImageFormat.NV16,16
-8,Android.Graphics.ImageFormatType,Nv21,android/graphics/ImageFormat.NV21,17
+23,Android.Graphics.ImageFormatType,FlexRgba8888,android/graphics/ImageFormat.FLEX_RGBA_8888,42
+10,Android.Graphics.ImageFormatType,Jpeg,android/graphics/ImageFormat.JPEG,256
+10,Android.Graphics.ImageFormatType,Nv16,android/graphics/ImageFormat.NV16,16
+10,Android.Graphics.ImageFormatType,Nv21,android/graphics/ImageFormat.NV21,17
 23,Android.Graphics.ImageFormatType,Private,android/graphics/ImageFormat.PRIVATE,34
-21,Android.Graphics.ImageFormatType,Raw10,android/graphics/ImageFormat.RAW10,37
-23,Android.Graphics.ImageFormatType,Raw12,android/graphics/ImageFormat.RAW12,38
 24,Android.Graphics.ImageFormatType,RawPrivate,android/graphics/ImageFormat.RAW_PRIVATE,36
 21,Android.Graphics.ImageFormatType,RawSensor,android/graphics/ImageFormat.RAW_SENSOR,32
-8,Android.Graphics.ImageFormatType,Rgb565,android/graphics/ImageFormat.RGB_565,4
-8,Android.Graphics.ImageFormatType,Unknown,android/graphics/ImageFormat.UNKNOWN,0
+21,Android.Graphics.ImageFormatType,Raw10,android/graphics/ImageFormat.RAW10,37
+23,Android.Graphics.ImageFormatType,Raw12,android/graphics/ImageFormat.RAW12,38
+10,Android.Graphics.ImageFormatType,Rgb565,android/graphics/ImageFormat.RGB_565,4
+10,Android.Graphics.ImageFormatType,Unknown,android/graphics/ImageFormat.UNKNOWN,0
 19,Android.Graphics.ImageFormatType,Yuv420888,android/graphics/ImageFormat.YUV_420_888,35
 23,Android.Graphics.ImageFormatType,Yuv422888,android/graphics/ImageFormat.YUV_422_888,39
 23,Android.Graphics.ImageFormatType,Yuv444888,android/graphics/ImageFormat.YUV_444_888,40
-8,Android.Graphics.ImageFormatType,Yuy2,android/graphics/ImageFormat.YUY2,20
-9,Android.Graphics.ImageFormatType,Yv12,android/graphics/ImageFormat.YV12,842094169
-14,Android.Graphics.PaintHinting,Off,android/graphics/Paint.HINTING_OFF,0
-14,Android.Graphics.PaintHinting,On,android/graphics/Paint.HINTING_ON,1
+10,Android.Graphics.ImageFormatType,Yuy2,android/graphics/ImageFormat.YUY2,20
+10,Android.Graphics.ImageFormatType,Yv12,android/graphics/ImageFormat.YV12,842094169
+15,Android.Graphics.PaintHinting,Off,android/graphics/Paint.HINTING_OFF,0
+15,Android.Graphics.PaintHinting,On,android/graphics/Paint.HINTING_ON,1
 21,Android.Graphics.Pdf.PdfRenderMode,ForDisplay,android/graphics/pdf/PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY,1
 21,Android.Graphics.Pdf.PdfRenderMode,ForPrint,android/graphics/pdf/PdfRenderer.Page.RENDER_MODE_FOR_PRINT,2
-9,Android.Hardware.CameraFacing,Back,android/hardware/Camera$CameraInfo.CAMERA_FACING_BACK,0
-9,Android.Hardware.CameraFacing,Front,android/hardware/Camera$CameraInfo.CAMERA_FACING_FRONT,1
-9,Android.Hardware.FocusDistance,FarIndex,android/hardware/Camera$Parameters.FOCUS_DISTANCE_FAR_INDEX,2
-9,Android.Hardware.FocusDistance,NearIndex,android/hardware/Camera$Parameters.FOCUS_DISTANCE_NEAR_INDEX,0
-9,Android.Hardware.FocusDistance,OptimalIndex,android/hardware/Camera$Parameters.FOCUS_DISTANCE_OPTIMAL_INDEX,1
-9,Android.Hardware.Preview,FpsMaxIndex,android/hardware/Camera$Parameters.PREVIEW_FPS_MAX_INDEX,1
-9,Android.Hardware.Preview,FpsMinIndex,android/hardware/Camera$Parameters.PREVIEW_FPS_MIN_INDEX,0
+10,Android.Hardware.CameraFacing,Back,android/hardware/Camera$CameraInfo.CAMERA_FACING_BACK,0
+10,Android.Hardware.CameraFacing,Front,android/hardware/Camera$CameraInfo.CAMERA_FACING_FRONT,1
+10,Android.Hardware.FocusDistance,FarIndex,android/hardware/Camera$Parameters.FOCUS_DISTANCE_FAR_INDEX,2
+10,Android.Hardware.FocusDistance,NearIndex,android/hardware/Camera$Parameters.FOCUS_DISTANCE_NEAR_INDEX,0
+10,Android.Hardware.FocusDistance,OptimalIndex,android/hardware/Camera$Parameters.FOCUS_DISTANCE_OPTIMAL_INDEX,1
+10,Android.Hardware.Preview,FpsMaxIndex,android/hardware/Camera$Parameters.PREVIEW_FPS_MAX_INDEX,1
+10,Android.Hardware.Preview,FpsMinIndex,android/hardware/Camera$Parameters.PREVIEW_FPS_MIN_INDEX,0
 21,Android.Hardware.Display.VirtualDisplayFlags,AutoMirror,android/hardware/display/DisplayManager.VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR,16
 20,Android.Hardware.Display.VirtualDisplayFlags,OwnContentOnly,android/hardware/display/DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY,8
 19,Android.Hardware.Display.VirtualDisplayFlags,Presentation,android/hardware/display/DisplayManager.VIRTUAL_DISPLAY_FLAG_PRESENTATION,2
 19,Android.Hardware.Display.VirtualDisplayFlags,Public,android/hardware/display/DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC,1
 19,Android.Hardware.Display.VirtualDisplayFlags,Secure,android/hardware/display/DisplayManager.VIRTUAL_DISPLAY_FLAG_SECURE,4
+18,Android.Hardware.Location.GeofenceTransition,Entered,android/hardware/location/GeofenceHardware.GEOFENCE_ENTERED,1
+18,Android.Hardware.Location.GeofenceTransition,Exited,android/hardware/location/GeofenceHardware.GEOFENCE_EXITED,2
+18,Android.Hardware.Location.GeofenceTransition,Failure,android/hardware/location/GeofenceHardware.GEOFENCE_FAILURE,5
+18,Android.Hardware.Location.GeofenceTransition,Success,android/hardware/location/GeofenceHardware.GEOFENCE_SUCCESS,0
+18,Android.Hardware.Location.GeofenceTransition,Uncertain,android/hardware/location/GeofenceHardware.GEOFENCE_UNCERTAIN,4
+18,Android.Hardware.Location.GeofenceError,IdExists,android/hardware/location/GeofenceHardware.GEOFENCE_ERROR_ID_EXISTS,2
+18,Android.Hardware.Location.GeofenceError,IdUnknown,android/hardware/location/GeofenceHardware.GEOFENCE_ERROR_ID_UNKNOWN,3
+18,Android.Hardware.Location.GeofenceError,InvalidTransition,android/hardware/location/GeofenceHardware.GEOFENCE_ERROR_INVALID_TRANSITION,4
+18,Android.Hardware.Location.GeofenceError,TooManyGeofences,android/hardware/location/GeofenceHardware.GEOFENCE_ERROR_TOO_MANY_GEOFENCES,1
+18,Android.Hardware.Location.GeofenceMonitoringType,GpsHardware,android/hardware/location/GeofenceHardware.MONITORING_TYPE_GPS_HARDWARE,0
+18,Android.Hardware.Location.GeofenceMonitorStatus,CurrentlyAvailable,android/hardware/location/GeofenceHardware.MONITOR_CURRENTLY_AVAILABLE,0
+18,Android.Hardware.Location.GeofenceMonitorStatus,CurrentlyUnavailable,android/hardware/location/GeofenceHardware.MONITOR_CURRENTLY_UNAVAILABLE,1
+18,Android.Hardware.Location.GeofenceMonitorStatus,Unsupported,android/hardware/location/GeofenceHardware.MONITOR_UNSUPPORTED,2
 26,Android.Media.AudioFocusRequest,Delayed,android/media/AudioManager.AUDIOFOCUS_REQUEST_DELAYED,2
-8,Android.Media.AudioFocusRequest,Failed,android/media/AudioManager.AUDIOFOCUS_REQUEST_FAILED,0
-8,Android.Media.AudioFocusRequest,Granted,android/media/AudioManager.AUDIOFOCUS_REQUEST_GRANTED,1
-8,Android.Media.AudioFocus,Gain,android/media/AudioManager.AUDIOFOCUS_GAIN,1
-8,Android.Media.AudioFocus,GainTransient,android/media/AudioManager.AUDIOFOCUS_GAIN_TRANSIENT,2
+10,Android.Media.AudioFocusRequest,Failed,android/media/AudioManager.AUDIOFOCUS_REQUEST_FAILED,0
+10,Android.Media.AudioFocusRequest,Granted,android/media/AudioManager.AUDIOFOCUS_REQUEST_GRANTED,1
+10,Android.Media.AudioFocus,Gain,android/media/AudioManager.AUDIOFOCUS_GAIN,1
+10,Android.Media.AudioFocus,GainTransient,android/media/AudioManager.AUDIOFOCUS_GAIN_TRANSIENT,2
 19,Android.Media.AudioFocus,GainTransientExclusive,android/media/AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE,4
-8,Android.Media.AudioFocus,GainTransientMayDuck,android/media/AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK,3
-8,Android.Media.AudioFocus,Loss,android/media/AudioManager.AUDIOFOCUS_LOSS,-1
-8,Android.Media.AudioFocus,LossTransient,android/media/AudioManager.AUDIOFOCUS_LOSS_TRANSIENT,-2
-8,Android.Media.AudioFocus,LossTransientCanDuck,android/media/AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK,-3
+10,Android.Media.AudioFocus,GainTransientMayDuck,android/media/AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK,3
+10,Android.Media.AudioFocus,Loss,android/media/AudioManager.AUDIOFOCUS_LOSS,-1
+10,Android.Media.AudioFocus,LossTransient,android/media/AudioManager.AUDIOFOCUS_LOSS_TRANSIENT,-2
+10,Android.Media.AudioFocus,LossTransientCanDuck,android/media/AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK,-3
 26,Android.Media.AudioFocus,None,android/media/AudioManager.AUDIOFOCUS_NONE,0
-8,Android.Media.ScoAudioState,Connected,android/media/AudioManager.SCO_AUDIO_STATE_CONNECTED,1
-14,Android.Media.ScoAudioState,Connecting,android/media/AudioManager.SCO_AUDIO_STATE_CONNECTING,2
-8,Android.Media.ScoAudioState,Disconnected,android/media/AudioManager.SCO_AUDIO_STATE_DISCONNECTED,0
-8,Android.Media.ScoAudioState,Error,android/media/AudioManager.SCO_AUDIO_STATE_ERROR,-1
-3,Android.Media.TrackStatus,Error,android/media/AudioTrack.ERROR,-1
-3,Android.Media.TrackStatus,ErrorBadValue,android/media/AudioTrack.ERROR_BAD_VALUE,-2
+10,Android.Media.ScoAudioState,Connected,android/media/AudioManager.SCO_AUDIO_STATE_CONNECTED,1
+15,Android.Media.ScoAudioState,Connecting,android/media/AudioManager.SCO_AUDIO_STATE_CONNECTING,2
+10,Android.Media.ScoAudioState,Disconnected,android/media/AudioManager.SCO_AUDIO_STATE_DISCONNECTED,0
+10,Android.Media.ScoAudioState,Error,android/media/AudioManager.SCO_AUDIO_STATE_ERROR,-1
+10,Android.Media.TrackStatus,Error,android/media/AudioTrack.ERROR,-1
+10,Android.Media.TrackStatus,ErrorBadValue,android/media/AudioTrack.ERROR_BAD_VALUE,-2
 24,Android.Media.TrackStatus,ErrorDeadObject,android/media/AudioTrack.ERROR_DEAD_OBJECT,-6
-3,Android.Media.TrackStatus,ErrorInvalidOperation,android/media/AudioTrack.ERROR_INVALID_OPERATION,-3
-3,Android.Media.TrackStatus,Success,android/media/AudioTrack.SUCCESS,0
-8,Android.Media.CameraQuality,High,android/media/CameraProfile.QUALITY_HIGH,2
-8,Android.Media.CameraQuality,Low,android/media/CameraProfile.QUALITY_LOW,0
-8,Android.Media.CameraQuality,Medium,android/media/CameraProfile.QUALITY_MEDIUM,1
+10,Android.Media.TrackStatus,ErrorInvalidOperation,android/media/AudioTrack.ERROR_INVALID_OPERATION,-3
+10,Android.Media.TrackStatus,Success,android/media/AudioTrack.SUCCESS,0
+10,Android.Media.CameraQuality,High,android/media/CameraProfile.QUALITY_HIGH,2
+10,Android.Media.CameraQuality,Low,android/media/CameraProfile.QUALITY_LOW,0
+10,Android.Media.CameraQuality,Medium,android/media/CameraProfile.QUALITY_MEDIUM,1
 21,Android.Media.MediaCodecCryptoErrorType,InsufficientOutputProtection,android/media/MediaCodec.CryptoException.ERROR_INSUFFICIENT_OUTPUT_PROTECTION,4
 19,Android.Media.MediaCodecCryptoErrorType,KeyExpired,android/media/MediaCodec.CryptoException.ERROR_KEY_EXPIRED,2
 19,Android.Media.MediaCodecCryptoErrorType,NoKey,android/media/MediaCodec.CryptoException.ERROR_NO_KEY,1
@@ -3948,7 +3945,7 @@
 10,Android.Media.MetadataKey,Albumartist,android/media/MediaMetadataRetriever.METADATA_KEY_ALBUMARTIST,13
 10,Android.Media.MetadataKey,Artist,android/media/MediaMetadataRetriever.METADATA_KEY_ARTIST,2
 10,Android.Media.MetadataKey,Author,android/media/MediaMetadataRetriever.METADATA_KEY_AUTHOR,3
-14,Android.Media.MetadataKey,Bitrate,android/media/MediaMetadataRetriever.METADATA_KEY_BITRATE,20
+15,Android.Media.MetadataKey,Bitrate,android/media/MediaMetadataRetriever.METADATA_KEY_BITRATE,20
 23,Android.Media.MetadataKey,CaptureFramerate,android/media/MediaMetadataRetriever.METADATA_KEY_CAPTURE_FRAMERATE,25
 10,Android.Media.MetadataKey,CdTrackNumber,android/media/MediaMetadataRetriever.METADATA_KEY_CD_TRACK_NUMBER,0
 10,Android.Media.MetadataKey,Compilation,android/media/MediaMetadataRetriever.METADATA_KEY_COMPILATION,15
@@ -3957,15 +3954,15 @@
 10,Android.Media.MetadataKey,DiscNumber,android/media/MediaMetadataRetriever.METADATA_KEY_DISC_NUMBER,14
 10,Android.Media.MetadataKey,Duration,android/media/MediaMetadataRetriever.METADATA_KEY_DURATION,9
 10,Android.Media.MetadataKey,Genre,android/media/MediaMetadataRetriever.METADATA_KEY_GENRE,6
-14,Android.Media.MetadataKey,HasAudio,android/media/MediaMetadataRetriever.METADATA_KEY_HAS_AUDIO,16
-14,Android.Media.MetadataKey,HasVideo,android/media/MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO,17
+15,Android.Media.MetadataKey,HasAudio,android/media/MediaMetadataRetriever.METADATA_KEY_HAS_AUDIO,16
+15,Android.Media.MetadataKey,HasVideo,android/media/MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO,17
 15,Android.Media.MetadataKey,Location,android/media/MediaMetadataRetriever.METADATA_KEY_LOCATION,23
 10,Android.Media.MetadataKey,Mimetype,android/media/MediaMetadataRetriever.METADATA_KEY_MIMETYPE,12
 10,Android.Media.MetadataKey,NumTracks,android/media/MediaMetadataRetriever.METADATA_KEY_NUM_TRACKS,10
 10,Android.Media.MetadataKey,Title,android/media/MediaMetadataRetriever.METADATA_KEY_TITLE,7
-14,Android.Media.MetadataKey,VideoHeight,android/media/MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT,19
+15,Android.Media.MetadataKey,VideoHeight,android/media/MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT,19
 17,Android.Media.MetadataKey,VideoRotation,android/media/MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION,24
-14,Android.Media.MetadataKey,VideoWidth,android/media/MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH,18
+15,Android.Media.MetadataKey,VideoWidth,android/media/MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH,18
 10,Android.Media.MetadataKey,Writer,android/media/MediaMetadataRetriever.METADATA_KEY_WRITER,11
 10,Android.Media.MetadataKey,Year,android/media/MediaMetadataRetriever.METADATA_KEY_YEAR,8
 10,Android.Media.Option,Closest,android/media/MediaMetadataRetriever.OPTION_CLOSEST,3
@@ -3973,7 +3970,7 @@
 10,Android.Media.Option,NextSync,android/media/MediaMetadataRetriever.OPTION_NEXT_SYNC,1
 10,Android.Media.Option,PreviousSync,android/media/MediaMetadataRetriever.OPTION_PREVIOUS_SYNC,0
 17,Android.Media.MediaRecorderError,ServerDied,android/media/MediaRecorder.MEDIA_ERROR_SERVER_DIED,100
-3,Android.Media.MediaRecorderError,Unknown,android/media/MediaRecorder.MEDIA_RECORDER_ERROR_UNKNOWN,1
+10,Android.Media.MediaRecorderError,Unknown,android/media/MediaRecorder.MEDIA_RECORDER_ERROR_UNKNOWN,1
 18,Android.Media.MediaRouterCallbackFlags,PerformActiveScan,android/media/MediaRouter.CALLBACK_FLAG_PERFORM_ACTIVE_SCAN,1
 18,Android.Media.MediaRouterCallbackFlags,UnfilteredEvents,android/media/MediaRouter.CALLBACK_FLAG_UNFILTERED_EVENTS,2
 0,Android.Media.Session.MediaSessionFlags,None,,0
@@ -4000,82 +3997,82 @@
 19,Android.Media.RatingStyle,ThumbUpDown,android/media/Rating.RATING_THUMB_UP_DOWN,2
 19,Android.Media.SynchronizationPosition,Check,android/media/RemoteController.POSITION_SYNCHRONIZATION_CHECK,1
 19,Android.Media.SynchronizationPosition,None,android/media/RemoteController.POSITION_SYNCHRONIZATION_NONE,0
-14,Android.Media.RemoteControlFlags,FastForward,android/media/RemoteControlClient.FLAG_KEY_MEDIA_FAST_FORWARD,64
-14,Android.Media.RemoteControlFlags,Next,android/media/RemoteControlClient.FLAG_KEY_MEDIA_NEXT,128
-14,Android.Media.RemoteControlFlags,Pause,android/media/RemoteControlClient.FLAG_KEY_MEDIA_PAUSE,16
-14,Android.Media.RemoteControlFlags,Play,android/media/RemoteControlClient.FLAG_KEY_MEDIA_PLAY,4
-14,Android.Media.RemoteControlFlags,PlayPause,android/media/RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE,8
+15,Android.Media.RemoteControlFlags,FastForward,android/media/RemoteControlClient.FLAG_KEY_MEDIA_FAST_FORWARD,64
+15,Android.Media.RemoteControlFlags,Next,android/media/RemoteControlClient.FLAG_KEY_MEDIA_NEXT,128
+15,Android.Media.RemoteControlFlags,Pause,android/media/RemoteControlClient.FLAG_KEY_MEDIA_PAUSE,16
+15,Android.Media.RemoteControlFlags,Play,android/media/RemoteControlClient.FLAG_KEY_MEDIA_PLAY,4
+15,Android.Media.RemoteControlFlags,PlayPause,android/media/RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE,8
 18,Android.Media.RemoteControlFlags,PositionUpdate,android/media/RemoteControlClient.FLAG_KEY_MEDIA_POSITION_UPDATE,256
-14,Android.Media.RemoteControlFlags,Previous,android/media/RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS,1
+15,Android.Media.RemoteControlFlags,Previous,android/media/RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS,1
 19,Android.Media.RemoteControlFlags,Rating,android/media/RemoteControlClient.FLAG_KEY_MEDIA_RATING,512
-14,Android.Media.RemoteControlFlags,Rewind,android/media/RemoteControlClient.FLAG_KEY_MEDIA_REWIND,2
-14,Android.Media.RemoteControlFlags,Stop,android/media/RemoteControlClient.FLAG_KEY_MEDIA_STOP,32
-14,Android.Media.RemoteControlPlayState,Buffering,android/media/RemoteControlClient.PLAYSTATE_BUFFERING,8
-14,Android.Media.RemoteControlPlayState,Error,android/media/RemoteControlClient.PLAYSTATE_ERROR,9
-14,Android.Media.RemoteControlPlayState,FastForwarding,android/media/RemoteControlClient.PLAYSTATE_FAST_FORWARDING,4
-14,Android.Media.RemoteControlPlayState,Paused,android/media/RemoteControlClient.PLAYSTATE_PAUSED,2
-14,Android.Media.RemoteControlPlayState,Playing,android/media/RemoteControlClient.PLAYSTATE_PLAYING,3
-14,Android.Media.RemoteControlPlayState,Rewinding,android/media/RemoteControlClient.PLAYSTATE_REWINDING,5
-14,Android.Media.RemoteControlPlayState,SkippingBackwards,android/media/RemoteControlClient.PLAYSTATE_SKIPPING_BACKWARDS,7
-14,Android.Media.RemoteControlPlayState,SkippingForwards,android/media/RemoteControlClient.PLAYSTATE_SKIPPING_FORWARDS,6
-14,Android.Media.RemoteControlPlayState,Stopped,android/media/RemoteControlClient.PLAYSTATE_STOPPED,1
-14,Android.Media.BitmapKey,Artwork,android/media/RemoteControlClient$MetadataEditor.BITMAP_KEY_ARTWORK,100
+15,Android.Media.RemoteControlFlags,Rewind,android/media/RemoteControlClient.FLAG_KEY_MEDIA_REWIND,2
+15,Android.Media.RemoteControlFlags,Stop,android/media/RemoteControlClient.FLAG_KEY_MEDIA_STOP,32
+15,Android.Media.RemoteControlPlayState,Buffering,android/media/RemoteControlClient.PLAYSTATE_BUFFERING,8
+15,Android.Media.RemoteControlPlayState,Error,android/media/RemoteControlClient.PLAYSTATE_ERROR,9
+15,Android.Media.RemoteControlPlayState,FastForwarding,android/media/RemoteControlClient.PLAYSTATE_FAST_FORWARDING,4
+15,Android.Media.RemoteControlPlayState,Paused,android/media/RemoteControlClient.PLAYSTATE_PAUSED,2
+15,Android.Media.RemoteControlPlayState,Playing,android/media/RemoteControlClient.PLAYSTATE_PLAYING,3
+15,Android.Media.RemoteControlPlayState,Rewinding,android/media/RemoteControlClient.PLAYSTATE_REWINDING,5
+15,Android.Media.RemoteControlPlayState,SkippingBackwards,android/media/RemoteControlClient.PLAYSTATE_SKIPPING_BACKWARDS,7
+15,Android.Media.RemoteControlPlayState,SkippingForwards,android/media/RemoteControlClient.PLAYSTATE_SKIPPING_FORWARDS,6
+15,Android.Media.RemoteControlPlayState,Stopped,android/media/RemoteControlClient.PLAYSTATE_STOPPED,1
+15,Android.Media.BitmapKey,Artwork,android/media/RemoteControlClient$MetadataEditor.BITMAP_KEY_ARTWORK,100
 0,Android.Media.ThumnailExtractOptions,None,,0
-8,Android.Media.ThumnailExtractOptions,RecycleInput,android/media/ThumbnailUtils.OPTIONS_RECYCLE_INPUT,2
-9,Android.Media.Audiofx.ContentType,Game,android/media/audiofx/AudioEffect.CONTENT_TYPE_GAME,2
-9,Android.Media.Audiofx.ContentType,Movie,android/media/audiofx/AudioEffect.CONTENT_TYPE_MOVIE,1
-9,Android.Media.Audiofx.ContentType,Music,android/media/audiofx/AudioEffect.CONTENT_TYPE_MUSIC,0
-9,Android.Media.Audiofx.ContentType,Voice,android/media/audiofx/AudioEffect.CONTENT_TYPE_VOICE,3
-9,Android.Media.Audiofx.AudioEffectStatus,AlreadyExists,android/media/audiofx/AudioEffect.ALREADY_EXISTS,-2
-9,Android.Media.Audiofx.AudioEffectStatus,Error,android/media/audiofx/AudioEffect.ERROR,-1
-9,Android.Media.Audiofx.AudioEffectStatus,Success,android/media/audiofx/AudioEffect.SUCCESS,0
-9,Android.Media.Audiofx.AudioEffectStatus,BadValue,android/media/audiofx/AudioEffect.ERROR_BAD_VALUE,-4
-9,Android.Media.Audiofx.AudioEffectStatus,DeadObject,android/media/audiofx/AudioEffect.ERROR_DEAD_OBJECT,-7
-9,Android.Media.Audiofx.AudioEffectStatus,InvalidOperation,android/media/audiofx/AudioEffect.ERROR_INVALID_OPERATION,-5
-9,Android.Media.Audiofx.AudioEffectStatus,NoInit,android/media/audiofx/AudioEffect.ERROR_NO_INIT,-3
-9,Android.Media.Audiofx.AudioEffectStatus,NoMemory,android/media/audiofx/AudioEffect.ERROR_NO_MEMORY,-6
-9,Android.Media.Audiofx.BassBoostParam,ParamStrength,android/media/audiofx/BassBoost.PARAM_STRENGTH,1
-9,Android.Media.Audiofx.EnvironmentalReverbParam,DecayHfRatio,android/media/audiofx/EnvironmentalReverb.PARAM_DECAY_HF_RATIO,3
-9,Android.Media.Audiofx.EnvironmentalReverbParam,DecayTime,android/media/audiofx/EnvironmentalReverb.PARAM_DECAY_TIME,2
-9,Android.Media.Audiofx.EnvironmentalReverbParam,Density,android/media/audiofx/EnvironmentalReverb.PARAM_DENSITY,9
-9,Android.Media.Audiofx.EnvironmentalReverbParam,Diffusion,android/media/audiofx/EnvironmentalReverb.PARAM_DIFFUSION,8
-9,Android.Media.Audiofx.EnvironmentalReverbParam,ReflectionsDelay,android/media/audiofx/EnvironmentalReverb.PARAM_REFLECTIONS_DELAY,5
-9,Android.Media.Audiofx.EnvironmentalReverbParam,ReflectionsLevel,android/media/audiofx/EnvironmentalReverb.PARAM_REFLECTIONS_LEVEL,4
-9,Android.Media.Audiofx.EnvironmentalReverbParam,ReverbDelay,android/media/audiofx/EnvironmentalReverb.PARAM_REVERB_DELAY,7
-9,Android.Media.Audiofx.EnvironmentalReverbParam,ReverbLevel,android/media/audiofx/EnvironmentalReverb.PARAM_REVERB_LEVEL,6
-9,Android.Media.Audiofx.EnvironmentalReverbParam,RoomHfLevel,android/media/audiofx/EnvironmentalReverb.PARAM_ROOM_HF_LEVEL,1
-9,Android.Media.Audiofx.EnvironmentalReverbParam,RoomLevel,android/media/audiofx/EnvironmentalReverb.PARAM_ROOM_LEVEL,0
-9,Android.Media.Audiofx.EqualizerParam,BandFreqRange,android/media/audiofx/Equalizer.PARAM_BAND_FREQ_RANGE,4
-9,Android.Media.Audiofx.EqualizerParam,BandLevel,android/media/audiofx/Equalizer.PARAM_BAND_LEVEL,2
-9,Android.Media.Audiofx.EqualizerParam,CenterFreq,android/media/audiofx/Equalizer.PARAM_CENTER_FREQ,3
-9,Android.Media.Audiofx.EqualizerParam,CurrentPreset,android/media/audiofx/Equalizer.PARAM_CURRENT_PRESET,6
-9,Android.Media.Audiofx.EqualizerParam,GetBand,android/media/audiofx/Equalizer.PARAM_GET_BAND,5
-9,Android.Media.Audiofx.EqualizerParam,GetNumOfPresets,android/media/audiofx/Equalizer.PARAM_GET_NUM_OF_PRESETS,7
-9,Android.Media.Audiofx.EqualizerParam,GetPresetName,android/media/audiofx/Equalizer.PARAM_GET_PRESET_NAME,8
-9,Android.Media.Audiofx.EqualizerParam,LevelRange,android/media/audiofx/Equalizer.PARAM_LEVEL_RANGE,1
-9,Android.Media.Audiofx.EqualizerParam,NumBands,android/media/audiofx/Equalizer.PARAM_NUM_BANDS,0
-9,Android.Media.Audiofx.EqualizerParam,StringSizeMax,android/media/audiofx/Equalizer.PARAM_STRING_SIZE_MAX,32
+10,Android.Media.ThumnailExtractOptions,RecycleInput,android/media/ThumbnailUtils.OPTIONS_RECYCLE_INPUT,2
+10,Android.Media.Audiofx.ContentType,Game,android/media/audiofx/AudioEffect.CONTENT_TYPE_GAME,2
+10,Android.Media.Audiofx.ContentType,Movie,android/media/audiofx/AudioEffect.CONTENT_TYPE_MOVIE,1
+10,Android.Media.Audiofx.ContentType,Music,android/media/audiofx/AudioEffect.CONTENT_TYPE_MUSIC,0
+10,Android.Media.Audiofx.ContentType,Voice,android/media/audiofx/AudioEffect.CONTENT_TYPE_VOICE,3
+10,Android.Media.Audiofx.AudioEffectStatus,AlreadyExists,android/media/audiofx/AudioEffect.ALREADY_EXISTS,-2
+10,Android.Media.Audiofx.AudioEffectStatus,Error,android/media/audiofx/AudioEffect.ERROR,-1
+10,Android.Media.Audiofx.AudioEffectStatus,Success,android/media/audiofx/AudioEffect.SUCCESS,0
+10,Android.Media.Audiofx.AudioEffectStatus,BadValue,android/media/audiofx/AudioEffect.ERROR_BAD_VALUE,-4
+10,Android.Media.Audiofx.AudioEffectStatus,DeadObject,android/media/audiofx/AudioEffect.ERROR_DEAD_OBJECT,-7
+10,Android.Media.Audiofx.AudioEffectStatus,InvalidOperation,android/media/audiofx/AudioEffect.ERROR_INVALID_OPERATION,-5
+10,Android.Media.Audiofx.AudioEffectStatus,NoInit,android/media/audiofx/AudioEffect.ERROR_NO_INIT,-3
+10,Android.Media.Audiofx.AudioEffectStatus,NoMemory,android/media/audiofx/AudioEffect.ERROR_NO_MEMORY,-6
+10,Android.Media.Audiofx.BassBoostParam,ParamStrength,android/media/audiofx/BassBoost.PARAM_STRENGTH,1
+10,Android.Media.Audiofx.EnvironmentalReverbParam,DecayHfRatio,android/media/audiofx/EnvironmentalReverb.PARAM_DECAY_HF_RATIO,3
+10,Android.Media.Audiofx.EnvironmentalReverbParam,DecayTime,android/media/audiofx/EnvironmentalReverb.PARAM_DECAY_TIME,2
+10,Android.Media.Audiofx.EnvironmentalReverbParam,Density,android/media/audiofx/EnvironmentalReverb.PARAM_DENSITY,9
+10,Android.Media.Audiofx.EnvironmentalReverbParam,Diffusion,android/media/audiofx/EnvironmentalReverb.PARAM_DIFFUSION,8
+10,Android.Media.Audiofx.EnvironmentalReverbParam,ReflectionsDelay,android/media/audiofx/EnvironmentalReverb.PARAM_REFLECTIONS_DELAY,5
+10,Android.Media.Audiofx.EnvironmentalReverbParam,ReflectionsLevel,android/media/audiofx/EnvironmentalReverb.PARAM_REFLECTIONS_LEVEL,4
+10,Android.Media.Audiofx.EnvironmentalReverbParam,ReverbDelay,android/media/audiofx/EnvironmentalReverb.PARAM_REVERB_DELAY,7
+10,Android.Media.Audiofx.EnvironmentalReverbParam,ReverbLevel,android/media/audiofx/EnvironmentalReverb.PARAM_REVERB_LEVEL,6
+10,Android.Media.Audiofx.EnvironmentalReverbParam,RoomHfLevel,android/media/audiofx/EnvironmentalReverb.PARAM_ROOM_HF_LEVEL,1
+10,Android.Media.Audiofx.EnvironmentalReverbParam,RoomLevel,android/media/audiofx/EnvironmentalReverb.PARAM_ROOM_LEVEL,0
+10,Android.Media.Audiofx.EqualizerParam,BandFreqRange,android/media/audiofx/Equalizer.PARAM_BAND_FREQ_RANGE,4
+10,Android.Media.Audiofx.EqualizerParam,BandLevel,android/media/audiofx/Equalizer.PARAM_BAND_LEVEL,2
+10,Android.Media.Audiofx.EqualizerParam,CenterFreq,android/media/audiofx/Equalizer.PARAM_CENTER_FREQ,3
+10,Android.Media.Audiofx.EqualizerParam,CurrentPreset,android/media/audiofx/Equalizer.PARAM_CURRENT_PRESET,6
+10,Android.Media.Audiofx.EqualizerParam,GetBand,android/media/audiofx/Equalizer.PARAM_GET_BAND,5
+10,Android.Media.Audiofx.EqualizerParam,GetNumOfPresets,android/media/audiofx/Equalizer.PARAM_GET_NUM_OF_PRESETS,7
+10,Android.Media.Audiofx.EqualizerParam,GetPresetName,android/media/audiofx/Equalizer.PARAM_GET_PRESET_NAME,8
+10,Android.Media.Audiofx.EqualizerParam,LevelRange,android/media/audiofx/Equalizer.PARAM_LEVEL_RANGE,1
+10,Android.Media.Audiofx.EqualizerParam,NumBands,android/media/audiofx/Equalizer.PARAM_NUM_BANDS,0
+10,Android.Media.Audiofx.EqualizerParam,StringSizeMax,android/media/audiofx/Equalizer.PARAM_STRING_SIZE_MAX,32
 19,Android.Media.Audiofx.LoudnessEnhancerParam,TargetGainMb,android/media/audiofx/LoudnessEnhancer.PARAM_TARGET_GAIN_MB,0
-9,Android.Media.Audiofx.PresetReverbParam,Preset,android/media/audiofx/PresetReverb.PARAM_PRESET,0
-9,Android.Media.Audiofx.VirtualizerParam,Strength,android/media/audiofx/Virtualizer.PARAM_STRENGTH,1
-9,Android.Media.Audiofx.VirtualizerParam,StrengthSupported,android/media/audiofx/Virtualizer.PARAM_STRENGTH_SUPPORTED,0
-9,Android.Media.Audiofx.VisualizerStatus,AlreadyExists,android/media/audiofx/Visualizer.ALREADY_EXISTS,-2
-9,Android.Media.Audiofx.VisualizerStatus,Error,android/media/audiofx/Visualizer.ERROR,-1
-9,Android.Media.Audiofx.VisualizerStatus,Success,android/media/audiofx/Visualizer.SUCCESS,0
-9,Android.Media.Audiofx.VisualizerStatus,BadValue,android/media/audiofx/Visualizer.ERROR_BAD_VALUE,-4
-9,Android.Media.Audiofx.VisualizerStatus,DeadObject,android/media/audiofx/Visualizer.ERROR_DEAD_OBJECT,-7
-9,Android.Media.Audiofx.VisualizerStatus,InvalidOperation,android/media/audiofx/Visualizer.ERROR_INVALID_OPERATION,-5
-9,Android.Media.Audiofx.VisualizerStatus,NoInit,android/media/audiofx/Visualizer.ERROR_NO_INIT,-3
-9,Android.Media.Audiofx.VisualizerStatus,NoMemory,android/media/audiofx/Visualizer.ERROR_NO_MEMORY,-6
-9,Android.Media.Audiofx.VisualizerState,Enabled,android/media/audiofx/Visualizer.STATE_ENABLED,2
-9,Android.Media.Audiofx.VisualizerState,Initialized,android/media/audiofx/Visualizer.STATE_INITIALIZED,1
-9,Android.Media.Audiofx.VisualizerState,Uninitialized,android/media/audiofx/Visualizer.STATE_UNINITIALIZED,0
+10,Android.Media.Audiofx.PresetReverbParam,Preset,android/media/audiofx/PresetReverb.PARAM_PRESET,0
+10,Android.Media.Audiofx.VirtualizerParam,Strength,android/media/audiofx/Virtualizer.PARAM_STRENGTH,1
+10,Android.Media.Audiofx.VirtualizerParam,StrengthSupported,android/media/audiofx/Virtualizer.PARAM_STRENGTH_SUPPORTED,0
+10,Android.Media.Audiofx.VisualizerStatus,AlreadyExists,android/media/audiofx/Visualizer.ALREADY_EXISTS,-2
+10,Android.Media.Audiofx.VisualizerStatus,Error,android/media/audiofx/Visualizer.ERROR,-1
+10,Android.Media.Audiofx.VisualizerStatus,Success,android/media/audiofx/Visualizer.SUCCESS,0
+10,Android.Media.Audiofx.VisualizerStatus,BadValue,android/media/audiofx/Visualizer.ERROR_BAD_VALUE,-4
+10,Android.Media.Audiofx.VisualizerStatus,DeadObject,android/media/audiofx/Visualizer.ERROR_DEAD_OBJECT,-7
+10,Android.Media.Audiofx.VisualizerStatus,InvalidOperation,android/media/audiofx/Visualizer.ERROR_INVALID_OPERATION,-5
+10,Android.Media.Audiofx.VisualizerStatus,NoInit,android/media/audiofx/Visualizer.ERROR_NO_INIT,-3
+10,Android.Media.Audiofx.VisualizerStatus,NoMemory,android/media/audiofx/Visualizer.ERROR_NO_MEMORY,-6
+10,Android.Media.Audiofx.VisualizerState,Enabled,android/media/audiofx/Visualizer.STATE_ENABLED,2
+10,Android.Media.Audiofx.VisualizerState,Initialized,android/media/audiofx/Visualizer.STATE_INITIALIZED,1
+10,Android.Media.Audiofx.VisualizerState,Uninitialized,android/media/audiofx/Visualizer.STATE_UNINITIALIZED,0
 16,Android.Media.Audiofx.VisualizerScalingMode,AsPlayed,android/media/audiofx/Visualizer.SCALING_MODE_AS_PLAYED,1
 16,Android.Media.Audiofx.VisualizerScalingMode,Normalized,android/media/audiofx/Visualizer.SCALING_MODE_NORMALIZED,0
 19,Android.Media.Audiofx.VisualizerMeasurementMode,None,android/media/audiofx/Visualizer.MEASUREMENT_MODE_NONE,0
 19,Android.Media.Audiofx.VisualizerMeasurementMode,PeakRms,android/media/audiofx/Visualizer.MEASUREMENT_MODE_PEAK_RMS,1
 0,Android.Mtp.AssociationType,None,,0
-12,Android.Mtp.AssociationType,GenericFolder,android/mtp/MtpConstants.ASSOCIATION_TYPE_GENERIC_FOLDER,1
+15,Android.Mtp.AssociationType,GenericFolder,android/mtp/MtpConstants.ASSOCIATION_TYPE_GENERIC_FOLDER,1
 19,Android.Net.SocketType,Dgram,android/net/LocalSocket.SOCKET_DGRAM,1
 19,Android.Net.SocketType,Seqpacket,android/net/LocalSocket.SOCKET_SEQPACKET,3
 19,Android.Net.SocketType,Stream,android/net/LocalSocket.SOCKET_STREAM,2
@@ -4100,70 +4097,71 @@
 21,Android.Net.TransportType,Bluetooth,android/net/NetworkCapabilities.TRANSPORT_BLUETOOTH,2
 21,Android.Net.TransportType,Cellular,android/net/NetworkCapabilities.TRANSPORT_CELLULAR,0
 21,Android.Net.TransportType,Ethernet,android/net/NetworkCapabilities.TRANSPORT_ETHERNET,3
+27,Android.Net.TransportType,Lowpan,android/net/NetworkCapabilities.TRANSPORT_LOWPAN,6
 21,Android.Net.TransportType,Vpn,android/net/NetworkCapabilities.TRANSPORT_VPN,4
 21,Android.Net.TransportType,Wifi,android/net/NetworkCapabilities.TRANSPORT_WIFI,1
 26,Android.Net.TransportType,WifiAware,android/net/NetworkCapabilities.TRANSPORT_WIFI_AWARE,5
-14,Android.Net.Http.SslErrorType,DateInvalid,android/net/http/SslError.SSL_DATE_INVALID,4
-8,Android.Net.Http.SslErrorType,Expired,android/net/http/SslError.SSL_EXPIRED,1
-8,Android.Net.Http.SslErrorType,Idmismatch,android/net/http/SslError.SSL_IDMISMATCH,2
-14,Android.Net.Http.SslErrorType,Invalid,android/net/http/SslError.SSL_INVALID,5
-8,Android.Net.Http.SslErrorType,MaxError,android/net/http/SslError.SSL_MAX_ERROR,6
-8,Android.Net.Http.SslErrorType,Notyetvalid,android/net/http/SslError.SSL_NOTYETVALID,0
-8,Android.Net.Http.SslErrorType,Untrusted,android/net/http/SslError.SSL_UNTRUSTED,3
-9,Android.Net.Sip.SipErrorCodes,ClientError,android/net/sip/SipErrorCode.CLIENT_ERROR,-4
-9,Android.Net.Sip.SipErrorCodes,CrossDomainAuthentication,android/net/sip/SipErrorCode.CROSS_DOMAIN_AUTHENTICATION,-11
-9,Android.Net.Sip.SipErrorCodes,DataConnectionLost,android/net/sip/SipErrorCode.DATA_CONNECTION_LOST,-10
-9,Android.Net.Sip.SipErrorCodes,InvalidCredentials,android/net/sip/SipErrorCode.INVALID_CREDENTIALS,-8
-9,Android.Net.Sip.SipErrorCodes,InvalidRemoteUri,android/net/sip/SipErrorCode.INVALID_REMOTE_URI,-6
-9,Android.Net.Sip.SipErrorCodes,InProgress,android/net/sip/SipErrorCode.IN_PROGRESS,-9
-9,Android.Net.Sip.SipErrorCodes,NoError,android/net/sip/SipErrorCode.NO_ERROR,0
-9,Android.Net.Sip.SipErrorCodes,PeerNotReachable,android/net/sip/SipErrorCode.PEER_NOT_REACHABLE,-7
-9,Android.Net.Sip.SipErrorCodes,ServerError,android/net/sip/SipErrorCode.SERVER_ERROR,-2
-9,Android.Net.Sip.SipErrorCodes,ServerUnreachable,android/net/sip/SipErrorCode.SERVER_UNREACHABLE,-12
-9,Android.Net.Sip.SipErrorCodes,SocketError,android/net/sip/SipErrorCode.SOCKET_ERROR,-1
-9,Android.Net.Sip.SipErrorCodes,TimeOut,android/net/sip/SipErrorCode.TIME_OUT,-5
-9,Android.Net.Sip.SipErrorCodes,TransactionTerminted,android/net/sip/SipErrorCode.TRANSACTION_TERMINTED,-3
-9,Android.Net.Sip.SipSessionState,Deregistering,android/net/sip/SipSession$State.DEREGISTERING,2
-9,Android.Net.Sip.SipSessionState,IncomingCall,android/net/sip/SipSession$State.INCOMING_CALL,3
-9,Android.Net.Sip.SipSessionState,IncomingCallAnswering,android/net/sip/SipSession$State.INCOMING_CALL_ANSWERING,4
-9,Android.Net.Sip.SipSessionState,InCall,android/net/sip/SipSession$State.IN_CALL,8
-9,Android.Net.Sip.SipSessionState,NotDefined,android/net/sip/SipSession$State.NOT_DEFINED,101
-9,Android.Net.Sip.SipSessionState,OutgoingCall,android/net/sip/SipSession$State.OUTGOING_CALL,5
-9,Android.Net.Sip.SipSessionState,OutgoingCallCanceling,android/net/sip/SipSession$State.OUTGOING_CALL_CANCELING,7
-9,Android.Net.Sip.SipSessionState,OutgoingCallRingBack,android/net/sip/SipSession$State.OUTGOING_CALL_RING_BACK,6
-9,Android.Net.Sip.SipSessionState,Pinging,android/net/sip/SipSession$State.PINGING,9
-9,Android.Net.Sip.SipSessionState,ReadyToCall,android/net/sip/SipSession$State.READY_TO_CALL,0
-9,Android.Net.Sip.SipSessionState,Registering,android/net/sip/SipSession$State.REGISTERING,1
-14,Android.Net.Wifi.P2p.WifiP2pDeviceState,Available,android/net/wifi/p2p/WifiP2pDevice.AVAILABLE,3
-14,Android.Net.Wifi.P2p.WifiP2pDeviceState,Connected,android/net/wifi/p2p/WifiP2pDevice.CONNECTED,0
-14,Android.Net.Wifi.P2p.WifiP2pDeviceState,Failed,android/net/wifi/p2p/WifiP2pDevice.FAILED,2
-14,Android.Net.Wifi.P2p.WifiP2pDeviceState,Invited,android/net/wifi/p2p/WifiP2pDevice.INVITED,1
-14,Android.Net.Wifi.P2p.WifiP2pDeviceState,Unavailable,android/net/wifi/p2p/WifiP2pDevice.UNAVAILABLE,4
-14,Android.Net.Wifi.P2p.WifiP2pFailureReason,Busy,android/net/wifi/p2p/WifiP2pManager.BUSY,2
-14,Android.Net.Wifi.P2p.WifiP2pFailureReason,Error,android/net/wifi/p2p/WifiP2pManager.ERROR,0
+15,Android.Net.Http.SslErrorType,DateInvalid,android/net/http/SslError.SSL_DATE_INVALID,4
+10,Android.Net.Http.SslErrorType,Expired,android/net/http/SslError.SSL_EXPIRED,1
+10,Android.Net.Http.SslErrorType,Idmismatch,android/net/http/SslError.SSL_IDMISMATCH,2
+15,Android.Net.Http.SslErrorType,Invalid,android/net/http/SslError.SSL_INVALID,5
+10,Android.Net.Http.SslErrorType,MaxError,android/net/http/SslError.SSL_MAX_ERROR,6
+10,Android.Net.Http.SslErrorType,Notyetvalid,android/net/http/SslError.SSL_NOTYETVALID,0
+10,Android.Net.Http.SslErrorType,Untrusted,android/net/http/SslError.SSL_UNTRUSTED,3
+10,Android.Net.Sip.SipErrorCodes,ClientError,android/net/sip/SipErrorCode.CLIENT_ERROR,-4
+10,Android.Net.Sip.SipErrorCodes,CrossDomainAuthentication,android/net/sip/SipErrorCode.CROSS_DOMAIN_AUTHENTICATION,-11
+10,Android.Net.Sip.SipErrorCodes,DataConnectionLost,android/net/sip/SipErrorCode.DATA_CONNECTION_LOST,-10
+10,Android.Net.Sip.SipErrorCodes,InProgress,android/net/sip/SipErrorCode.IN_PROGRESS,-9
+10,Android.Net.Sip.SipErrorCodes,InvalidCredentials,android/net/sip/SipErrorCode.INVALID_CREDENTIALS,-8
+10,Android.Net.Sip.SipErrorCodes,InvalidRemoteUri,android/net/sip/SipErrorCode.INVALID_REMOTE_URI,-6
+10,Android.Net.Sip.SipErrorCodes,NoError,android/net/sip/SipErrorCode.NO_ERROR,0
+10,Android.Net.Sip.SipErrorCodes,PeerNotReachable,android/net/sip/SipErrorCode.PEER_NOT_REACHABLE,-7
+10,Android.Net.Sip.SipErrorCodes,ServerError,android/net/sip/SipErrorCode.SERVER_ERROR,-2
+10,Android.Net.Sip.SipErrorCodes,ServerUnreachable,android/net/sip/SipErrorCode.SERVER_UNREACHABLE,-12
+10,Android.Net.Sip.SipErrorCodes,SocketError,android/net/sip/SipErrorCode.SOCKET_ERROR,-1
+10,Android.Net.Sip.SipErrorCodes,TimeOut,android/net/sip/SipErrorCode.TIME_OUT,-5
+10,Android.Net.Sip.SipErrorCodes,TransactionTerminted,android/net/sip/SipErrorCode.TRANSACTION_TERMINTED,-3
+10,Android.Net.Sip.SipSessionState,Deregistering,android/net/sip/SipSession$State.DEREGISTERING,2
+10,Android.Net.Sip.SipSessionState,InCall,android/net/sip/SipSession$State.IN_CALL,8
+10,Android.Net.Sip.SipSessionState,IncomingCall,android/net/sip/SipSession$State.INCOMING_CALL,3
+10,Android.Net.Sip.SipSessionState,IncomingCallAnswering,android/net/sip/SipSession$State.INCOMING_CALL_ANSWERING,4
+10,Android.Net.Sip.SipSessionState,NotDefined,android/net/sip/SipSession$State.NOT_DEFINED,101
+10,Android.Net.Sip.SipSessionState,OutgoingCall,android/net/sip/SipSession$State.OUTGOING_CALL,5
+10,Android.Net.Sip.SipSessionState,OutgoingCallCanceling,android/net/sip/SipSession$State.OUTGOING_CALL_CANCELING,7
+10,Android.Net.Sip.SipSessionState,OutgoingCallRingBack,android/net/sip/SipSession$State.OUTGOING_CALL_RING_BACK,6
+10,Android.Net.Sip.SipSessionState,Pinging,android/net/sip/SipSession$State.PINGING,9
+10,Android.Net.Sip.SipSessionState,ReadyToCall,android/net/sip/SipSession$State.READY_TO_CALL,0
+10,Android.Net.Sip.SipSessionState,Registering,android/net/sip/SipSession$State.REGISTERING,1
+15,Android.Net.Wifi.P2p.WifiP2pDeviceState,Available,android/net/wifi/p2p/WifiP2pDevice.AVAILABLE,3
+15,Android.Net.Wifi.P2p.WifiP2pDeviceState,Connected,android/net/wifi/p2p/WifiP2pDevice.CONNECTED,0
+15,Android.Net.Wifi.P2p.WifiP2pDeviceState,Failed,android/net/wifi/p2p/WifiP2pDevice.FAILED,2
+15,Android.Net.Wifi.P2p.WifiP2pDeviceState,Invited,android/net/wifi/p2p/WifiP2pDevice.INVITED,1
+15,Android.Net.Wifi.P2p.WifiP2pDeviceState,Unavailable,android/net/wifi/p2p/WifiP2pDevice.UNAVAILABLE,4
+15,Android.Net.Wifi.P2p.WifiP2pFailureReason,Busy,android/net/wifi/p2p/WifiP2pManager.BUSY,2
+15,Android.Net.Wifi.P2p.WifiP2pFailureReason,Error,android/net/wifi/p2p/WifiP2pManager.ERROR,0
 16,Android.Net.Wifi.P2p.WifiP2pFailureReason,NoServiceRequests,android/net/wifi/p2p/WifiP2pManager.NO_SERVICE_REQUESTS,3
-14,Android.Net.Wifi.P2p.WifiP2pFailureReason,P2pUnsupported,android/net/wifi/p2p/WifiP2pManager.P2P_UNSUPPORTED,1
-14,Android.Net.Wifi.P2p.WifiP2pState,Disabled,android/net/wifi/p2p/WifiP2pManager.WIFI_P2P_STATE_DISABLED,1
-14,Android.Net.Wifi.P2p.WifiP2pState,Enabled,android/net/wifi/p2p/WifiP2pManager.WIFI_P2P_STATE_ENABLED,2
-1,Android.Net.Wifi.AuthAlgorithmType,Leap,android/net/wifi/WifiConfiguration$AuthAlgorithm.LEAP,2
-1,Android.Net.Wifi.AuthAlgorithmType,Open,android/net/wifi/WifiConfiguration$AuthAlgorithm.OPEN,0
-1,Android.Net.Wifi.AuthAlgorithmType,Shared,android/net/wifi/WifiConfiguration$AuthAlgorithm.SHARED,1
-1,Android.Net.Wifi.GroupCipherType,Ccmp,android/net/wifi/WifiConfiguration$GroupCipher.CCMP,3
-1,Android.Net.Wifi.GroupCipherType,Tkip,android/net/wifi/WifiConfiguration$GroupCipher.TKIP,2
-1,Android.Net.Wifi.GroupCipherType,Wep104,android/net/wifi/WifiConfiguration$GroupCipher.WEP104,1
-1,Android.Net.Wifi.GroupCipherType,Wep40,android/net/wifi/WifiConfiguration$GroupCipher.WEP40,0
-1,Android.Net.Wifi.KeyManagementType,Ieee8021x,android/net/wifi/WifiConfiguration$KeyMgmt.IEEE8021X,3
-1,Android.Net.Wifi.KeyManagementType,None,android/net/wifi/WifiConfiguration$KeyMgmt.NONE,0
-1,Android.Net.Wifi.KeyManagementType,WpaEap,android/net/wifi/WifiConfiguration$KeyMgmt.WPA_EAP,2
-1,Android.Net.Wifi.KeyManagementType,WpaPsk,android/net/wifi/WifiConfiguration$KeyMgmt.WPA_PSK,1
-1,Android.Net.Wifi.PairwiseCipherType,Ccmp,android/net/wifi/WifiConfiguration$PairwiseCipher.CCMP,2
-1,Android.Net.Wifi.PairwiseCipherType,None,android/net/wifi/WifiConfiguration$PairwiseCipher.NONE,0
-1,Android.Net.Wifi.PairwiseCipherType,Tkip,android/net/wifi/WifiConfiguration$PairwiseCipher.TKIP,1
-1,Android.Net.Wifi.ProtocolType,Rsn,android/net/wifi/WifiConfiguration$Protocol.RSN,1
-1,Android.Net.Wifi.ProtocolType,Wpa,android/net/wifi/WifiConfiguration$Protocol.WPA,0
-1,Android.Net.Wifi.WifiStatus,Current,android/net/wifi/WifiConfiguration$Status.CURRENT,0
-1,Android.Net.Wifi.WifiStatus,Disabled,android/net/wifi/WifiConfiguration$Status.DISABLED,1
-1,Android.Net.Wifi.WifiStatus,Enabled,android/net/wifi/WifiConfiguration$Status.ENABLED,2
+15,Android.Net.Wifi.P2p.WifiP2pFailureReason,P2pUnsupported,android/net/wifi/p2p/WifiP2pManager.P2P_UNSUPPORTED,1
+15,Android.Net.Wifi.P2p.WifiP2pState,Disabled,android/net/wifi/p2p/WifiP2pManager.WIFI_P2P_STATE_DISABLED,1
+15,Android.Net.Wifi.P2p.WifiP2pState,Enabled,android/net/wifi/p2p/WifiP2pManager.WIFI_P2P_STATE_ENABLED,2
+10,Android.Net.Wifi.AuthAlgorithmType,Leap,android/net/wifi/WifiConfiguration$AuthAlgorithm.LEAP,2
+10,Android.Net.Wifi.AuthAlgorithmType,Open,android/net/wifi/WifiConfiguration$AuthAlgorithm.OPEN,0
+10,Android.Net.Wifi.AuthAlgorithmType,Shared,android/net/wifi/WifiConfiguration$AuthAlgorithm.SHARED,1
+10,Android.Net.Wifi.GroupCipherType,Ccmp,android/net/wifi/WifiConfiguration$GroupCipher.CCMP,3
+10,Android.Net.Wifi.GroupCipherType,Tkip,android/net/wifi/WifiConfiguration$GroupCipher.TKIP,2
+10,Android.Net.Wifi.GroupCipherType,Wep104,android/net/wifi/WifiConfiguration$GroupCipher.WEP104,1
+10,Android.Net.Wifi.GroupCipherType,Wep40,android/net/wifi/WifiConfiguration$GroupCipher.WEP40,0
+10,Android.Net.Wifi.KeyManagementType,Ieee8021x,android/net/wifi/WifiConfiguration$KeyMgmt.IEEE8021X,3
+10,Android.Net.Wifi.KeyManagementType,None,android/net/wifi/WifiConfiguration$KeyMgmt.NONE,0
+10,Android.Net.Wifi.KeyManagementType,WpaEap,android/net/wifi/WifiConfiguration$KeyMgmt.WPA_EAP,2
+10,Android.Net.Wifi.KeyManagementType,WpaPsk,android/net/wifi/WifiConfiguration$KeyMgmt.WPA_PSK,1
+10,Android.Net.Wifi.PairwiseCipherType,Ccmp,android/net/wifi/WifiConfiguration$PairwiseCipher.CCMP,2
+10,Android.Net.Wifi.PairwiseCipherType,None,android/net/wifi/WifiConfiguration$PairwiseCipher.NONE,0
+10,Android.Net.Wifi.PairwiseCipherType,Tkip,android/net/wifi/WifiConfiguration$PairwiseCipher.TKIP,1
+10,Android.Net.Wifi.ProtocolType,Rsn,android/net/wifi/WifiConfiguration$Protocol.RSN,1
+10,Android.Net.Wifi.ProtocolType,Wpa,android/net/wifi/WifiConfiguration$Protocol.WPA,0
+10,Android.Net.Wifi.WifiStatus,Current,android/net/wifi/WifiConfiguration$Status.CURRENT,0
+10,Android.Net.Wifi.WifiStatus,Disabled,android/net/wifi/WifiConfiguration$Status.DISABLED,1
+10,Android.Net.Wifi.WifiStatus,Enabled,android/net/wifi/WifiConfiguration$Status.ENABLED,2
 21,Android.Net.Wifi.WifiEapMethod,Aka,android/net/wifi/WifiEnterpriseConfig$Eap.AKA,5
 23,Android.Net.Wifi.WifiEapMethod,AkaPrime,android/net/wifi/WifiEnterpriseConfig$Eap.AKA_PRIME,6
 18,Android.Net.Wifi.WifiEapMethod,None,android/net/wifi/WifiEnterpriseConfig$Eap.NONE,-1
@@ -4204,22 +4202,22 @@
 10,Android.Nfc.Tech.MifareUltralightType,Ultralight,android/nfc/tech/MifareUltralight.TYPE_ULTRALIGHT,1
 10,Android.Nfc.Tech.MifareUltralightType,UltralightC,android/nfc/tech/MifareUltralight.TYPE_ULTRALIGHT_C,2
 10,Android.Nfc.Tech.MifareUltralightType,Unknown,android/nfc/tech/MifareUltralight.TYPE_UNKNOWN,-1
-1,Android.Opengl.GLDebugConfig,CheckGlError,android/opengl/GLDebugHelper.CONFIG_CHECK_GL_ERROR,1
-1,Android.Opengl.GLDebugConfig,CheckThread,android/opengl/GLDebugHelper.CONFIG_CHECK_THREAD,2
-1,Android.Opengl.GLDebugConfig,LogArgumentNames,android/opengl/GLDebugHelper.CONFIG_LOG_ARGUMENT_NAMES,4
-3,Android.Opengl.DebugFlags,CheckGlError,android/opengl/GLSurfaceView.DEBUG_CHECK_GL_ERROR,1
-3,Android.Opengl.DebugFlags,LogGlCalls,android/opengl/GLSurfaceView.DEBUG_LOG_GL_CALLS,2
-3,Android.Opengl.Rendermode,Continuously,android/opengl/GLSurfaceView.RENDERMODE_CONTINUOUSLY,1
-3,Android.Opengl.Rendermode,WhenDirty,android/opengl/GLSurfaceView.RENDERMODE_WHEN_DIRTY,0
-11,Android.OS.BatteryHealth,Cold,android/os/BatteryManager.BATTERY_HEALTH_COLD,7
-1,Android.OS.BatteryHealth,Dead,android/os/BatteryManager.BATTERY_HEALTH_DEAD,4
-1,Android.OS.BatteryHealth,Good,android/os/BatteryManager.BATTERY_HEALTH_GOOD,2
-1,Android.OS.BatteryHealth,Overheat,android/os/BatteryManager.BATTERY_HEALTH_OVERHEAT,3
-1,Android.OS.BatteryHealth,OverVoltage,android/os/BatteryManager.BATTERY_HEALTH_OVER_VOLTAGE,5
-1,Android.OS.BatteryHealth,Unknown,android/os/BatteryManager.BATTERY_HEALTH_UNKNOWN,1
-1,Android.OS.BatteryHealth,UnspecifiedFailure,android/os/BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE,6
-1,Android.OS.BatteryPlugged,Ac,android/os/BatteryManager.BATTERY_PLUGGED_AC,1
-1,Android.OS.BatteryPlugged,Usb,android/os/BatteryManager.BATTERY_PLUGGED_USB,2
+10,Android.Opengl.GLDebugConfig,CheckGlError,android/opengl/GLDebugHelper.CONFIG_CHECK_GL_ERROR,1
+10,Android.Opengl.GLDebugConfig,CheckThread,android/opengl/GLDebugHelper.CONFIG_CHECK_THREAD,2
+10,Android.Opengl.GLDebugConfig,LogArgumentNames,android/opengl/GLDebugHelper.CONFIG_LOG_ARGUMENT_NAMES,4
+10,Android.Opengl.DebugFlags,CheckGlError,android/opengl/GLSurfaceView.DEBUG_CHECK_GL_ERROR,1
+10,Android.Opengl.DebugFlags,LogGlCalls,android/opengl/GLSurfaceView.DEBUG_LOG_GL_CALLS,2
+10,Android.Opengl.Rendermode,Continuously,android/opengl/GLSurfaceView.RENDERMODE_CONTINUOUSLY,1
+10,Android.Opengl.Rendermode,WhenDirty,android/opengl/GLSurfaceView.RENDERMODE_WHEN_DIRTY,0
+15,Android.OS.BatteryHealth,Cold,android/os/BatteryManager.BATTERY_HEALTH_COLD,7
+10,Android.OS.BatteryHealth,Dead,android/os/BatteryManager.BATTERY_HEALTH_DEAD,4
+10,Android.OS.BatteryHealth,Good,android/os/BatteryManager.BATTERY_HEALTH_GOOD,2
+10,Android.OS.BatteryHealth,OverVoltage,android/os/BatteryManager.BATTERY_HEALTH_OVER_VOLTAGE,5
+10,Android.OS.BatteryHealth,Overheat,android/os/BatteryManager.BATTERY_HEALTH_OVERHEAT,3
+10,Android.OS.BatteryHealth,Unknown,android/os/BatteryManager.BATTERY_HEALTH_UNKNOWN,1
+10,Android.OS.BatteryHealth,UnspecifiedFailure,android/os/BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE,6
+10,Android.OS.BatteryPlugged,Ac,android/os/BatteryManager.BATTERY_PLUGGED_AC,1
+10,Android.OS.BatteryPlugged,Usb,android/os/BatteryManager.BATTERY_PLUGGED_USB,2
 17,Android.OS.BatteryPlugged,Wireless,android/os/BatteryManager.BATTERY_PLUGGED_WIRELESS,4
 21,Android.OS.BatteryProperty,Capacity,android/os/BatteryManager.BATTERY_PROPERTY_CAPACITY,4
 21,Android.OS.BatteryProperty,ChargeCounter,android/os/BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER,1
@@ -4227,26 +4225,26 @@
 21,Android.OS.BatteryProperty,CurrentNow,android/os/BatteryManager.BATTERY_PROPERTY_CURRENT_NOW,2
 21,Android.OS.BatteryProperty,EnergyCounter,android/os/BatteryManager.BATTERY_PROPERTY_ENERGY_COUNTER,5
 26,Android.OS.BatteryProperty,Status,android/os/BatteryManager.BATTERY_PROPERTY_STATUS,6
-1,Android.OS.BatteryStatus,Charging,android/os/BatteryManager.BATTERY_STATUS_CHARGING,2
-1,Android.OS.BatteryStatus,Discharging,android/os/BatteryManager.BATTERY_STATUS_DISCHARGING,3
-1,Android.OS.BatteryStatus,Full,android/os/BatteryManager.BATTERY_STATUS_FULL,5
-1,Android.OS.BatteryStatus,NotCharging,android/os/BatteryManager.BATTERY_STATUS_NOT_CHARGING,4
-1,Android.OS.BatteryStatus,Unknown,android/os/BatteryManager.BATTERY_STATUS_UNKNOWN,1
-4,Android.OS.BuildVersionCodes,Base,android/os/Build$VERSION_CODES.BASE,1
-4,Android.OS.BuildVersionCodes,Base11,android/os/Build$VERSION_CODES.BASE_1_1,2
-4,Android.OS.BuildVersionCodes,Cupcake,android/os/Build$VERSION_CODES.CUPCAKE,3
-4,Android.OS.BuildVersionCodes,CurDevelopment,android/os/Build$VERSION_CODES.CUR_DEVELOPMENT,10000
-4,Android.OS.BuildVersionCodes,Donut,android/os/Build$VERSION_CODES.DONUT,4
-5,Android.OS.BuildVersionCodes,Eclair,android/os/Build$VERSION_CODES.ECLAIR,5
-6,Android.OS.BuildVersionCodes,Eclair01,android/os/Build$VERSION_CODES.ECLAIR_0_1,6
-7,Android.OS.BuildVersionCodes,EclairMr1,android/os/Build$VERSION_CODES.ECLAIR_MR1,7
-8,Android.OS.BuildVersionCodes,Froyo,android/os/Build$VERSION_CODES.FROYO,8
-9,Android.OS.BuildVersionCodes,Gingerbread,android/os/Build$VERSION_CODES.GINGERBREAD,9
+10,Android.OS.BatteryStatus,Charging,android/os/BatteryManager.BATTERY_STATUS_CHARGING,2
+10,Android.OS.BatteryStatus,Discharging,android/os/BatteryManager.BATTERY_STATUS_DISCHARGING,3
+10,Android.OS.BatteryStatus,Full,android/os/BatteryManager.BATTERY_STATUS_FULL,5
+10,Android.OS.BatteryStatus,NotCharging,android/os/BatteryManager.BATTERY_STATUS_NOT_CHARGING,4
+10,Android.OS.BatteryStatus,Unknown,android/os/BatteryManager.BATTERY_STATUS_UNKNOWN,1
+10,Android.OS.BuildVersionCodes,Base,android/os/Build$VERSION_CODES.BASE,1
+10,Android.OS.BuildVersionCodes,Base11,android/os/Build$VERSION_CODES.BASE_1_1,2
+10,Android.OS.BuildVersionCodes,Cupcake,android/os/Build$VERSION_CODES.CUPCAKE,3
+10,Android.OS.BuildVersionCodes,CurDevelopment,android/os/Build$VERSION_CODES.CUR_DEVELOPMENT,10000
+10,Android.OS.BuildVersionCodes,Donut,android/os/Build$VERSION_CODES.DONUT,4
+10,Android.OS.BuildVersionCodes,Eclair,android/os/Build$VERSION_CODES.ECLAIR,5
+10,Android.OS.BuildVersionCodes,Eclair01,android/os/Build$VERSION_CODES.ECLAIR_0_1,6
+10,Android.OS.BuildVersionCodes,EclairMr1,android/os/Build$VERSION_CODES.ECLAIR_MR1,7
+10,Android.OS.BuildVersionCodes,Froyo,android/os/Build$VERSION_CODES.FROYO,8
+10,Android.OS.BuildVersionCodes,Gingerbread,android/os/Build$VERSION_CODES.GINGERBREAD,9
 10,Android.OS.BuildVersionCodes,GingerbreadMr1,android/os/Build$VERSION_CODES.GINGERBREAD_MR1,10
-11,Android.OS.BuildVersionCodes,Honeycomb,android/os/Build$VERSION_CODES.HONEYCOMB,11
-12,Android.OS.BuildVersionCodes,HoneycombMr1,android/os/Build$VERSION_CODES.HONEYCOMB_MR1,12
-13,Android.OS.BuildVersionCodes,HoneycombMr2,android/os/Build$VERSION_CODES.HONEYCOMB_MR2,13
-14,Android.OS.BuildVersionCodes,IceCreamSandwich,android/os/Build$VERSION_CODES.ICE_CREAM_SANDWICH,14
+15,Android.OS.BuildVersionCodes,Honeycomb,android/os/Build$VERSION_CODES.HONEYCOMB,11
+15,Android.OS.BuildVersionCodes,HoneycombMr1,android/os/Build$VERSION_CODES.HONEYCOMB_MR1,12
+15,Android.OS.BuildVersionCodes,HoneycombMr2,android/os/Build$VERSION_CODES.HONEYCOMB_MR2,13
+15,Android.OS.BuildVersionCodes,IceCreamSandwich,android/os/Build$VERSION_CODES.ICE_CREAM_SANDWICH,14
 15,Android.OS.BuildVersionCodes,IceCreamSandwichMr1,android/os/Build$VERSION_CODES.ICE_CREAM_SANDWICH_MR1,15
 16,Android.OS.BuildVersionCodes,JellyBean,android/os/Build$VERSION_CODES.JELLY_BEAN,16
 17,Android.OS.BuildVersionCodes,JellyBeanMr1,android/os/Build$VERSION_CODES.JELLY_BEAN_MR1,17
@@ -4259,28 +4257,29 @@
 24,Android.OS.BuildVersionCodes,N,android/os/Build$VERSION_CODES.N,24
 25,Android.OS.BuildVersionCodes,NMr1,android/os/Build$VERSION_CODES.N_MR1,25
 26,Android.OS.BuildVersionCodes,O,android/os/Build$VERSION_CODES.O,26
+27,Android.OS.BuildVersionCodes,OMr1,android/os/Build$VERSION_CODES.O_MR1,27
 0,Android.OS.DebugShow,Default,,0
-1,Android.OS.DebugShow,Classloader,android/os/Debug.SHOW_CLASSLOADER,2
-1,Android.OS.DebugShow,FullDetail,android/os/Debug.SHOW_FULL_DETAIL,1
-1,Android.OS.DebugShow,Initialized,android/os/Debug.SHOW_INITIALIZED,4
+10,Android.OS.DebugShow,Classloader,android/os/Debug.SHOW_CLASSLOADER,2
+10,Android.OS.DebugShow,FullDetail,android/os/Debug.SHOW_FULL_DETAIL,1
+10,Android.OS.DebugShow,Initialized,android/os/Debug.SHOW_INITIALIZED,4
 0,Android.OS.DebugTraceOptions,None,,0
-1,Android.OS.DebugTraceOptions,CountAllocs,android/os/Debug.TRACE_COUNT_ALLOCS,1
+10,Android.OS.DebugTraceOptions,CountAllocs,android/os/Debug.TRACE_COUNT_ALLOCS,1
 0,Android.OS.DropBoxManagerFlags,None,,0
-8,Android.OS.DropBoxManagerFlags,IsEmpty,android/os/DropBoxManager.IS_EMPTY,1
-8,Android.OS.DropBoxManagerFlags,IsGzipped,android/os/DropBoxManager.IS_GZIPPED,4
-8,Android.OS.DropBoxManagerFlags,IsText,android/os/DropBoxManager.IS_TEXT,2
+10,Android.OS.DropBoxManagerFlags,IsEmpty,android/os/DropBoxManager.IS_EMPTY,1
+10,Android.OS.DropBoxManagerFlags,IsGzipped,android/os/DropBoxManager.IS_GZIPPED,4
+10,Android.OS.DropBoxManagerFlags,IsText,android/os/DropBoxManager.IS_TEXT,2
 0,Android.OS.TransactionFlags,None,,0
-1,Android.OS.TransactionFlags,Oneway,I:android/os/IBinder.FLAG_ONEWAY,1
+10,Android.OS.TransactionFlags,Oneway,I:android/os/IBinder.FLAG_ONEWAY,1
 0,Android.OS.ParcelableWriteFlags,None,,0
-1,Android.OS.ParcelableWriteFlags,ReturnValue,I:android/os/Parcelable.PARCELABLE_WRITE_RETURN_VALUE,1
-9,Android.OS.Storage.ObbError,AlreadyMounted,android/os/storage/OnObbStateChangeListener.ERROR_ALREADY_MOUNTED,24
-9,Android.OS.Storage.ObbError,CouldNotMount,android/os/storage/OnObbStateChangeListener.ERROR_COULD_NOT_MOUNT,21
-9,Android.OS.Storage.ObbError,CouldNotUnmount,android/os/storage/OnObbStateChangeListener.ERROR_COULD_NOT_UNMOUNT,22
-9,Android.OS.Storage.ObbError,Internal,android/os/storage/OnObbStateChangeListener.ERROR_INTERNAL,20
-9,Android.OS.Storage.ObbError,NotMounted,android/os/storage/OnObbStateChangeListener.ERROR_NOT_MOUNTED,23
-9,Android.OS.Storage.ObbError,PermissionDenied,android/os/storage/OnObbStateChangeListener.ERROR_PERMISSION_DENIED,25
-9,Android.OS.Storage.ObbState,Mounted,android/os/storage/OnObbStateChangeListener.MOUNTED,1
-9,Android.OS.Storage.ObbState,Unmounted,android/os/storage/OnObbStateChangeListener.UNMOUNTED,2
+10,Android.OS.ParcelableWriteFlags,ReturnValue,I:android/os/Parcelable.PARCELABLE_WRITE_RETURN_VALUE,1
+10,Android.OS.Storage.ObbError,AlreadyMounted,android/os/storage/OnObbStateChangeListener.ERROR_ALREADY_MOUNTED,24
+10,Android.OS.Storage.ObbError,CouldNotMount,android/os/storage/OnObbStateChangeListener.ERROR_COULD_NOT_MOUNT,21
+10,Android.OS.Storage.ObbError,CouldNotUnmount,android/os/storage/OnObbStateChangeListener.ERROR_COULD_NOT_UNMOUNT,22
+10,Android.OS.Storage.ObbError,Internal,android/os/storage/OnObbStateChangeListener.ERROR_INTERNAL,20
+10,Android.OS.Storage.ObbError,NotMounted,android/os/storage/OnObbStateChangeListener.ERROR_NOT_MOUNTED,23
+10,Android.OS.Storage.ObbError,PermissionDenied,android/os/storage/OnObbStateChangeListener.ERROR_PERMISSION_DENIED,25
+10,Android.OS.Storage.ObbState,Mounted,android/os/storage/OnObbStateChangeListener.MOUNTED,1
+10,Android.OS.Storage.ObbState,Unmounted,android/os/storage/OnObbStateChangeListener.UNMOUNTED,2
 19,Android.Print.PrintColorMode,Color,android/print/PrintAttributes.COLOR_MODE_COLOR,2
 19,Android.Print.PrintColorMode,Monochrome,android/print/PrintAttributes.COLOR_MODE_MONOCHROME,1
 19,Android.Print.PrintContentType,Document,android/print/PrintDocumentInfo.CONTENT_TYPE_DOCUMENT,0
@@ -4296,98 +4295,98 @@
 19,Android.Print.PrinterStatus,Busy,android/print/PrinterInfo.STATUS_BUSY,2
 19,Android.Print.PrinterStatus,Idle,android/print/PrinterInfo.STATUS_IDLE,1
 19,Android.Print.PrinterStatus,Unavailable,android/print/PrinterInfo.STATUS_UNAVAILABLE,3
-14,Android.Provider.CalendarAttendeesStatus,Accepted,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_ACCEPTED,1
-14,Android.Provider.CalendarAttendeesStatus,Declined,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_DECLINED,2
-14,Android.Provider.CalendarAttendeesStatus,Invited,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_INVITED,3
-14,Android.Provider.CalendarAttendeesStatus,None,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_NONE,0
-14,Android.Provider.CalendarAttendeesStatus,Tentative,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_TENTATIVE,4
-14,Android.Provider.CalendarAttendeesRelationship,Attendee,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_ATTENDEE,1
-14,Android.Provider.CalendarAttendeesRelationship,None,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_NONE,0
-14,Android.Provider.CalendarAttendeesRelationship,Organizer,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_ORGANIZER,2
-14,Android.Provider.CalendarAttendeesRelationship,Performer,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_PERFORMER,3
-14,Android.Provider.CalendarAttendeesRelationship,Speaker,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_SPEAKER,4
-14,Android.Provider.CalendarAttendeesColumn,None,I:android/provider/CalendarContract$AttendeesColumns.TYPE_NONE,0
-14,Android.Provider.CalendarAttendeesColumn,Optional,I:android/provider/CalendarContract$AttendeesColumns.TYPE_OPTIONAL,2
-14,Android.Provider.CalendarAttendeesColumn,Required,I:android/provider/CalendarContract$AttendeesColumns.TYPE_REQUIRED,1
+15,Android.Provider.CalendarAttendeesStatus,Accepted,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_ACCEPTED,1
+15,Android.Provider.CalendarAttendeesStatus,Declined,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_DECLINED,2
+15,Android.Provider.CalendarAttendeesStatus,Invited,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_INVITED,3
+15,Android.Provider.CalendarAttendeesStatus,None,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_NONE,0
+15,Android.Provider.CalendarAttendeesStatus,Tentative,I:android/provider/CalendarContract$AttendeesColumns.ATTENDEE_STATUS_TENTATIVE,4
+15,Android.Provider.CalendarAttendeesRelationship,Attendee,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_ATTENDEE,1
+15,Android.Provider.CalendarAttendeesRelationship,None,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_NONE,0
+15,Android.Provider.CalendarAttendeesRelationship,Organizer,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_ORGANIZER,2
+15,Android.Provider.CalendarAttendeesRelationship,Performer,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_PERFORMER,3
+15,Android.Provider.CalendarAttendeesRelationship,Speaker,I:android/provider/CalendarContract$AttendeesColumns.RELATIONSHIP_SPEAKER,4
+15,Android.Provider.CalendarAttendeesColumn,None,I:android/provider/CalendarContract$AttendeesColumns.TYPE_NONE,0
+15,Android.Provider.CalendarAttendeesColumn,Optional,I:android/provider/CalendarContract$AttendeesColumns.TYPE_OPTIONAL,2
+15,Android.Provider.CalendarAttendeesColumn,Required,I:android/provider/CalendarContract$AttendeesColumns.TYPE_REQUIRED,1
 15,Android.Provider.CalendarAttendeesColumn,Resource,I:android/provider/CalendarContract$AttendeesColumns.TYPE_RESOURCE,3
-14,Android.Provider.CalendarAlertsState,Dismissed,I:android/provider/CalendarContract$CalendarAlertsColumns.STATE_DISMISSED,2
-14,Android.Provider.CalendarAlertsState,Fired,I:android/provider/CalendarContract$CalendarAlertsColumns.STATE_FIRED,1
-14,Android.Provider.CalendarAlertsState,Scheduled,I:android/provider/CalendarContract$CalendarAlertsColumns.STATE_SCHEDULED,0
-14,Android.Provider.CalendarAccess,AccessContributor,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_CONTRIBUTOR,500
-14,Android.Provider.CalendarAccess,AccessEditor,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_EDITOR,600
-14,Android.Provider.CalendarAccess,AccessFreebusy,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_FREEBUSY,100
-14,Android.Provider.CalendarAccess,AccessNone,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_NONE,0
-14,Android.Provider.CalendarAccess,AccessOverride,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_OVERRIDE,400
-14,Android.Provider.CalendarAccess,AccessOwner,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_OWNER,700
-14,Android.Provider.CalendarAccess,AccessRead,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_READ,200
-14,Android.Provider.CalendarAccess,AccessRespond,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_RESPOND,300
-14,Android.Provider.CalendarAccess,AccessRoot,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_ROOT,800
+15,Android.Provider.CalendarAlertsState,Dismissed,I:android/provider/CalendarContract$CalendarAlertsColumns.STATE_DISMISSED,2
+15,Android.Provider.CalendarAlertsState,Fired,I:android/provider/CalendarContract$CalendarAlertsColumns.STATE_FIRED,1
+15,Android.Provider.CalendarAlertsState,Scheduled,I:android/provider/CalendarContract$CalendarAlertsColumns.STATE_SCHEDULED,0
+15,Android.Provider.CalendarAccess,AccessContributor,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_CONTRIBUTOR,500
+15,Android.Provider.CalendarAccess,AccessEditor,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_EDITOR,600
+15,Android.Provider.CalendarAccess,AccessFreebusy,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_FREEBUSY,100
+15,Android.Provider.CalendarAccess,AccessNone,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_NONE,0
+15,Android.Provider.CalendarAccess,AccessOverride,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_OVERRIDE,400
+15,Android.Provider.CalendarAccess,AccessOwner,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_OWNER,700
+15,Android.Provider.CalendarAccess,AccessRead,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_READ,200
+15,Android.Provider.CalendarAccess,AccessRespond,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_RESPOND,300
+15,Android.Provider.CalendarAccess,AccessRoot,I:android/provider/CalendarContract$CalendarColumns.CAL_ACCESS_ROOT,800
 15,Android.Provider.CalendarColoredTypes,Calendar,I:android/provider/CalendarContract$ColorsColumns.TYPE_CALENDAR,0
 15,Android.Provider.CalendarColoredTypes,Event,I:android/provider/CalendarContract$ColorsColumns.TYPE_EVENT,1
-14,Android.Provider.EventsAccess,Confidential,I:android/provider/CalendarContract$EventsColumns.ACCESS_CONFIDENTIAL,1
-14,Android.Provider.EventsAccess,Default,I:android/provider/CalendarContract$EventsColumns.ACCESS_DEFAULT,0
-14,Android.Provider.EventsAccess,Private,I:android/provider/CalendarContract$EventsColumns.ACCESS_PRIVATE,2
-14,Android.Provider.EventsAccess,Public,I:android/provider/CalendarContract$EventsColumns.ACCESS_PUBLIC,3
-14,Android.Provider.EventsAvailability,Busy,I:android/provider/CalendarContract$EventsColumns.AVAILABILITY_BUSY,0
-14,Android.Provider.EventsAvailability,Free,I:android/provider/CalendarContract$EventsColumns.AVAILABILITY_FREE,1
+15,Android.Provider.EventsAccess,Confidential,I:android/provider/CalendarContract$EventsColumns.ACCESS_CONFIDENTIAL,1
+15,Android.Provider.EventsAccess,Default,I:android/provider/CalendarContract$EventsColumns.ACCESS_DEFAULT,0
+15,Android.Provider.EventsAccess,Private,I:android/provider/CalendarContract$EventsColumns.ACCESS_PRIVATE,2
+15,Android.Provider.EventsAccess,Public,I:android/provider/CalendarContract$EventsColumns.ACCESS_PUBLIC,3
+15,Android.Provider.EventsAvailability,Busy,I:android/provider/CalendarContract$EventsColumns.AVAILABILITY_BUSY,0
+15,Android.Provider.EventsAvailability,Free,I:android/provider/CalendarContract$EventsColumns.AVAILABILITY_FREE,1
 15,Android.Provider.EventsAvailability,Tentative,I:android/provider/CalendarContract$EventsColumns.AVAILABILITY_TENTATIVE,2
-14,Android.Provider.EventsStatus,Canceled,I:android/provider/CalendarContract$EventsColumns.STATUS_CANCELED,2
-14,Android.Provider.EventsStatus,Confirmed,I:android/provider/CalendarContract$EventsColumns.STATUS_CONFIRMED,1
-14,Android.Provider.EventsStatus,Tentative,I:android/provider/CalendarContract$EventsColumns.STATUS_TENTATIVE,0
+15,Android.Provider.EventsStatus,Canceled,I:android/provider/CalendarContract$EventsColumns.STATUS_CANCELED,2
+15,Android.Provider.EventsStatus,Confirmed,I:android/provider/CalendarContract$EventsColumns.STATUS_CONFIRMED,1
+15,Android.Provider.EventsStatus,Tentative,I:android/provider/CalendarContract$EventsColumns.STATUS_TENTATIVE,0
 16,Android.Provider.RemindersMethod,Alarm,I:android/provider/CalendarContract$RemindersColumns.METHOD_ALARM,4
-14,Android.Provider.RemindersMethod,Alert,I:android/provider/CalendarContract$RemindersColumns.METHOD_ALERT,1
-14,Android.Provider.RemindersMethod,Default,I:android/provider/CalendarContract$RemindersColumns.METHOD_DEFAULT,0
-14,Android.Provider.RemindersMethod,Email,I:android/provider/CalendarContract$RemindersColumns.METHOD_EMAIL,2
-14,Android.Provider.RemindersMethod,Sms,I:android/provider/CalendarContract$RemindersColumns.METHOD_SMS,3
+15,Android.Provider.RemindersMethod,Alert,I:android/provider/CalendarContract$RemindersColumns.METHOD_ALERT,1
+15,Android.Provider.RemindersMethod,Default,I:android/provider/CalendarContract$RemindersColumns.METHOD_DEFAULT,0
+15,Android.Provider.RemindersMethod,Email,I:android/provider/CalendarContract$RemindersColumns.METHOD_EMAIL,2
+15,Android.Provider.RemindersMethod,Sms,I:android/provider/CalendarContract$RemindersColumns.METHOD_SMS,3
 19,Android.Provider.CallerPresentation,Allowed,android/provider/CallLog.Calls.PRESENTATION_ALLOWED,1
 19,Android.Provider.CallerPresentation,Payphone,android/provider/CallLog.Calls.PRESENTATION_PAYPHONE,4
 19,Android.Provider.CallerPresentation,Restricted,android/provider/CallLog.Calls.PRESENTATION_RESTRICTED,2
 19,Android.Provider.CallerPresentation,Unknown,android/provider/CallLog.Calls.PRESENTATION_UNKNOWN,3
-8,Android.Provider.ContactPresenceStatus,Available,I:android/provider/Contacts$PresenceColumns.AVAILABLE,5
-8,Android.Provider.ContactPresenceStatus,Away,I:android/provider/Contacts$PresenceColumns.AWAY,2
-8,Android.Provider.ContactPresenceStatus,DoNotDisturb,I:android/provider/Contacts$PresenceColumns.DO_NOT_DISTURB,4
-8,Android.Provider.ContactPresenceStatus,Idle,I:android/provider/Contacts$PresenceColumns.IDLE,3
-8,Android.Provider.ContactPresenceStatus,Invisible,I:android/provider/Contacts$PresenceColumns.INVISIBLE,1
-8,Android.Provider.ContactPresenceStatus,Offline,I:android/provider/Contacts$PresenceColumns.OFFLINE,0
-9,Android.Provider.SipAddressDataKind,Home,android/provider/ContactsContract$CommonDataKinds$SipAddress.TYPE_HOME,1
-9,Android.Provider.SipAddressDataKind,Other,android/provider/ContactsContract$CommonDataKinds$SipAddress.TYPE_OTHER,3
-9,Android.Provider.SipAddressDataKind,Work,android/provider/ContactsContract$CommonDataKinds$SipAddress.TYPE_WORK,2
-11,Android.Provider.ExportSupport,AnyAccount,android/provider/ContactsContract$Directory.EXPORT_SUPPORT_ANY_ACCOUNT,2
-11,Android.Provider.ExportSupport,None,android/provider/ContactsContract$Directory.EXPORT_SUPPORT_NONE,0
-11,Android.Provider.ExportSupport,SameAccountOnly,android/provider/ContactsContract$Directory.EXPORT_SUPPORT_SAME_ACCOUNT_ONLY,1
-11,Android.Provider.PhotoSupport,Full,android/provider/ContactsContract$Directory.PHOTO_SUPPORT_FULL,3
-11,Android.Provider.PhotoSupport,FullSizeOnly,android/provider/ContactsContract$Directory.PHOTO_SUPPORT_FULL_SIZE_ONLY,2
-11,Android.Provider.PhotoSupport,None,android/provider/ContactsContract$Directory.PHOTO_SUPPORT_NONE,0
-11,Android.Provider.PhotoSupport,ThumbnailOnly,android/provider/ContactsContract$Directory.PHOTO_SUPPORT_THUMBNAIL_ONLY,1
-11,Android.Provider.ShortcutSupport,DataItemsOnly,android/provider/ContactsContract$Directory.SHORTCUT_SUPPORT_DATA_ITEMS_ONLY,1
-11,Android.Provider.ShortcutSupport,Full,android/provider/ContactsContract$Directory.SHORTCUT_SUPPORT_FULL,2
-11,Android.Provider.ShortcutSupport,None,android/provider/ContactsContract$Directory.SHORTCUT_SUPPORT_NONE,0
-8,Android.Provider.StatusPresence,Available,I:android/provider/ContactsContract$StatusColumns.AVAILABLE,5
-8,Android.Provider.StatusPresence,Away,I:android/provider/ContactsContract$StatusColumns.AWAY,2
-8,Android.Provider.StatusPresence,DoNotDisturb,I:android/provider/ContactsContract$StatusColumns.DO_NOT_DISTURB,4
-8,Android.Provider.StatusPresence,Idle,I:android/provider/ContactsContract$StatusColumns.IDLE,3
-8,Android.Provider.StatusPresence,Invisible,I:android/provider/ContactsContract$StatusColumns.INVISIBLE,1
-8,Android.Provider.StatusPresence,Offline,I:android/provider/ContactsContract$StatusColumns.OFFLINE,0
-11,Android.Provider.ChatCapability,HasCamera,I:android/provider/ContactsContract$StatusColumns.CAPABILITY_HAS_CAMERA,4
-11,Android.Provider.ChatCapability,HasVideo,I:android/provider/ContactsContract$StatusColumns.CAPABILITY_HAS_VIDEO,2
-11,Android.Provider.ChatCapability,HasVoice,I:android/provider/ContactsContract$StatusColumns.CAPABILITY_HAS_VOICE,1
-11,Android.Provider.DisplayNameSources,Email,I:android/provider/ContactsContract$DisplayNameSources.EMAIL,10
-11,Android.Provider.DisplayNameSources,Nickname,I:android/provider/ContactsContract$DisplayNameSources.NICKNAME,35
-11,Android.Provider.DisplayNameSources,Organization,I:android/provider/ContactsContract$DisplayNameSources.ORGANIZATION,30
-11,Android.Provider.DisplayNameSources,Phone,I:android/provider/ContactsContract$DisplayNameSources.PHONE,20
-11,Android.Provider.DisplayNameSources,StructuredName,I:android/provider/ContactsContract$DisplayNameSources.STRUCTURED_NAME,40
+10,Android.Provider.ContactPresenceStatus,Available,I:android/provider/Contacts$PresenceColumns.AVAILABLE,5
+10,Android.Provider.ContactPresenceStatus,Away,I:android/provider/Contacts$PresenceColumns.AWAY,2
+10,Android.Provider.ContactPresenceStatus,DoNotDisturb,I:android/provider/Contacts$PresenceColumns.DO_NOT_DISTURB,4
+10,Android.Provider.ContactPresenceStatus,Idle,I:android/provider/Contacts$PresenceColumns.IDLE,3
+10,Android.Provider.ContactPresenceStatus,Invisible,I:android/provider/Contacts$PresenceColumns.INVISIBLE,1
+10,Android.Provider.ContactPresenceStatus,Offline,I:android/provider/Contacts$PresenceColumns.OFFLINE,0
+10,Android.Provider.SipAddressDataKind,Home,android/provider/ContactsContract$CommonDataKinds$SipAddress.TYPE_HOME,1
+10,Android.Provider.SipAddressDataKind,Other,android/provider/ContactsContract$CommonDataKinds$SipAddress.TYPE_OTHER,3
+10,Android.Provider.SipAddressDataKind,Work,android/provider/ContactsContract$CommonDataKinds$SipAddress.TYPE_WORK,2
+15,Android.Provider.ExportSupport,AnyAccount,android/provider/ContactsContract$Directory.EXPORT_SUPPORT_ANY_ACCOUNT,2
+15,Android.Provider.ExportSupport,None,android/provider/ContactsContract$Directory.EXPORT_SUPPORT_NONE,0
+15,Android.Provider.ExportSupport,SameAccountOnly,android/provider/ContactsContract$Directory.EXPORT_SUPPORT_SAME_ACCOUNT_ONLY,1
+15,Android.Provider.PhotoSupport,Full,android/provider/ContactsContract$Directory.PHOTO_SUPPORT_FULL,3
+15,Android.Provider.PhotoSupport,FullSizeOnly,android/provider/ContactsContract$Directory.PHOTO_SUPPORT_FULL_SIZE_ONLY,2
+15,Android.Provider.PhotoSupport,None,android/provider/ContactsContract$Directory.PHOTO_SUPPORT_NONE,0
+15,Android.Provider.PhotoSupport,ThumbnailOnly,android/provider/ContactsContract$Directory.PHOTO_SUPPORT_THUMBNAIL_ONLY,1
+15,Android.Provider.ShortcutSupport,DataItemsOnly,android/provider/ContactsContract$Directory.SHORTCUT_SUPPORT_DATA_ITEMS_ONLY,1
+15,Android.Provider.ShortcutSupport,Full,android/provider/ContactsContract$Directory.SHORTCUT_SUPPORT_FULL,2
+15,Android.Provider.ShortcutSupport,None,android/provider/ContactsContract$Directory.SHORTCUT_SUPPORT_NONE,0
+10,Android.Provider.StatusPresence,Available,I:android/provider/ContactsContract$StatusColumns.AVAILABLE,5
+10,Android.Provider.StatusPresence,Away,I:android/provider/ContactsContract$StatusColumns.AWAY,2
+10,Android.Provider.StatusPresence,DoNotDisturb,I:android/provider/ContactsContract$StatusColumns.DO_NOT_DISTURB,4
+10,Android.Provider.StatusPresence,Idle,I:android/provider/ContactsContract$StatusColumns.IDLE,3
+10,Android.Provider.StatusPresence,Invisible,I:android/provider/ContactsContract$StatusColumns.INVISIBLE,1
+10,Android.Provider.StatusPresence,Offline,I:android/provider/ContactsContract$StatusColumns.OFFLINE,0
+15,Android.Provider.ChatCapability,HasCamera,I:android/provider/ContactsContract$StatusColumns.CAPABILITY_HAS_CAMERA,4
+15,Android.Provider.ChatCapability,HasVideo,I:android/provider/ContactsContract$StatusColumns.CAPABILITY_HAS_VIDEO,2
+15,Android.Provider.ChatCapability,HasVoice,I:android/provider/ContactsContract$StatusColumns.CAPABILITY_HAS_VOICE,1
+15,Android.Provider.DisplayNameSources,Email,I:android/provider/ContactsContract$DisplayNameSources.EMAIL,10
+15,Android.Provider.DisplayNameSources,Nickname,I:android/provider/ContactsContract$DisplayNameSources.NICKNAME,35
+15,Android.Provider.DisplayNameSources,Organization,I:android/provider/ContactsContract$DisplayNameSources.ORGANIZATION,30
+15,Android.Provider.DisplayNameSources,Phone,I:android/provider/ContactsContract$DisplayNameSources.PHONE,20
+15,Android.Provider.DisplayNameSources,StructuredName,I:android/provider/ContactsContract$DisplayNameSources.STRUCTURED_NAME,40
 23,Android.Provider.DisplayNameSources,StructuredPhoneticName,I:android/provider/ContactsContract$DisplayNameSources.STRUCTURED_PHONETIC_NAME,37
-11,Android.Provider.DisplayNameSources,Undefined,I:android/provider/ContactsContract$DisplayNameSources.UNDEFINED,0
-11,Android.Provider.FullNameStyle,Chinese,I:android/provider/ContactsContract$FullNameStyle.CHINESE,3
-11,Android.Provider.FullNameStyle,Cjk,I:android/provider/ContactsContract$FullNameStyle.CJK,2
-11,Android.Provider.FullNameStyle,Japanese,I:android/provider/ContactsContract$FullNameStyle.JAPANESE,4
-11,Android.Provider.FullNameStyle,Korean,I:android/provider/ContactsContract$FullNameStyle.KOREAN,5
-11,Android.Provider.FullNameStyle,Undefined,I:android/provider/ContactsContract$FullNameStyle.UNDEFINED,0
-11,Android.Provider.FullNameStyle,Western,I:android/provider/ContactsContract$FullNameStyle.WESTERN,1
-11,Android.Provider.PhoneticNameStyle,Japanese,I:android/provider/ContactsContract$PhoneticNameStyle.JAPANESE,4
-11,Android.Provider.PhoneticNameStyle,Korean,I:android/provider/ContactsContract$PhoneticNameStyle.KOREAN,5
-11,Android.Provider.PhoneticNameStyle,Pinyin,I:android/provider/ContactsContract$PhoneticNameStyle.PINYIN,3
-11,Android.Provider.PhoneticNameStyle,Undefined,I:android/provider/ContactsContract$PhoneticNameStyle.UNDEFINED,0
+15,Android.Provider.DisplayNameSources,Undefined,I:android/provider/ContactsContract$DisplayNameSources.UNDEFINED,0
+15,Android.Provider.FullNameStyle,Chinese,I:android/provider/ContactsContract$FullNameStyle.CHINESE,3
+15,Android.Provider.FullNameStyle,Cjk,I:android/provider/ContactsContract$FullNameStyle.CJK,2
+15,Android.Provider.FullNameStyle,Japanese,I:android/provider/ContactsContract$FullNameStyle.JAPANESE,4
+15,Android.Provider.FullNameStyle,Korean,I:android/provider/ContactsContract$FullNameStyle.KOREAN,5
+15,Android.Provider.FullNameStyle,Undefined,I:android/provider/ContactsContract$FullNameStyle.UNDEFINED,0
+15,Android.Provider.FullNameStyle,Western,I:android/provider/ContactsContract$FullNameStyle.WESTERN,1
+15,Android.Provider.PhoneticNameStyle,Japanese,I:android/provider/ContactsContract$PhoneticNameStyle.JAPANESE,4
+15,Android.Provider.PhoneticNameStyle,Korean,I:android/provider/ContactsContract$PhoneticNameStyle.KOREAN,5
+15,Android.Provider.PhoneticNameStyle,Pinyin,I:android/provider/ContactsContract$PhoneticNameStyle.PINYIN,3
+15,Android.Provider.PhoneticNameStyle,Undefined,I:android/provider/ContactsContract$PhoneticNameStyle.UNDEFINED,0
 19,Android.Provider.DocumentContractFlags,DirPrefersGrid,android/provider/DocumentsContract$Document.FLAG_DIR_PREFERS_GRID,16
 19,Android.Provider.DocumentContractFlags,DirPrefersLastModified,android/provider/DocumentsContract$Document.FLAG_DIR_PREFERS_LAST_MODIFIED,32
 19,Android.Provider.DocumentContractFlags,DirSupportsCreate,android/provider/DocumentsContract$Document.FLAG_DIR_SUPPORTS_CREATE,8
@@ -4407,23 +4406,23 @@
 21,Android.Provider.DocumentRootFlags,SupportsIsChild,android/provider/DocumentsContract$Root.FLAG_SUPPORTS_IS_CHILD,16
 19,Android.Provider.DocumentRootFlags,SupportsRecents,android/provider/DocumentsContract$Root.FLAG_SUPPORTS_RECENTS,4
 19,Android.Provider.DocumentRootFlags,SupportsSearch,android/provider/DocumentsContract$Root.FLAG_SUPPORTS_SEARCH,8
-11,Android.Provider.MediaType,Audio,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_AUDIO,2
-11,Android.Provider.MediaType,Image,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_IMAGE,1
-11,Android.Provider.MediaType,None,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_NONE,0
-11,Android.Provider.MediaType,Playlist,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_PLAYLIST,4
-11,Android.Provider.MediaType,Video,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_VIDEO,3
-5,Android.Provider.VideoThumbnailKind,FullScreenKind,android/provider/MediaStore$Video$Thumbnails.FULL_SCREEN_KIND,2
-5,Android.Provider.VideoThumbnailKind,MicroKind,android/provider/MediaStore$Video$Thumbnails.MICRO_KIND,3
-5,Android.Provider.VideoThumbnailKind,MiniKind,android/provider/MediaStore$Video$Thumbnails.MINI_KIND,1
+15,Android.Provider.MediaType,Audio,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_AUDIO,2
+15,Android.Provider.MediaType,Image,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_IMAGE,1
+15,Android.Provider.MediaType,None,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_NONE,0
+15,Android.Provider.MediaType,Playlist,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_PLAYLIST,4
+15,Android.Provider.MediaType,Video,I:android/provider/MediaStore$Files$FileColumns.MEDIA_TYPE_VIDEO,3
+10,Android.Provider.VideoThumbnailKind,FullScreenKind,android/provider/MediaStore$Video$Thumbnails.FULL_SCREEN_KIND,2
+10,Android.Provider.VideoThumbnailKind,MicroKind,android/provider/MediaStore$Video$Thumbnails.MICRO_KIND,3
+10,Android.Provider.VideoThumbnailKind,MiniKind,android/provider/MediaStore$Video$Thumbnails.MINI_KIND,1
 19,Android.Provider.SecurityLocationMode,BatterySaving,android/provider/Settings$Secure.LOCATION_MODE_BATTERY_SAVING,2
 19,Android.Provider.SecurityLocationMode,HighAccuracy,android/provider/Settings$Secure.LOCATION_MODE_HIGH_ACCURACY,3
 19,Android.Provider.SecurityLocationMode,Off,android/provider/Settings$Secure.LOCATION_MODE_OFF,0
 19,Android.Provider.SecurityLocationMode,SensorsOnly,android/provider/Settings$Secure.LOCATION_MODE_SENSORS_ONLY,1
-8,Android.Provider.ScreenBrightness,ModeAutomatic,android/provider/Settings$System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC,1
-8,Android.Provider.ScreenBrightness,ModeManual,android/provider/Settings$System.SCREEN_BRIGHTNESS_MODE_MANUAL,0
-3,Android.Provider.WifiSleepPolicy,Default,android/provider/Settings$System.WIFI_SLEEP_POLICY_DEFAULT,0
-3,Android.Provider.WifiSleepPolicy,Never,android/provider/Settings$System.WIFI_SLEEP_POLICY_NEVER,2
-3,Android.Provider.WifiSleepPolicy,NeverWhilePlugged,android/provider/Settings$System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED,1
+10,Android.Provider.ScreenBrightness,ModeAutomatic,android/provider/Settings$System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC,1
+10,Android.Provider.ScreenBrightness,ModeManual,android/provider/Settings$System.SCREEN_BRIGHTNESS_MODE_MANUAL,0
+10,Android.Provider.WifiSleepPolicy,Default,android/provider/Settings$System.WIFI_SLEEP_POLICY_DEFAULT,0
+10,Android.Provider.WifiSleepPolicy,Never,android/provider/Settings$System.WIFI_SLEEP_POLICY_NEVER,2
+10,Android.Provider.WifiSleepPolicy,NeverWhilePlugged,android/provider/Settings$System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED,1
 19,Android.Provider.MessageBoxType,All,I:android/provider/Telephony.BaseMmsColumns.MESSAGE_BOX_ALL,0
 19,Android.Provider.MessageBoxType,Drafts,I:android/provider/Telephony.BaseMmsColumns.MESSAGE_BOX_DRAFTS,3
 21,Android.Provider.MessageBoxType,Failed,I:android/provider/Telephony.BaseMmsColumns.MESSAGE_BOX_FAILED,5
@@ -4458,31 +4457,31 @@
 19,Android.Provider.SmsStatus,Pending,I:android/provider/Telephony.TextBasedSmsColumns.STATUS_PENDING,32
 19,Android.Provider.ThreadType,BroadcastThread,android/provider/Telephony.Threads.BROADCAST_THREAD,1
 19,Android.Provider.ThreadType,CommonThread,android/provider/Telephony.Threads.COMMON_THREAD,0
-14,Android.Provider.VoicemailConfigurationState,CanBeConfigured,android/provider/VoicemailContract$Status.CONFIGURATION_STATE_CAN_BE_CONFIGURED,2
+15,Android.Provider.VoicemailConfigurationState,CanBeConfigured,android/provider/VoicemailContract$Status.CONFIGURATION_STATE_CAN_BE_CONFIGURED,2
 25,Android.Provider.VoicemailConfigurationState,Configuring,android/provider/VoicemailContract$Status.CONFIGURATION_STATE_CONFIGURING,3
 25,Android.Provider.VoicemailConfigurationState,Disabled,android/provider/VoicemailContract$Status.CONFIGURATION_STATE_DISABLED,5
 25,Android.Provider.VoicemailConfigurationState,Failed,android/provider/VoicemailContract$Status.CONFIGURATION_STATE_FAILED,4
-14,Android.Provider.VoicemailConfigurationState,NotConfigured,android/provider/VoicemailContract$Status.CONFIGURATION_STATE_NOT_CONFIGURED,1
-14,Android.Provider.VoicemailConfigurationState,Ok,android/provider/VoicemailContract$Status.CONFIGURATION_STATE_OK,0
+15,Android.Provider.VoicemailConfigurationState,NotConfigured,android/provider/VoicemailContract$Status.CONFIGURATION_STATE_NOT_CONFIGURED,1
+15,Android.Provider.VoicemailConfigurationState,Ok,android/provider/VoicemailContract$Status.CONFIGURATION_STATE_OK,0
 24,Android.Provider.VoicemailDataChannelState,BadConfiguration,android/provider/VoicemailContract$Status.DATA_CHANNEL_STATE_BAD_CONFIGURATION,3
 24,Android.Provider.VoicemailDataChannelState,CommunicationError,android/provider/VoicemailContract$Status.DATA_CHANNEL_STATE_COMMUNICATION_ERROR,4
-14,Android.Provider.VoicemailDataChannelState,NoConnection,android/provider/VoicemailContract$Status.DATA_CHANNEL_STATE_NO_CONNECTION,1
+15,Android.Provider.VoicemailDataChannelState,NoConnection,android/provider/VoicemailContract$Status.DATA_CHANNEL_STATE_NO_CONNECTION,1
 24,Android.Provider.VoicemailDataChannelState,NoConnectionCellularRequired,android/provider/VoicemailContract$Status.DATA_CHANNEL_STATE_NO_CONNECTION_CELLULAR_REQUIRED,2
-14,Android.Provider.VoicemailDataChannelState,Ok,android/provider/VoicemailContract$Status.DATA_CHANNEL_STATE_OK,0
+15,Android.Provider.VoicemailDataChannelState,Ok,android/provider/VoicemailContract$Status.DATA_CHANNEL_STATE_OK,0
 24,Android.Provider.VoicemailDataChannelState,ServerConnectionError,android/provider/VoicemailContract$Status.DATA_CHANNEL_STATE_SERVER_CONNECTION_ERROR,6
 24,Android.Provider.VoicemailDataChannelState,ServerError,android/provider/VoicemailContract$Status.DATA_CHANNEL_STATE_SERVER_ERROR,5
-14,Android.Provider.VoicemailNotificationChannelState,MessageWaiting,android/provider/VoicemailContract$Status.NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING,2
-14,Android.Provider.VoicemailNotificationChannelState,NoConnection,android/provider/VoicemailContract$Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION,1
-14,Android.Provider.VoicemailNotificationChannelState,Ok,android/provider/VoicemailContract$Status.NOTIFICATION_CHANNEL_STATE_OK,0
-8,Android.Speech.SpeechRecognizerError,Audio,android/speech/SpeechRecognizer.ERROR_AUDIO,3
-8,Android.Speech.SpeechRecognizerError,Client,android/speech/SpeechRecognizer.ERROR_CLIENT,5
-8,Android.Speech.SpeechRecognizerError,InsufficientPermissions,android/speech/SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS,9
-8,Android.Speech.SpeechRecognizerError,Network,android/speech/SpeechRecognizer.ERROR_NETWORK,2
-8,Android.Speech.SpeechRecognizerError,NetworkTimeout,android/speech/SpeechRecognizer.ERROR_NETWORK_TIMEOUT,1
-8,Android.Speech.SpeechRecognizerError,NoMatch,android/speech/SpeechRecognizer.ERROR_NO_MATCH,7
-8,Android.Speech.SpeechRecognizerError,RecognizerBusy,android/speech/SpeechRecognizer.ERROR_RECOGNIZER_BUSY,8
-8,Android.Speech.SpeechRecognizerError,Server,android/speech/SpeechRecognizer.ERROR_SERVER,4
-8,Android.Speech.SpeechRecognizerError,SpeechTimeout,android/speech/SpeechRecognizer.ERROR_SPEECH_TIMEOUT,6
+15,Android.Provider.VoicemailNotificationChannelState,MessageWaiting,android/provider/VoicemailContract$Status.NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING,2
+15,Android.Provider.VoicemailNotificationChannelState,NoConnection,android/provider/VoicemailContract$Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION,1
+15,Android.Provider.VoicemailNotificationChannelState,Ok,android/provider/VoicemailContract$Status.NOTIFICATION_CHANNEL_STATE_OK,0
+10,Android.Speech.SpeechRecognizerError,Audio,android/speech/SpeechRecognizer.ERROR_AUDIO,3
+10,Android.Speech.SpeechRecognizerError,Client,android/speech/SpeechRecognizer.ERROR_CLIENT,5
+10,Android.Speech.SpeechRecognizerError,InsufficientPermissions,android/speech/SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS,9
+10,Android.Speech.SpeechRecognizerError,Network,android/speech/SpeechRecognizer.ERROR_NETWORK,2
+10,Android.Speech.SpeechRecognizerError,NetworkTimeout,android/speech/SpeechRecognizer.ERROR_NETWORK_TIMEOUT,1
+10,Android.Speech.SpeechRecognizerError,NoMatch,android/speech/SpeechRecognizer.ERROR_NO_MATCH,7
+10,Android.Speech.SpeechRecognizerError,RecognizerBusy,android/speech/SpeechRecognizer.ERROR_RECOGNIZER_BUSY,8
+10,Android.Speech.SpeechRecognizerError,Server,android/speech/SpeechRecognizer.ERROR_SERVER,4
+10,Android.Speech.SpeechRecognizerError,SpeechTimeout,android/speech/SpeechRecognizer.ERROR_SPEECH_TIMEOUT,6
 23,Android.Service.Voice.ToucheableInsetsType,Content,android/service/voice/VoiceInteractionSession.Insets.TOUCHABLE_INSETS_CONTENT,1
 23,Android.Service.Voice.ToucheableInsetsType,Frame,android/service/voice/VoiceInteractionSession.Insets.TOUCHABLE_INSETS_FRAME,0
 23,Android.Service.Voice.ToucheableInsetsType,Region,android/service/voice/VoiceInteractionSession.Insets.TOUCHABLE_INSETS_REGION,3
@@ -4490,26 +4489,26 @@
 21,Android.Telephony.IccOpenLogicalChannelResponseStatus,NoError,android/telephony/IccOpenLogicalChannelResponse.STATUS_NO_ERROR,1
 21,Android.Telephony.IccOpenLogicalChannelResponseStatus,NoSuchElement,android/telephony/IccOpenLogicalChannelResponse.STATUS_NO_SUCH_ELEMENT,3
 21,Android.Telephony.IccOpenLogicalChannelResponseStatus,UnknownError,android/telephony/IccOpenLogicalChannelResponse.STATUS_UNKNOWN_ERROR,4
-1,Android.Telephony.PhoneNumberToa,International,android/telephony/PhoneNumberUtils.TOA_International,145
-1,Android.Telephony.PhoneNumberToa,Unknown,android/telephony/PhoneNumberUtils.TOA_Unknown,129
-1,Android.Telephony.Gsm.SmsResultError,GenericFailure,android/telephony/gsm/SmsManager.RESULT_ERROR_GENERIC_FAILURE,1
-1,Android.Telephony.Gsm.SmsResultError,NoService,android/telephony/gsm/SmsManager.RESULT_ERROR_NO_SERVICE,4
-1,Android.Telephony.Gsm.SmsResultError,NullPdu,android/telephony/gsm/SmsManager.RESULT_ERROR_NULL_PDU,3
-1,Android.Telephony.Gsm.SmsResultError,RadioOff,android/telephony/gsm/SmsManager.RESULT_ERROR_RADIO_OFF,2
-1,Android.Telephony.Gsm.SmsStatusOnSim,Free,android/telephony/gsm/SmsManager.STATUS_ON_SIM_FREE,0
-1,Android.Telephony.Gsm.SmsStatusOnSim,Read,android/telephony/gsm/SmsManager.STATUS_ON_SIM_READ,1
-1,Android.Telephony.Gsm.SmsStatusOnSim,Sent,android/telephony/gsm/SmsManager.STATUS_ON_SIM_SENT,5
-1,Android.Telephony.Gsm.SmsStatusOnSim,Unread,android/telephony/gsm/SmsManager.STATUS_ON_SIM_UNREAD,3
-1,Android.Telephony.Gsm.SmsStatusOnSim,Unsent,android/telephony/gsm/SmsManager.STATUS_ON_SIM_UNSENT,7
-8,Android.Text.EastAsianWidth,AsianWidthAmbiguous,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_AMBIGUOUS,1
-8,Android.Text.EastAsianWidth,AsianWidthFullWidth,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_FULL_WIDTH,3
-8,Android.Text.EastAsianWidth,AsianWidthHalfWidth,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_HALF_WIDTH,2
-8,Android.Text.EastAsianWidth,AsianWidthNarrow,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_NARROW,4
-8,Android.Text.EastAsianWidth,AsianWidthNeutral,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_NEUTRAL,0
-8,Android.Text.EastAsianWidth,AsianWidthWide,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_WIDE,5
+10,Android.Telephony.PhoneNumberToa,International,android/telephony/PhoneNumberUtils.TOA_International,145
+10,Android.Telephony.PhoneNumberToa,Unknown,android/telephony/PhoneNumberUtils.TOA_Unknown,129
+10,Android.Telephony.Gsm.SmsResultError,GenericFailure,android/telephony/gsm/SmsManager.RESULT_ERROR_GENERIC_FAILURE,1
+10,Android.Telephony.Gsm.SmsResultError,NoService,android/telephony/gsm/SmsManager.RESULT_ERROR_NO_SERVICE,4
+10,Android.Telephony.Gsm.SmsResultError,NullPdu,android/telephony/gsm/SmsManager.RESULT_ERROR_NULL_PDU,3
+10,Android.Telephony.Gsm.SmsResultError,RadioOff,android/telephony/gsm/SmsManager.RESULT_ERROR_RADIO_OFF,2
+10,Android.Telephony.Gsm.SmsStatusOnSim,Free,android/telephony/gsm/SmsManager.STATUS_ON_SIM_FREE,0
+10,Android.Telephony.Gsm.SmsStatusOnSim,Read,android/telephony/gsm/SmsManager.STATUS_ON_SIM_READ,1
+10,Android.Telephony.Gsm.SmsStatusOnSim,Sent,android/telephony/gsm/SmsManager.STATUS_ON_SIM_SENT,5
+10,Android.Telephony.Gsm.SmsStatusOnSim,Unread,android/telephony/gsm/SmsManager.STATUS_ON_SIM_UNREAD,3
+10,Android.Telephony.Gsm.SmsStatusOnSim,Unsent,android/telephony/gsm/SmsManager.STATUS_ON_SIM_UNSENT,7
+10,Android.Text.EastAsianWidth,AsianWidthAmbiguous,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_AMBIGUOUS,1
+10,Android.Text.EastAsianWidth,AsianWidthFullWidth,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_FULL_WIDTH,3
+10,Android.Text.EastAsianWidth,AsianWidthHalfWidth,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_HALF_WIDTH,2
+10,Android.Text.EastAsianWidth,AsianWidthNarrow,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_NARROW,4
+10,Android.Text.EastAsianWidth,AsianWidthNeutral,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_NEUTRAL,0
+10,Android.Text.EastAsianWidth,AsianWidthWide,android/text/AndroidCharacter.EAST_ASIAN_WIDTH_WIDE,5
 15,Android.Text.Style.SuggestionSpanFlags,AutoCorrection,android/text/style/SuggestionSpan.FLAG_AUTO_CORRECTION,4
-14,Android.Text.Style.SuggestionSpanFlags,EasyCorrect,android/text/style/SuggestionSpan.FLAG_EASY_CORRECT,1
-14,Android.Text.Style.SuggestionSpanFlags,Misspelled,android/text/style/SuggestionSpan.FLAG_MISSPELLED,2
+15,Android.Text.Style.SuggestionSpanFlags,EasyCorrect,android/text/style/SuggestionSpan.FLAG_EASY_CORRECT,1
+15,Android.Text.Style.SuggestionSpanFlags,Misspelled,android/text/style/SuggestionSpan.FLAG_MISSPELLED,2
 19,Android.Transitions.FadingMode,In,android/transition/Fade.IN,1
 19,Android.Transitions.FadingMode,Out,android/transition/Fade.OUT,2
 21,Android.Transitions.MatchTarget,Id,android/transition/Transition.MATCH_ID,3
@@ -4518,12 +4517,12 @@
 21,Android.Transitions.MatchTarget,Name,android/transition/Transition.MATCH_NAME,2
 19,Android.Transitions.TransitionOrdering,Sequential,android/transition/TransitionSet.ORDERING_SEQUENTIAL,1
 19,Android.Transitions.TransitionOrdering,Together,android/transition/TransitionSet.ORDERING_TOGETHER,0
-8,Android.Util.Base64Flags,Crlf,android/util/Base64.CRLF,4
-8,Android.Util.Base64Flags,Default,android/util/Base64.DEFAULT,0
-8,Android.Util.Base64Flags,NoClose,android/util/Base64.NO_CLOSE,16
-8,Android.Util.Base64Flags,NoPadding,android/util/Base64.NO_PADDING,1
-8,Android.Util.Base64Flags,NoWrap,android/util/Base64.NO_WRAP,2
-8,Android.Util.Base64Flags,UrlSafe,android/util/Base64.URL_SAFE,8
+10,Android.Util.Base64Flags,Crlf,android/util/Base64.CRLF,4
+10,Android.Util.Base64Flags,Default,android/util/Base64.DEFAULT,0
+10,Android.Util.Base64Flags,NoClose,android/util/Base64.NO_CLOSE,16
+10,Android.Util.Base64Flags,NoPadding,android/util/Base64.NO_PADDING,1
+10,Android.Util.Base64Flags,NoWrap,android/util/Base64.NO_WRAP,2
+10,Android.Util.Base64Flags,UrlSafe,android/util/Base64.URL_SAFE,8
 25,Android.Util.DisplayMetricsDensity,D260,android/util/DisplayMetrics.DENSITY_260,260
 22,Android.Util.DisplayMetricsDensity,D280,android/util/DisplayMetrics.DENSITY_280,280
 25,Android.Util.DisplayMetricsDensity,D300,android/util/DisplayMetrics.DENSITY_300,300
@@ -4532,12 +4531,12 @@
 19,Android.Util.DisplayMetricsDensity,D400,android/util/DisplayMetrics.DENSITY_400,400
 23,Android.Util.DisplayMetricsDensity,D420,android/util/DisplayMetrics.DENSITY_420,420
 21,Android.Util.DisplayMetricsDensity,D560,android/util/DisplayMetrics.DENSITY_560,560
-4,Android.Util.DisplayMetricsDensity,Default,android/util/DisplayMetrics.DENSITY_DEFAULT,160
-4,Android.Util.DisplayMetricsDensity,High,android/util/DisplayMetrics.DENSITY_HIGH,240
-4,Android.Util.DisplayMetricsDensity,Low,android/util/DisplayMetrics.DENSITY_LOW,120
-4,Android.Util.DisplayMetricsDensity,Medium,android/util/DisplayMetrics.DENSITY_MEDIUM,160
-13,Android.Util.DisplayMetricsDensity,Tv,android/util/DisplayMetrics.DENSITY_TV,213
-9,Android.Util.DisplayMetricsDensity,Xhigh,android/util/DisplayMetrics.DENSITY_XHIGH,320
+10,Android.Util.DisplayMetricsDensity,Default,android/util/DisplayMetrics.DENSITY_DEFAULT,160
+10,Android.Util.DisplayMetricsDensity,High,android/util/DisplayMetrics.DENSITY_HIGH,240
+10,Android.Util.DisplayMetricsDensity,Low,android/util/DisplayMetrics.DENSITY_LOW,120
+10,Android.Util.DisplayMetricsDensity,Medium,android/util/DisplayMetrics.DENSITY_MEDIUM,160
+15,Android.Util.DisplayMetricsDensity,Tv,android/util/DisplayMetrics.DENSITY_TV,213
+10,Android.Util.DisplayMetricsDensity,Xhigh,android/util/DisplayMetrics.DENSITY_XHIGH,320
 16,Android.Util.DisplayMetricsDensity,Xxhigh,android/util/DisplayMetrics.DENSITY_XXHIGH,480
 18,Android.Util.DisplayMetricsDensity,Xxxhigh,android/util/DisplayMetrics.DENSITY_XXXHIGH,640
 19,Android.Util.LayoutDirections,Inherit,android/util/LayoutDirection.INHERIT,2
@@ -4550,15 +4549,15 @@
 19,Android.Views.Accessibility.ContentChangeTypes,Undefined,android/view/accessibility/AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED,0
 16,Android.Views.Accessibility.Action,AccessibilityFocus,android/view/accessibility/AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS,64
 16,Android.Views.Accessibility.Action,ClearAccessibilityFocus,android/view/accessibility/AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS,128
-14,Android.Views.Accessibility.Action,ClearFocus,android/view/accessibility/AccessibilityNodeInfo.ACTION_CLEAR_FOCUS,2
-14,Android.Views.Accessibility.Action,ClearSelection,android/view/accessibility/AccessibilityNodeInfo.ACTION_CLEAR_SELECTION,8
+15,Android.Views.Accessibility.Action,ClearFocus,android/view/accessibility/AccessibilityNodeInfo.ACTION_CLEAR_FOCUS,2
+15,Android.Views.Accessibility.Action,ClearSelection,android/view/accessibility/AccessibilityNodeInfo.ACTION_CLEAR_SELECTION,8
 16,Android.Views.Accessibility.Action,Click,android/view/accessibility/AccessibilityNodeInfo.ACTION_CLICK,16
 19,Android.Views.Accessibility.Action,Collapse,android/view/accessibility/AccessibilityNodeInfo.ACTION_COLLAPSE,524288
 18,Android.Views.Accessibility.Action,Copy,android/view/accessibility/AccessibilityNodeInfo.ACTION_COPY,16384
 18,Android.Views.Accessibility.Action,Cut,android/view/accessibility/AccessibilityNodeInfo.ACTION_CUT,65536
 19,Android.Views.Accessibility.Action,Dismiss,android/view/accessibility/AccessibilityNodeInfo.ACTION_DISMISS,1048576
 19,Android.Views.Accessibility.Action,Expand,android/view/accessibility/AccessibilityNodeInfo.ACTION_EXPAND,262144
-14,Android.Views.Accessibility.Action,Focus,android/view/accessibility/AccessibilityNodeInfo.ACTION_FOCUS,1
+15,Android.Views.Accessibility.Action,Focus,android/view/accessibility/AccessibilityNodeInfo.ACTION_FOCUS,1
 16,Android.Views.Accessibility.Action,LongClick,android/view/accessibility/AccessibilityNodeInfo.ACTION_LONG_CLICK,32
 16,Android.Views.Accessibility.Action,NextAtMovementGranularity,android/view/accessibility/AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,256
 16,Android.Views.Accessibility.Action,NextHtmlElement,android/view/accessibility/AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT,1024
@@ -4567,7 +4566,7 @@
 16,Android.Views.Accessibility.Action,PreviousHtmlElement,android/view/accessibility/AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT,2048
 16,Android.Views.Accessibility.Action,ScrollBackward,android/view/accessibility/AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD,8192
 16,Android.Views.Accessibility.Action,ScrollForward,android/view/accessibility/AccessibilityNodeInfo.ACTION_SCROLL_FORWARD,4096
-14,Android.Views.Accessibility.Action,Select,android/view/accessibility/AccessibilityNodeInfo.ACTION_SELECT,4
+15,Android.Views.Accessibility.Action,Select,android/view/accessibility/AccessibilityNodeInfo.ACTION_SELECT,4
 18,Android.Views.Accessibility.Action,SetSelection,android/view/accessibility/AccessibilityNodeInfo.ACTION_SET_SELECTION,131072
 21,Android.Views.Accessibility.Action,SetText,android/view/accessibility/AccessibilityNodeInfo.ACTION_SET_TEXT,2097152
 16,Android.Views.Accessibility.NodeFocus,Accessibility,android/view/accessibility/AccessibilityNodeInfo.FOCUS_ACCESSIBILITY,2
@@ -4583,6 +4582,7 @@
 19,Android.Views.Accessibility.RangeType,Float,android/view/accessibility/AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_FLOAT,1
 19,Android.Views.Accessibility.RangeType,Int,android/view/accessibility/AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT,0
 19,Android.Views.Accessibility.RangeType,Percent,android/view/accessibility/AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_PERCENT,2
+27,Android.Views.Accessibility.AccessibilityRequestTypes,ExtraData,android/view/accessibility/AccessibilityRequestPreparer.REQUEST_TYPE_EXTRA_DATA,1
 22,Android.Views.Accessibility.AccessibilityWindowType,AccessibilityOverlay,android/view/accessibility/AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY,4
 21,Android.Views.Accessibility.AccessibilityWindowType,Application,android/view/accessibility/AccessibilityWindowInfo.TYPE_APPLICATION,1
 21,Android.Views.Accessibility.AccessibilityWindowType,InputMethod,android/view/accessibility/AccessibilityWindowInfo.TYPE_INPUT_METHOD,2
@@ -4596,80 +4596,80 @@
 21,Android.Views.Accessibility.CaptionStyles,Unspecified,android/view/accessibility/CaptioningManager.CaptionStyle.EDGE_TYPE_UNSPECIFIED,-1
 18,Android.Views.ViewLayoutMode,ClipBounds,android/view/ViewGroup.LAYOUT_MODE_CLIP_BOUNDS,0
 18,Android.Views.ViewLayoutMode,OpticalBounds,android/view/ViewGroup.LAYOUT_MODE_OPTICAL_BOUNDS,1
-1,Android.Views.WindowManagerEventType,AlphaChanged,android/view/WindowManager$LayoutParams.ALPHA_CHANGED,128
-1,Android.Views.WindowManagerEventType,AnimationChanged,android/view/WindowManager$LayoutParams.ANIMATION_CHANGED,16
-1,Android.Views.WindowManagerEventType,DimAmountChanged,android/view/WindowManager$LayoutParams.DIM_AMOUNT_CHANGED,32
-1,Android.Views.WindowManagerEventType,FlagsChanged,android/view/WindowManager$LayoutParams.FLAGS_CHANGED,4
-1,Android.Views.WindowManagerEventType,FormatChanged,android/view/WindowManager$LayoutParams.FORMAT_CHANGED,8
-1,Android.Views.WindowManagerEventType,LayoutChanged,android/view/WindowManager$LayoutParams.LAYOUT_CHANGED,1
-1,Android.Views.WindowManagerEventType,MemoryTypeChanged,android/view/WindowManager$LayoutParams.MEMORY_TYPE_CHANGED,256
+10,Android.Views.WindowManagerEventType,AlphaChanged,android/view/WindowManager$LayoutParams.ALPHA_CHANGED,128
+10,Android.Views.WindowManagerEventType,AnimationChanged,android/view/WindowManager$LayoutParams.ANIMATION_CHANGED,16
+10,Android.Views.WindowManagerEventType,DimAmountChanged,android/view/WindowManager$LayoutParams.DIM_AMOUNT_CHANGED,32
+10,Android.Views.WindowManagerEventType,FlagsChanged,android/view/WindowManager$LayoutParams.FLAGS_CHANGED,4
+10,Android.Views.WindowManagerEventType,FormatChanged,android/view/WindowManager$LayoutParams.FORMAT_CHANGED,8
+10,Android.Views.WindowManagerEventType,LayoutChanged,android/view/WindowManager$LayoutParams.LAYOUT_CHANGED,1
+10,Android.Views.WindowManagerEventType,MemoryTypeChanged,android/view/WindowManager$LayoutParams.MEMORY_TYPE_CHANGED,256
 18,Android.Views.WindowManagerEventType,RotationAnimationChanged,android/view/WindowManager$LayoutParams.ROTATION_ANIMATION_CHANGED,4096
-3,Android.Views.WindowManagerEventType,ScreenBrightnessChanged,android/view/WindowManager$LayoutParams.SCREEN_BRIGHTNESS_CHANGED,2048
-3,Android.Views.WindowManagerEventType,ScreenOrientationChanged,android/view/WindowManager$LayoutParams.SCREEN_ORIENTATION_CHANGED,1024
-3,Android.Views.WindowManagerEventType,SoftInputModeChanged,android/view/WindowManager$LayoutParams.SOFT_INPUT_MODE_CHANGED,512
-1,Android.Views.WindowManagerEventType,TitleChanged,android/view/WindowManager$LayoutParams.TITLE_CHANGED,64
-1,Android.Views.WindowManagerEventType,TypeChanged,android/view/WindowManager$LayoutParams.TYPE_CHANGED,2
+10,Android.Views.WindowManagerEventType,ScreenBrightnessChanged,android/view/WindowManager$LayoutParams.SCREEN_BRIGHTNESS_CHANGED,2048
+10,Android.Views.WindowManagerEventType,ScreenOrientationChanged,android/view/WindowManager$LayoutParams.SCREEN_ORIENTATION_CHANGED,1024
+10,Android.Views.WindowManagerEventType,SoftInputModeChanged,android/view/WindowManager$LayoutParams.SOFT_INPUT_MODE_CHANGED,512
+10,Android.Views.WindowManagerEventType,TitleChanged,android/view/WindowManager$LayoutParams.TITLE_CHANGED,64
+10,Android.Views.WindowManagerEventType,TypeChanged,android/view/WindowManager$LayoutParams.TYPE_CHANGED,2
 18,Android.Views.WindowRotationAnimation,Crossfade,android/view/WindowManager$LayoutParams.ROTATION_ANIMATION_CROSSFADE,1
 18,Android.Views.WindowRotationAnimation,Jumpcut,android/view/WindowManager$LayoutParams.ROTATION_ANIMATION_JUMPCUT,2
 18,Android.Views.WindowRotationAnimation,Rotate,android/view/WindowManager$LayoutParams.ROTATION_ANIMATION_ROTATE,0
 26,Android.Views.WindowRotationAnimation,Seamless,android/view/WindowManager$LayoutParams.ROTATION_ANIMATION_SEAMLESS,3
-9,Android.Views.InputKeyboardType,Alphabetic,android/view/InputDevice.KEYBOARD_TYPE_ALPHABETIC,2
-9,Android.Views.InputKeyboardType,None,android/view/InputDevice.KEYBOARD_TYPE_NONE,0
-9,Android.Views.InputKeyboardType,NonAlphabetic,android/view/InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC,1
-9,Android.Views.MotionRange,Orientation,android/view/InputDevice.MOTION_RANGE_ORIENTATION,8
-9,Android.Views.MotionRange,Pressure,android/view/InputDevice.MOTION_RANGE_PRESSURE,2
-9,Android.Views.MotionRange,Size,android/view/InputDevice.MOTION_RANGE_SIZE,3
-9,Android.Views.MotionRange,ToolMajor,android/view/InputDevice.MOTION_RANGE_TOOL_MAJOR,6
-9,Android.Views.MotionRange,ToolMinor,android/view/InputDevice.MOTION_RANGE_TOOL_MINOR,7
-9,Android.Views.MotionRange,TouchMajor,android/view/InputDevice.MOTION_RANGE_TOUCH_MAJOR,4
-9,Android.Views.MotionRange,TouchMinor,android/view/InputDevice.MOTION_RANGE_TOUCH_MINOR,5
-9,Android.Views.MotionRange,X,android/view/InputDevice.MOTION_RANGE_X,0
-9,Android.Views.MotionRange,Y,android/view/InputDevice.MOTION_RANGE_Y,1
-9,Android.Views.InputSourceType,Any,android/view/InputDevice.SOURCE_ANY,-256
+10,Android.Views.InputKeyboardType,Alphabetic,android/view/InputDevice.KEYBOARD_TYPE_ALPHABETIC,2
+10,Android.Views.InputKeyboardType,NonAlphabetic,android/view/InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC,1
+10,Android.Views.InputKeyboardType,None,android/view/InputDevice.KEYBOARD_TYPE_NONE,0
+10,Android.Views.MotionRange,Orientation,android/view/InputDevice.MOTION_RANGE_ORIENTATION,8
+10,Android.Views.MotionRange,Pressure,android/view/InputDevice.MOTION_RANGE_PRESSURE,2
+10,Android.Views.MotionRange,Size,android/view/InputDevice.MOTION_RANGE_SIZE,3
+10,Android.Views.MotionRange,ToolMajor,android/view/InputDevice.MOTION_RANGE_TOOL_MAJOR,6
+10,Android.Views.MotionRange,ToolMinor,android/view/InputDevice.MOTION_RANGE_TOOL_MINOR,7
+10,Android.Views.MotionRange,TouchMajor,android/view/InputDevice.MOTION_RANGE_TOUCH_MAJOR,4
+10,Android.Views.MotionRange,TouchMinor,android/view/InputDevice.MOTION_RANGE_TOUCH_MINOR,5
+10,Android.Views.MotionRange,X,android/view/InputDevice.MOTION_RANGE_X,0
+10,Android.Views.MotionRange,Y,android/view/InputDevice.MOTION_RANGE_Y,1
+10,Android.Views.InputSourceType,Any,android/view/InputDevice.SOURCE_ANY,-256
 23,Android.Views.InputSourceType,BluetoothStylus,android/view/InputDevice.SOURCE_BLUETOOTH_STYLUS,49154
-9,Android.Views.InputSourceType,ClassButton,android/view/InputDevice.SOURCE_CLASS_BUTTON,1
-12,Android.Views.InputSourceType,ClassJoystick,android/view/InputDevice.SOURCE_CLASS_JOYSTICK,16
-9,Android.Views.InputSourceType,ClassMask,android/view/InputDevice.SOURCE_CLASS_MASK,255
+10,Android.Views.InputSourceType,ClassButton,android/view/InputDevice.SOURCE_CLASS_BUTTON,1
+15,Android.Views.InputSourceType,ClassJoystick,android/view/InputDevice.SOURCE_CLASS_JOYSTICK,16
+10,Android.Views.InputSourceType,ClassMask,android/view/InputDevice.SOURCE_CLASS_MASK,255
 18,Android.Views.InputSourceType,ClassNone,android/view/InputDevice.SOURCE_CLASS_NONE,0
-9,Android.Views.InputSourceType,ClassPointer,android/view/InputDevice.SOURCE_CLASS_POINTER,2
-9,Android.Views.InputSourceType,ClassPosition,android/view/InputDevice.SOURCE_CLASS_POSITION,8
-9,Android.Views.InputSourceType,ClassTrackball,android/view/InputDevice.SOURCE_CLASS_TRACKBALL,4
-9,Android.Views.InputSourceType,Dpad,android/view/InputDevice.SOURCE_DPAD,513
-12,Android.Views.InputSourceType,Gamepad,android/view/InputDevice.SOURCE_GAMEPAD,1025
+10,Android.Views.InputSourceType,ClassPointer,android/view/InputDevice.SOURCE_CLASS_POINTER,2
+10,Android.Views.InputSourceType,ClassPosition,android/view/InputDevice.SOURCE_CLASS_POSITION,8
+10,Android.Views.InputSourceType,ClassTrackball,android/view/InputDevice.SOURCE_CLASS_TRACKBALL,4
+10,Android.Views.InputSourceType,Dpad,android/view/InputDevice.SOURCE_DPAD,513
+15,Android.Views.InputSourceType,Gamepad,android/view/InputDevice.SOURCE_GAMEPAD,1025
 21,Android.Views.InputSourceType,Hdmi,android/view/InputDevice.SOURCE_HDMI,33554433
-12,Android.Views.InputSourceType,Joystick,android/view/InputDevice.SOURCE_JOYSTICK,16777232
-9,Android.Views.InputSourceType,Keyboard,android/view/InputDevice.SOURCE_KEYBOARD,257
-9,Android.Views.InputSourceType,Mouse,android/view/InputDevice.SOURCE_MOUSE,8194
+15,Android.Views.InputSourceType,Joystick,android/view/InputDevice.SOURCE_JOYSTICK,16777232
+10,Android.Views.InputSourceType,Keyboard,android/view/InputDevice.SOURCE_KEYBOARD,257
+10,Android.Views.InputSourceType,Mouse,android/view/InputDevice.SOURCE_MOUSE,8194
 26,Android.Views.InputSourceType,MouseRelative,android/view/InputDevice.SOURCE_MOUSE_RELATIVE,131076
 26,Android.Views.InputSourceType,RotaryEncoder,android/view/InputDevice.SOURCE_ROTARY_ENCODER,4194304
-14,Android.Views.InputSourceType,Stylus,android/view/InputDevice.SOURCE_STYLUS,16386
-9,Android.Views.InputSourceType,Touchpad,android/view/InputDevice.SOURCE_TOUCHPAD,1048584
-9,Android.Views.InputSourceType,Touchscreen,android/view/InputDevice.SOURCE_TOUCHSCREEN,4098
+15,Android.Views.InputSourceType,Stylus,android/view/InputDevice.SOURCE_STYLUS,16386
 18,Android.Views.InputSourceType,TouchNavigation,android/view/InputDevice.SOURCE_TOUCH_NAVIGATION,2097152
-9,Android.Views.InputSourceType,Trackball,android/view/InputDevice.SOURCE_TRACKBALL,65540
-9,Android.Views.InputSourceType,Unknown,android/view/InputDevice.SOURCE_UNKNOWN,0
+10,Android.Views.InputSourceType,Touchpad,android/view/InputDevice.SOURCE_TOUCHPAD,1048584
+10,Android.Views.InputSourceType,Touchscreen,android/view/InputDevice.SOURCE_TOUCHSCREEN,4098
+10,Android.Views.InputSourceType,Trackball,android/view/InputDevice.SOURCE_TRACKBALL,65540
+10,Android.Views.InputSourceType,Unknown,android/view/InputDevice.SOURCE_UNKNOWN,0
 0,Android.Views.InputMethods.TextExtractFlags,None,,0
-3,Android.Views.InputMethods.TextExtractFlags,Monitor,I:android/view/inputmethod/InputConnection.GET_EXTRACTED_TEXT_MONITOR,1
+10,Android.Views.InputMethods.TextExtractFlags,Monitor,I:android/view/inputmethod/InputConnection.GET_EXTRACTED_TEXT_MONITOR,1
 0,Android.Views.InputMethods.GetTextFlags,None,,0
-3,Android.Views.InputMethods.GetTextFlags,WithStyles,I:android/view/inputmethod/InputConnection.GET_TEXT_WITH_STYLES,1
-14,Android.Views.MotionEventButtonState,Back,android/view/MotionEvent.BUTTON_BACK,8
-14,Android.Views.MotionEventButtonState,Forward,android/view/MotionEvent.BUTTON_FORWARD,16
-14,Android.Views.MotionEventButtonState,Primary,android/view/MotionEvent.BUTTON_PRIMARY,1
-14,Android.Views.MotionEventButtonState,Secondary,android/view/MotionEvent.BUTTON_SECONDARY,2
+10,Android.Views.InputMethods.GetTextFlags,WithStyles,I:android/view/inputmethod/InputConnection.GET_TEXT_WITH_STYLES,1
+15,Android.Views.MotionEventButtonState,Back,android/view/MotionEvent.BUTTON_BACK,8
+15,Android.Views.MotionEventButtonState,Forward,android/view/MotionEvent.BUTTON_FORWARD,16
+15,Android.Views.MotionEventButtonState,Primary,android/view/MotionEvent.BUTTON_PRIMARY,1
+15,Android.Views.MotionEventButtonState,Secondary,android/view/MotionEvent.BUTTON_SECONDARY,2
 23,Android.Views.MotionEventButtonState,StylusPrimary,android/view/MotionEvent.BUTTON_STYLUS_PRIMARY,32
 23,Android.Views.MotionEventButtonState,StylusSecondary,android/view/MotionEvent.BUTTON_STYLUS_SECONDARY,64
-14,Android.Views.MotionEventButtonState,Tertiary,android/view/MotionEvent.BUTTON_TERTIARY,4
-14,Android.Views.MotionEventToolType,Eraser,android/view/MotionEvent.TOOL_TYPE_ERASER,4
-14,Android.Views.MotionEventToolType,Finger,android/view/MotionEvent.TOOL_TYPE_FINGER,1
-14,Android.Views.MotionEventToolType,Mouse,android/view/MotionEvent.TOOL_TYPE_MOUSE,3
-14,Android.Views.MotionEventToolType,Stylus,android/view/MotionEvent.TOOL_TYPE_STYLUS,2
-14,Android.Views.MotionEventToolType,Unknown,android/view/MotionEvent.TOOL_TYPE_UNKNOWN,0
+15,Android.Views.MotionEventButtonState,Tertiary,android/view/MotionEvent.BUTTON_TERTIARY,4
+15,Android.Views.MotionEventToolType,Eraser,android/view/MotionEvent.TOOL_TYPE_ERASER,4
+15,Android.Views.MotionEventToolType,Finger,android/view/MotionEvent.TOOL_TYPE_FINGER,1
+15,Android.Views.MotionEventToolType,Mouse,android/view/MotionEvent.TOOL_TYPE_MOUSE,3
+15,Android.Views.MotionEventToolType,Stylus,android/view/MotionEvent.TOOL_TYPE_STYLUS,2
+15,Android.Views.MotionEventToolType,Unknown,android/view/MotionEvent.TOOL_TYPE_UNKNOWN,0
 0,Android.Views.MotionEventFlags,None,,0
-9,Android.Views.MotionEventFlags,WindowIsObscured,android/view/MotionEvent.FLAG_WINDOW_IS_OBSCURED,1
+10,Android.Views.MotionEventFlags,WindowIsObscured,android/view/MotionEvent.FLAG_WINDOW_IS_OBSCURED,1
 0,Android.Views.TextService.SuggestionsAttributes,None,,0
 15,Android.Views.TextService.SuggestionsAttributes,HasRecommendedSuggestions,android/view/textservice/SuggestionsInfo.RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS,4
-14,Android.Views.TextService.SuggestionsAttributes,InTheDictionary,android/view/textservice/SuggestionsInfo.RESULT_ATTR_IN_THE_DICTIONARY,1
-14,Android.Views.TextService.SuggestionsAttributes,LooksLikeTypo,android/view/textservice/SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO,2
+15,Android.Views.TextService.SuggestionsAttributes,InTheDictionary,android/view/textservice/SuggestionsInfo.RESULT_ATTR_IN_THE_DICTIONARY,1
+15,Android.Views.TextService.SuggestionsAttributes,LooksLikeTypo,android/view/textservice/SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO,2
 0,Android.Views.AutofillFlags,None,,0
 26,Android.Views.AutofillFlags,IncludeNotImportantViews,android/view/View.AUTOFILL_FLAG_INCLUDE_NOT_IMPORTANT_VIEWS,1
 26,Android.Views.AutofillType,Date,android/view/View.AUTOFILL_TYPE_DATE,4
@@ -4677,8 +4677,8 @@
 26,Android.Views.AutofillType,None,android/view/View.AUTOFILL_TYPE_NONE,0
 26,Android.Views.AutofillType,Text,android/view/View.AUTOFILL_TYPE_TEXT,1
 26,Android.Views.AutofillType,Toggle,android/view/View.AUTOFILL_TYPE_TOGGLE,2
-14,Android.Views.FindViewsWith,ContentDescription,android/view/View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION,2
-14,Android.Views.FindViewsWith,Text,android/view/View.FIND_VIEWS_WITH_TEXT,1
+15,Android.Views.FindViewsWith,ContentDescription,android/view/View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION,2
+15,Android.Views.FindViewsWith,Text,android/view/View.FIND_VIEWS_WITH_TEXT,1
 26,Android.Views.ViewFocusability,Focusable,android/view/View.FOCUSABLE,1
 26,Android.Views.ViewFocusability,FocusableAuto,android/view/View.FOCUSABLE_AUTO,16
 26,Android.Views.ViewFocusability,NotFocusable,android/view/View.NOT_FOCUSABLE,0
@@ -4687,11 +4687,11 @@
 26,Android.Views.ImportantForAutofill,NoExcludeDescendants,android/view/View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS,8
 26,Android.Views.ImportantForAutofill,Yes,android/view/View.IMPORTANT_FOR_AUTOFILL_YES,1
 26,Android.Views.ImportantForAutofill,YesExcludeDescendants,android/view/View.IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS,4
-9,Android.Views.OverScrollMode,Always,android/view/View.OVER_SCROLL_ALWAYS,0
-9,Android.Views.OverScrollMode,IfContentScrolls,android/view/View.OVER_SCROLL_IF_CONTENT_SCROLLS,1
-9,Android.Views.OverScrollMode,Never,android/view/View.OVER_SCROLL_NEVER,2
+10,Android.Views.OverScrollMode,Always,android/view/View.OVER_SCROLL_ALWAYS,0
+10,Android.Views.OverScrollMode,IfContentScrolls,android/view/View.OVER_SCROLL_IF_CONTENT_SCROLLS,1
+10,Android.Views.OverScrollMode,Never,android/view/View.OVER_SCROLL_NEVER,2
 16,Android.Views.SystemUiFlags,Fullscreen,android/view/View.SYSTEM_UI_FLAG_FULLSCREEN,4
-14,Android.Views.SystemUiFlags,HideNavigation,android/view/View.SYSTEM_UI_FLAG_HIDE_NAVIGATION,2
+15,Android.Views.SystemUiFlags,HideNavigation,android/view/View.SYSTEM_UI_FLAG_HIDE_NAVIGATION,2
 19,Android.Views.SystemUiFlags,Immersive,android/view/View.SYSTEM_UI_FLAG_IMMERSIVE,2048
 19,Android.Views.SystemUiFlags,ImmersiveSticky,android/view/View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY,4096
 16,Android.Views.SystemUiFlags,LayoutFullscreen,android/view/View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,1024
@@ -4699,8 +4699,8 @@
 16,Android.Views.SystemUiFlags,LayoutStable,android/view/View.SYSTEM_UI_FLAG_LAYOUT_STABLE,256
 26,Android.Views.SystemUiFlags,LightNavigationBar,android/view/View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR,16
 23,Android.Views.SystemUiFlags,LightStatusBar,android/view/View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR,8192
-14,Android.Views.SystemUiFlags,LowProfile,android/view/View.SYSTEM_UI_FLAG_LOW_PROFILE,1
-14,Android.Views.SystemUiFlags,Visible,android/view/View.SYSTEM_UI_FLAG_VISIBLE,0
+15,Android.Views.SystemUiFlags,LowProfile,android/view/View.SYSTEM_UI_FLAG_LOW_PROFILE,1
+15,Android.Views.SystemUiFlags,Visible,android/view/View.SYSTEM_UI_FLAG_VISIBLE,0
 16,Android.Views.SystemUiFlags,LayoutFlags,android/view/View.SYSTEM_UI_LAYOUT_FLAGS,1536
 19,Android.Views.AccessibilityLiveRegion,Assertive,android/view/View.ACCESSIBILITY_LIVE_REGION_ASSERTIVE,2
 19,Android.Views.AccessibilityLiveRegion,None,android/view/View.ACCESSIBILITY_LIVE_REGION_NONE,0
@@ -4708,27 +4708,27 @@
 21,Android.Views.ScrollAxis,Horizontal,android/view/View.SCROLL_AXIS_HORIZONTAL,1
 21,Android.Views.ScrollAxis,None,android/view/View.SCROLL_AXIS_NONE,0
 21,Android.Views.ScrollAxis,Vertical,android/view/View.SCROLL_AXIS_VERTICAL,2
-1,Android.Views.WindowProgress,End,android/view/Window.PROGRESS_END,10000
-1,Android.Views.WindowProgress,IndeterminateOff,android/view/Window.PROGRESS_INDETERMINATE_OFF,-4
-1,Android.Views.WindowProgress,IndeterminateOn,android/view/Window.PROGRESS_INDETERMINATE_ON,-3
-1,Android.Views.WindowProgress,SecondaryEnd,android/view/Window.PROGRESS_SECONDARY_END,30000
-1,Android.Views.WindowProgress,SecondaryStart,android/view/Window.PROGRESS_SECONDARY_START,20000
-1,Android.Views.WindowProgress,Start,android/view/Window.PROGRESS_START,0
-1,Android.Views.WindowProgress,VisibilityOff,android/view/Window.PROGRESS_VISIBILITY_OFF,-2
-1,Android.Views.WindowProgress,VisibilityOn,android/view/Window.PROGRESS_VISIBILITY_ON,-1
-3,Android.Views.InputMethods.ShowFlags,Forced,android/view/inputmethod/InputMethodManager.SHOW_FORCED,2
-3,Android.Views.InputMethods.ShowFlags,Implicit,android/view/inputmethod/InputMethodManager.SHOW_IMPLICIT,1
+10,Android.Views.WindowProgress,End,android/view/Window.PROGRESS_END,10000
+10,Android.Views.WindowProgress,IndeterminateOff,android/view/Window.PROGRESS_INDETERMINATE_OFF,-4
+10,Android.Views.WindowProgress,IndeterminateOn,android/view/Window.PROGRESS_INDETERMINATE_ON,-3
+10,Android.Views.WindowProgress,SecondaryEnd,android/view/Window.PROGRESS_SECONDARY_END,30000
+10,Android.Views.WindowProgress,SecondaryStart,android/view/Window.PROGRESS_SECONDARY_START,20000
+10,Android.Views.WindowProgress,Start,android/view/Window.PROGRESS_START,0
+10,Android.Views.WindowProgress,VisibilityOff,android/view/Window.PROGRESS_VISIBILITY_OFF,-2
+10,Android.Views.WindowProgress,VisibilityOn,android/view/Window.PROGRESS_VISIBILITY_ON,-1
+10,Android.Views.InputMethods.ShowFlags,Forced,android/view/inputmethod/InputMethodManager.SHOW_FORCED,2
+10,Android.Views.InputMethods.ShowFlags,Implicit,android/view/inputmethod/InputMethodManager.SHOW_IMPLICIT,1
 21,Android.Webkit.MixedContentHandling,AlwaysAllow,android/webkit/WebSettings.MIXED_CONTENT_ALWAYS_ALLOW,0
 21,Android.Webkit.MixedContentHandling,CompatibilityMode,android/webkit/WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE,2
 21,Android.Webkit.MixedContentHandling,NeverAllow,android/webkit/WebSettings.MIXED_CONTENT_NEVER_ALLOW,1
-14,Android.Widget.GridAlign,Bounds,android/widget/GridLayout.ALIGN_BOUNDS,0
-14,Android.Widget.GridAlign,Margins,android/widget/GridLayout.ALIGN_MARGINS,1
-14,Android.Widget.GridOrientation,Horizontal,android/widget/GridLayout.HORIZONTAL,0
-14,Android.Widget.GridOrientation,Vertical,android/widget/GridLayout.VERTICAL,1
-11,Android.Widget.PositionPrompt,Above,android/widget/ListPopupWindow.POSITION_PROMPT_ABOVE,0
-11,Android.Widget.PositionPrompt,Below,android/widget/ListPopupWindow.POSITION_PROMPT_BELOW,1
-3,Android.Widget.SlidingDrawerOrientation,Horizontal,android/widget/SlidingDrawer.ORIENTATION_HORIZONTAL,0
-3,Android.Widget.SlidingDrawerOrientation,Vertical,android/widget/SlidingDrawer.ORIENTATION_VERTICAL,1
+15,Android.Widget.GridAlign,Bounds,android/widget/GridLayout.ALIGN_BOUNDS,0
+15,Android.Widget.GridAlign,Margins,android/widget/GridLayout.ALIGN_MARGINS,1
+15,Android.Widget.GridOrientation,Horizontal,android/widget/GridLayout.HORIZONTAL,0
+15,Android.Widget.GridOrientation,Vertical,android/widget/GridLayout.VERTICAL,1
+15,Android.Widget.PositionPrompt,Above,android/widget/ListPopupWindow.POSITION_PROMPT_ABOVE,0
+15,Android.Widget.PositionPrompt,Below,android/widget/ListPopupWindow.POSITION_PROMPT_BELOW,1
+10,Android.Widget.SlidingDrawerOrientation,Horizontal,android/widget/SlidingDrawer.ORIENTATION_HORIZONTAL,0
+10,Android.Widget.SlidingDrawerOrientation,Vertical,android/widget/SlidingDrawer.ORIENTATION_VERTICAL,1
 16,Android.AccessibilityServices.AccessibilityGesture,SwipeDown,android/accessibilityservice/AccessibilityService.GESTURE_SWIPE_DOWN,2
 16,Android.AccessibilityServices.AccessibilityGesture,SwipeDownAndLeft,android/accessibilityservice/AccessibilityService.GESTURE_SWIPE_DOWN_AND_LEFT,15
 16,Android.AccessibilityServices.AccessibilityGesture,SwipeDownAndRight,android/accessibilityservice/AccessibilityService.GESTURE_SWIPE_DOWN_AND_RIGHT,16
@@ -4757,18 +4757,20 @@
 16,Android.App.NotificationPriority,Low,android/app/Notification.PRIORITY_LOW,-1
 16,Android.App.NotificationPriority,Max,android/app/Notification.PRIORITY_MAX,2
 16,Android.App.NotificationPriority,Min,android/app/Notification.PRIORITY_MIN,-2
+16,Android.Content.PM.RequestedPermission,Granted,android/content/pm/PackageInfo.REQUESTED_PERMISSION_GRANTED,2
+16,Android.Content.PM.RequestedPermission,Required,android/content/pm/PackageInfo.REQUESTED_PERMISSION_REQUIRED,1
 16,Android.Media.MediaCodecCapabilities,Format12bitrgb444,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format12bitRGB444,3
 16,Android.Media.MediaCodecCapabilities,Format16bitargb1555,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format16bitARGB1555,5
 16,Android.Media.MediaCodecCapabilities,Format16bitargb4444,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format16bitARGB4444,4
 16,Android.Media.MediaCodecCapabilities,Format16bitbgr565,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format16bitBGR565,7
 16,Android.Media.MediaCodecCapabilities,Format16bitrgb565,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format16bitRGB565,6
-16,Android.Media.MediaCodecCapabilities,Format18bitbgr666,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format18BitBGR666,41
 16,Android.Media.MediaCodecCapabilities,Format18bitargb1665,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format18bitARGB1665,9
+16,Android.Media.MediaCodecCapabilities,Format18bitbgr666,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format18BitBGR666,41
 16,Android.Media.MediaCodecCapabilities,Format18bitrgb666,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format18bitRGB666,8
 16,Android.Media.MediaCodecCapabilities,Format19bitargb1666,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format19bitARGB1666,10
 16,Android.Media.MediaCodecCapabilities,Format24bitabgr6666,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format24BitABGR6666,43
-16,Android.Media.MediaCodecCapabilities,Format24bitargb6666,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format24BitARGB6666,42
 16,Android.Media.MediaCodecCapabilities,Format24bitargb1887,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format24bitARGB1887,13
+16,Android.Media.MediaCodecCapabilities,Format24bitargb6666,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format24BitARGB6666,42
 16,Android.Media.MediaCodecCapabilities,Format24bitbgr888,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format24bitBGR888,12
 16,Android.Media.MediaCodecCapabilities,Format24bitrgb888,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format24bitRGB888,11
 16,Android.Media.MediaCodecCapabilities,Format25bitargb1888,android/media/MediaCodecInfo$CodecCapabilities.COLOR_Format25bitARGB1888,14
@@ -4785,11 +4787,11 @@
 16,Android.Media.MediaCodecCapabilities,Formatl4,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatL4,34
 16,Android.Media.MediaCodecCapabilities,Formatl8,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatL8,35
 16,Android.Media.MediaCodecCapabilities,Formatmonochrome,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatMonochrome,1
-23,Android.Media.MediaCodecCapabilities,Formatrgbaflexible,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatRGBAFlexible,2134288520
-23,Android.Media.MediaCodecCapabilities,Formatrgbflexible,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatRGBFlexible,2134292616
 16,Android.Media.MediaCodecCapabilities,Formatrawbayer10bit,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatRawBayer10bit,31
 16,Android.Media.MediaCodecCapabilities,Formatrawbayer8bit,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatRawBayer8bit,30
 16,Android.Media.MediaCodecCapabilities,Formatrawbayer8bitcompressed,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatRawBayer8bitcompressed,32
+23,Android.Media.MediaCodecCapabilities,Formatrgbaflexible,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatRGBAFlexible,2134288520
+23,Android.Media.MediaCodecCapabilities,Formatrgbflexible,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatRGBFlexible,2134292616
 18,Android.Media.MediaCodecCapabilities,Formatsurface,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatSurface,2130708361
 16,Android.Media.MediaCodecCapabilities,Formatycbycr,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatYCbYCr,25
 16,Android.Media.MediaCodecCapabilities,Formatycrycb,android/media/MediaCodecInfo$CodecCapabilities.COLOR_FormatYCrYCb,26
@@ -4903,6 +4905,8 @@
 24,Android.Media.MediaCodecProfileLevel,Vp9level61,android/media/MediaCodecInfo$CodecProfileLevel.VP9Level61,4096
 24,Android.Media.MediaCodecProfileLevel,Vp9level62,android/media/MediaCodecInfo$CodecProfileLevel.VP9Level62,8192
 16,Android.Media.MediaCodecProfileType,Avcprofilebaseline,android/media/MediaCodecInfo$CodecProfileLevel.AVCProfileBaseline,1
+27,Android.Media.MediaCodecProfileType,Avcprofileconstrainedbaseline,android/media/MediaCodecInfo$CodecProfileLevel.AVCProfileConstrainedBaseline,65536
+27,Android.Media.MediaCodecProfileType,Avcprofileconstrainedhigh,android/media/MediaCodecInfo$CodecProfileLevel.AVCProfileConstrainedHigh,524288
 16,Android.Media.MediaCodecProfileType,Avcprofileextended,android/media/MediaCodecInfo$CodecProfileLevel.AVCProfileExtended,4
 16,Android.Media.MediaCodecProfileType,Avcprofilehigh,android/media/MediaCodecInfo$CodecProfileLevel.AVCProfileHigh,8
 16,Android.Media.MediaCodecProfileType,Avcprofilehigh10,android/media/MediaCodecInfo$CodecProfileLevel.AVCProfileHigh10,16
@@ -4911,29 +4915,31 @@
 16,Android.Media.MediaCodecProfileType,Avcprofilemain,android/media/MediaCodecInfo$CodecProfileLevel.AVCProfileMain,2
 24,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvavpen,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvavPen,2
 24,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvavper,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvavPer,1
+27,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvavse,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvavSe,512
 24,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvheden,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvheDen,8
 24,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvheder,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvheDer,4
 24,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvhedtb,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvheDtb,128
 24,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvhedth,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvheDth,64
 24,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvhedtr,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvheDtr,16
+27,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvhest,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvheSt,256
 24,Android.Media.MediaCodecProfileType,Dolbyvisionprofiledvhestn,android/media/MediaCodecInfo$CodecProfileLevel.DolbyVisionProfileDvheStn,32
 16,Android.Media.MediaCodecProfileType,H263profilebackwardcompatible,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileBackwardCompatible,4
 16,Android.Media.MediaCodecProfileType,H263profilebaseline,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileBaseline,1
 16,Android.Media.MediaCodecProfileType,H263profileh320coding,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileH320Coding,2
 16,Android.Media.MediaCodecProfileType,H263profilehighcompression,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileHighCompression,32
 16,Android.Media.MediaCodecProfileType,H263profilehighlatency,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileHighLatency,256
-16,Android.Media.MediaCodecProfileType,H263profileiswv2,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileISWV2,8
-16,Android.Media.MediaCodecProfileType,H263profileiswv3,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileISWV3,16
 16,Android.Media.MediaCodecProfileType,H263profileinterlace,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileInterlace,128
 16,Android.Media.MediaCodecProfileType,H263profileinternet,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileInternet,64
+16,Android.Media.MediaCodecProfileType,H263profileiswv2,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileISWV2,8
+16,Android.Media.MediaCodecProfileType,H263profileiswv3,android/media/MediaCodecInfo$CodecProfileLevel.H263ProfileISWV3,16
 21,Android.Media.MediaCodecProfileType,Hevcprofilemain,android/media/MediaCodecInfo$CodecProfileLevel.HEVCProfileMain,1
 21,Android.Media.MediaCodecProfileType,Hevcprofilemain10,android/media/MediaCodecInfo$CodecProfileLevel.HEVCProfileMain10,2
 24,Android.Media.MediaCodecProfileType,Hevcprofilemain10hdr10,android/media/MediaCodecInfo$CodecProfileLevel.HEVCProfileMain10HDR10,4096
 23,Android.Media.MediaCodecProfileType,Mpeg2profile422,android/media/MediaCodecInfo$CodecProfileLevel.MPEG2Profile422,2
 23,Android.Media.MediaCodecProfileType,Mpeg2profilehigh,android/media/MediaCodecInfo$CodecProfileLevel.MPEG2ProfileHigh,5
 23,Android.Media.MediaCodecProfileType,Mpeg2profilemain,android/media/MediaCodecInfo$CodecProfileLevel.MPEG2ProfileMain,1
-23,Android.Media.MediaCodecProfileType,Mpeg2profilesnr,android/media/MediaCodecInfo$CodecProfileLevel.MPEG2ProfileSNR,3
 23,Android.Media.MediaCodecProfileType,Mpeg2profilesimple,android/media/MediaCodecInfo$CodecProfileLevel.MPEG2ProfileSimple,0
+23,Android.Media.MediaCodecProfileType,Mpeg2profilesnr,android/media/MediaCodecInfo$CodecProfileLevel.MPEG2ProfileSNR,3
 23,Android.Media.MediaCodecProfileType,Mpeg2profilespatial,android/media/MediaCodecInfo$CodecProfileLevel.MPEG2ProfileSpatial,4
 16,Android.Media.MediaCodecProfileType,Mpeg4profileadvancedcoding,android/media/MediaCodecInfo$CodecProfileLevel.MPEG4ProfileAdvancedCoding,4096
 16,Android.Media.MediaCodecProfileType,Mpeg4profileadvancedcore,android/media/MediaCodecInfo$CodecProfileLevel.MPEG4ProfileAdvancedCore,8192
@@ -4948,8 +4954,8 @@
 16,Android.Media.MediaCodecProfileType,Mpeg4profilenbit,android/media/MediaCodecInfo$CodecProfileLevel.MPEG4ProfileNbit,16
 16,Android.Media.MediaCodecProfileType,Mpeg4profilescalabletexture,android/media/MediaCodecInfo$CodecProfileLevel.MPEG4ProfileScalableTexture,32
 16,Android.Media.MediaCodecProfileType,Mpeg4profilesimple,android/media/MediaCodecInfo$CodecProfileLevel.MPEG4ProfileSimple,1
-16,Android.Media.MediaCodecProfileType,Mpeg4profilesimplefba,android/media/MediaCodecInfo$CodecProfileLevel.MPEG4ProfileSimpleFBA,128
 16,Android.Media.MediaCodecProfileType,Mpeg4profilesimpleface,android/media/MediaCodecInfo$CodecProfileLevel.MPEG4ProfileSimpleFace,64
+16,Android.Media.MediaCodecProfileType,Mpeg4profilesimplefba,android/media/MediaCodecInfo$CodecProfileLevel.MPEG4ProfileSimpleFBA,128
 16,Android.Media.MediaCodecProfileType,Mpeg4profilesimplescalable,android/media/MediaCodecInfo$CodecProfileLevel.MPEG4ProfileSimpleScalable,2
 18,Android.Media.MediaCodecProfileType,Vp8profilemain,android/media/MediaCodecInfo$CodecProfileLevel.VP8ProfileMain,1
 24,Android.Media.MediaCodecProfileType,Vp9profile0,android/media/MediaCodecInfo$CodecProfileLevel.VP9Profile0,1
@@ -4967,8 +4973,8 @@
 16,Android.Media.MediaCodecProfileType,Aacobjectld,android/media/MediaCodecInfo$CodecProfileLevel.AACObjectLD,23
 16,Android.Media.MediaCodecProfileType,Aacobjectltp,android/media/MediaCodecInfo$CodecProfileLevel.AACObjectLTP,4
 16,Android.Media.MediaCodecProfileType,Aacobjectmain,android/media/MediaCodecInfo$CodecProfileLevel.AACObjectMain,1
-16,Android.Media.MediaCodecProfileType,Aacobjectssr,android/media/MediaCodecInfo$CodecProfileLevel.AACObjectSSR,3
 16,Android.Media.MediaCodecProfileType,Aacobjectscalable,android/media/MediaCodecInfo$CodecProfileLevel.AACObjectScalable,6
+16,Android.Media.MediaCodecProfileType,Aacobjectssr,android/media/MediaCodecInfo$CodecProfileLevel.AACObjectSSR,3
 16,Android.Media.MediaActionSoundType,FocusComplete,android/media/MediaActionSound.FOCUS_COMPLETE,1
 16,Android.Media.MediaActionSoundType,ShutterClick,android/media/MediaActionSound.SHUTTER_CLICK,0
 16,Android.Media.MediaActionSoundType,StartVideoRecording,android/media/MediaActionSound.START_VIDEO_RECORDING,2
@@ -5031,6 +5037,7 @@
 17,Android.Views.TextAlignment,Center,android/view/View.TEXT_ALIGNMENT_CENTER,4
 17,Android.Views.TextAlignment,Gravity,android/view/View.TEXT_ALIGNMENT_GRAVITY,1
 16,Android.Views.TextAlignment,Inherit,android/view/View.TEXT_ALIGNMENT_INHERIT,0
+16,Android.Views.TextAlignment,ResolvedDefault,android/view/View.TEXT_ALIGNMENT_RESOLVED_DEFAULT,131072
 17,Android.Views.TextAlignment,TextEnd,android/view/View.TEXT_ALIGNMENT_TEXT_END,3
 17,Android.Views.TextAlignment,TextStart,android/view/View.TEXT_ALIGNMENT_TEXT_START,2
 17,Android.Views.TextAlignment,ViewEnd,android/view/View.TEXT_ALIGNMENT_VIEW_END,6
@@ -5076,11 +5083,15 @@
 17,Android.Views.TextDirection,Rtl,android/view/View.TEXT_DIRECTION_RTL,4
 21,Android.Views.FeedbackConstants,ClockTick,android/view/HapticFeedbackConstants.CLOCK_TICK,4
 23,Android.Views.FeedbackConstants,ContextClick,android/view/HapticFeedbackConstants.CONTEXT_CLICK,6
-8,Android.Views.FeedbackConstants,KeyboardTap,android/view/HapticFeedbackConstants.KEYBOARD_TAP,3
-3,Android.Views.FeedbackConstants,LongPress,android/view/HapticFeedbackConstants.LONG_PRESS,0
-5,Android.Views.FeedbackConstants,VirtualKey,android/view/HapticFeedbackConstants.VIRTUAL_KEY,1
-3,Android.Views.FeedbackFlags,IgnoreGlobalSetting,android/view/HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING,2
-3,Android.Views.FeedbackFlags,IgnoreViewSetting,android/view/HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING,1
+27,Android.Views.FeedbackConstants,KeyboardPress,android/view/HapticFeedbackConstants.KEYBOARD_PRESS,3
+27,Android.Views.FeedbackConstants,KeyboardRelease,android/view/HapticFeedbackConstants.KEYBOARD_RELEASE,7
+10,Android.Views.FeedbackConstants,KeyboardTap,android/view/HapticFeedbackConstants.KEYBOARD_TAP,3
+10,Android.Views.FeedbackConstants,LongPress,android/view/HapticFeedbackConstants.LONG_PRESS,0
+10,Android.Views.FeedbackConstants,VirtualKey,android/view/HapticFeedbackConstants.VIRTUAL_KEY,1
+27,Android.Views.FeedbackConstants,TextHandleMove,android/view/HapticFeedbackConstants.TEXT_HANDLE_MOVE,9
+27,Android.Views.FeedbackConstants,VirtualKeyRelease,android/view/HapticFeedbackConstants.VIRTUAL_KEY_RELEASE,8
+10,Android.Views.FeedbackFlags,IgnoreGlobalSetting,android/view/HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING,2
+10,Android.Views.FeedbackFlags,IgnoreViewSetting,android/view/HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING,1
 24,Android.AccessibilityServices.AccessibilityServiceShowMode,Auto,android/accessibilityservice/AccessibilityService.SHOW_MODE_AUTO,0
 24,Android.AccessibilityServices.AccessibilityServiceShowMode,Hidden,android/accessibilityservice/AccessibilityService.SHOW_MODE_HIDDEN,1
 24,Android.App.Admin.BugReportFailureReason,FailedCompleting,android/app/admin/DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING,0
@@ -5090,8 +5101,8 @@
 24,Android.App.Admin.SecurityLogTags,AdbShellCmd,android/app/admin/SecurityLog.TAG_ADB_SHELL_CMD,210002
 24,Android.App.Admin.SecurityLogTags,AdbShellInteractive,android/app/admin/SecurityLog.TAG_ADB_SHELL_INTERACTIVE,210001
 24,Android.App.Admin.SecurityLogTags,AppProcessStart,android/app/admin/SecurityLog.TAG_APP_PROCESS_START,210005
-24,Android.App.Admin.SecurityLogTags,KeyguardDismissed,android/app/admin/SecurityLog.TAG_KEYGUARD_DISMISSED,210006
 24,Android.App.Admin.SecurityLogTags,KeyguardDismissAuthAttempt,android/app/admin/SecurityLog.TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT,210007
+24,Android.App.Admin.SecurityLogTags,KeyguardDismissed,android/app/admin/SecurityLog.TAG_KEYGUARD_DISMISSED,210006
 24,Android.App.Admin.SecurityLogTags,KeyguardSecured,android/app/admin/SecurityLog.TAG_KEYGUARD_SECURED,210008
 24,Android.App.Admin.SecurityLogTags,SyncRecvFile,android/app/admin/SecurityLog.TAG_SYNC_RECV_FILE,210003
 24,Android.App.Admin.SecurityLogTags,SyncSendFile,android/app/admin/SecurityLog.TAG_SYNC_SEND_FILE,210004
@@ -5184,13 +5195,13 @@
 24,Android.Icu.Text.DateFormatField,Era,android/icu/text/DateFormat.ERA_FIELD,0
 24,Android.Icu.Text.DateFormatField,ExtendedYear,android/icu/text/DateFormat.EXTENDED_YEAR_FIELD,20
 24,Android.Icu.Text.DateFormatField,FractionalSecond,android/icu/text/DateFormat.FRACTIONAL_SECOND_FIELD,8
-24,Android.Icu.Text.DateFormatField,Hour0,android/icu/text/DateFormat.HOUR0_FIELD,16
-24,Android.Icu.Text.DateFormatField,Hour1,android/icu/text/DateFormat.HOUR1_FIELD,15
 24,Android.Icu.Text.DateFormatField,HourOfDay0,android/icu/text/DateFormat.HOUR_OF_DAY0_FIELD,5
 24,Android.Icu.Text.DateFormatField,HourOfDay1,android/icu/text/DateFormat.HOUR_OF_DAY1_FIELD,4
+24,Android.Icu.Text.DateFormatField,Hour0,android/icu/text/DateFormat.HOUR0_FIELD,16
+24,Android.Icu.Text.DateFormatField,Hour1,android/icu/text/DateFormat.HOUR1_FIELD,15
 24,Android.Icu.Text.DateFormatField,JulianDay,android/icu/text/DateFormat.JULIAN_DAY_FIELD,21
-24,Android.Icu.Text.DateFormatField,MillisecondsInDay,android/icu/text/DateFormat.MILLISECONDS_IN_DAY_FIELD,22
 24,Android.Icu.Text.DateFormatField,Millisecond,android/icu/text/DateFormat.MILLISECOND_FIELD,8
+24,Android.Icu.Text.DateFormatField,MillisecondsInDay,android/icu/text/DateFormat.MILLISECONDS_IN_DAY_FIELD,22
 24,Android.Icu.Text.DateFormatField,Minute,android/icu/text/DateFormat.MINUTE_FIELD,6
 24,Android.Icu.Text.DateFormatField,Month,android/icu/text/DateFormat.MONTH_FIELD,2
 24,Android.Icu.Text.DateFormatField,Quarter,android/icu/text/DateFormat.QUARTER_FIELD,27
@@ -5229,9 +5240,9 @@
 24,Android.Icu.Text.DateFormatSymbolWidth,Short,android/icu/text/DateFormatSymbols.SHORT,3
 24,Android.Icu.Text.DateFormatSymbolWidth,Wide,android/icu/text/DateFormatSymbols.WIDE,1
 24,Android.Icu.Text.DateTimePatternField,Day,android/icu/text/DateTimePatternGenerator.DAY,7
-24,Android.Icu.Text.DateTimePatternField,Dayperiod,android/icu/text/DateTimePatternGenerator.DAYPERIOD,10
 24,Android.Icu.Text.DateTimePatternField,DayOfWeekInMonth,android/icu/text/DateTimePatternGenerator.DAY_OF_WEEK_IN_MONTH,9
 24,Android.Icu.Text.DateTimePatternField,DayOfYear,android/icu/text/DateTimePatternGenerator.DAY_OF_YEAR,8
+24,Android.Icu.Text.DateTimePatternField,Dayperiod,android/icu/text/DateTimePatternGenerator.DAYPERIOD,10
 24,Android.Icu.Text.DateTimePatternField,Era,android/icu/text/DateTimePatternGenerator.ERA,0
 24,Android.Icu.Text.DateTimePatternField,FractionalSecond,android/icu/text/DateTimePatternGenerator.FRACTIONAL_SECOND,14
 24,Android.Icu.Text.DateTimePatternField,Hour,android/icu/text/DateTimePatternGenerator.HOUR,11
@@ -5239,9 +5250,9 @@
 24,Android.Icu.Text.DateTimePatternField,Month,android/icu/text/DateTimePatternGenerator.MONTH,3
 24,Android.Icu.Text.DateTimePatternField,Quarter,android/icu/text/DateTimePatternGenerator.QUARTER,2
 24,Android.Icu.Text.DateTimePatternField,Second,android/icu/text/DateTimePatternGenerator.SECOND,13
-24,Android.Icu.Text.DateTimePatternField,Weekday,android/icu/text/DateTimePatternGenerator.WEEKDAY,6
 24,Android.Icu.Text.DateTimePatternField,WeekOfMonth,android/icu/text/DateTimePatternGenerator.WEEK_OF_MONTH,5
 24,Android.Icu.Text.DateTimePatternField,WeekOfYear,android/icu/text/DateTimePatternGenerator.WEEK_OF_YEAR,4
+24,Android.Icu.Text.DateTimePatternField,Weekday,android/icu/text/DateTimePatternGenerator.WEEKDAY,6
 24,Android.Icu.Text.DateTimePatternField,Year,android/icu/text/DateTimePatternGenerator.YEAR,1
 24,Android.Icu.Text.DateTimePatternField,Zone,android/icu/text/DateTimePatternGenerator.ZONE,15
 24,Android.Icu.Text.DateTimePatternMatchOptions,AllFieldsLength,android/icu/text/DateTimePatternGenerator.MATCH_ALL_FIELDS_LENGTH,65535
@@ -5368,8 +5379,8 @@
 24,Android.Locations.GnssState,BdsD2SubframeSync,android/location/GnssMeasurement.STATE_BDS_D2_SUBFRAME_SYNC,512
 24,Android.Locations.GnssState,BitSync,android/location/GnssMeasurement.STATE_BIT_SYNC,2
 24,Android.Locations.GnssState,CodeLock,android/location/GnssMeasurement.STATE_CODE_LOCK,1
-24,Android.Locations.GnssState,GalE1bcCodeLock,android/location/GnssMeasurement.STATE_GAL_E1BC_CODE_LOCK,1024
 24,Android.Locations.GnssState,GalE1bPageSync,android/location/GnssMeasurement.STATE_GAL_E1B_PAGE_SYNC,4096
+24,Android.Locations.GnssState,GalE1bcCodeLock,android/location/GnssMeasurement.STATE_GAL_E1BC_CODE_LOCK,1024
 24,Android.Locations.GnssState,GalE1c2ndCodeLock,android/location/GnssMeasurement.STATE_GAL_E1C_2ND_CODE_LOCK,2048
 24,Android.Locations.GnssState,GloStringSync,android/location/GnssMeasurement.STATE_GLO_STRING_SYNC,64
 24,Android.Locations.GnssState,GloTodDecoded,android/location/GnssMeasurement.STATE_GLO_TOD_DECODED,128
@@ -5437,14 +5448,14 @@
 24,Android.Mtp.OperationCode,GetObject,android/mtp/MtpConstants.OPERATION_GET_OBJECT,4105
 24,Android.Mtp.OperationCode,GetObjectHandles,android/mtp/MtpConstants.OPERATION_GET_OBJECT_HANDLES,4103
 24,Android.Mtp.OperationCode,GetObjectInfo,android/mtp/MtpConstants.OPERATION_GET_OBJECT_INFO,4104
-24,Android.Mtp.OperationCode,GetObjectPropsSupported,android/mtp/MtpConstants.OPERATION_GET_OBJECT_PROPS_SUPPORTED,38913
 24,Android.Mtp.OperationCode,GetObjectPropDesc,android/mtp/MtpConstants.OPERATION_GET_OBJECT_PROP_DESC,38914
 24,Android.Mtp.OperationCode,GetObjectPropValue,android/mtp/MtpConstants.OPERATION_GET_OBJECT_PROP_VALUE,38915
+24,Android.Mtp.OperationCode,GetObjectPropsSupported,android/mtp/MtpConstants.OPERATION_GET_OBJECT_PROPS_SUPPORTED,38913
 24,Android.Mtp.OperationCode,GetObjectReferences,android/mtp/MtpConstants.OPERATION_GET_OBJECT_REFERENCES,38928
 24,Android.Mtp.OperationCode,GetPartialObject,android/mtp/MtpConstants.OPERATION_GET_PARTIAL_OBJECT,4123
 24,Android.Mtp.OperationCode,GetPartialObject64,android/mtp/MtpConstants.OPERATION_GET_PARTIAL_OBJECT_64,38337
-24,Android.Mtp.OperationCode,GetStorageInfo,android/mtp/MtpConstants.OPERATION_GET_STORAGE_INFO,4101
 24,Android.Mtp.OperationCode,GetStorageIDs,android/mtp/MtpConstants.OPERATION_GET_STORAGE_I_DS,4100
+24,Android.Mtp.OperationCode,GetStorageInfo,android/mtp/MtpConstants.OPERATION_GET_STORAGE_INFO,4101
 24,Android.Mtp.OperationCode,GetThumb,android/mtp/MtpConstants.OPERATION_GET_THUMB,4106
 24,Android.Mtp.OperationCode,InitiateCapture,android/mtp/MtpConstants.OPERATION_INITIATE_CAPTURE,4110
 24,Android.Mtp.OperationCode,InitiateOpenCapture,android/mtp/MtpConstants.OPERATION_INITIATE_OPEN_CAPTURE,4124
@@ -5492,8 +5503,8 @@
 24,Android.OS.TemperatureSource,Shutdown,android/os/HardwarePropertiesManager.TEMPERATURE_SHUTDOWN,2
 24,Android.OS.TemperatureSource,Throttling,android/os/HardwarePropertiesManager.TEMPERATURE_THROTTLING,1
 24,Android.OS.TemperatureSource,ThrottlingBelowVrMin,android/os/HardwarePropertiesManager.TEMPERATURE_THROTTLING_BELOW_VR_MIN,3
-24,Android.OS.UserCreationFailureReason,NotPermitted,android/os/UserManager.USER_CREATION_FAILED_NOT_PERMITTED,1
 24,Android.OS.UserCreationFailureReason,NoMoreUsers,android/os/UserManager.USER_CREATION_FAILED_NO_MORE_USERS,2
+24,Android.OS.UserCreationFailureReason,NotPermitted,android/os/UserManager.USER_CREATION_FAILED_NOT_PERMITTED,1
 24,Android.Service.Carrier.ReceiveOptions,Default,android/service/carrier/CarrierMessagingService.RECEIVE_OPTIONS_DEFAULT,0
 24,Android.Service.Carrier.ReceiveOptions,Drop,android/service/carrier/CarrierMessagingService.RECEIVE_OPTIONS_DROP,1
 24,Android.Service.Carrier.ReceiveOptions,SkipNotifyWhenCredentialProtectedStorageUnavailable,android/service/carrier/CarrierMessagingService.RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE,2
diff --git a/src/Mono.Android/methodmap.csv b/src/Mono.Android/methodmap.csv
index 2ea21109085..c83df0d2b0e 100644
--- a/src/Mono.Android/methodmap.csv
+++ b/src/Mono.Android/methodmap.csv
@@ -2352,3 +2352,25 @@
 26, android.widget, VideoView, setAudioFocusRequest, focusGain, Android.Media.AudioFocus
 
 26, java.util, Calendar.Builder, set, field, Java.Util.CalendarField
+
+27, android.content.pm, PackageInstaller.SessionInfo, getInstallLocation, return, Android.Content.PM.PackageInstallLocation
+27, android.content.pm, PackageInstaller.SessionParams, setInstallLocation, installLocation, Android.Content.PM.PackageInstallLocation
+27, android.content.pm, PackageInstaller.SessionInfo, getMode, return, Android.Content.PM.PackageInstallMode
+27, android.content.pm, PackageInstaller.SessionParams, ctor, mode, Android.Content.PM.PackageInstallMode
+// It was a bit too late to notice this method, or it was added after our final enumification effort for API Level 26.
+// 26, android.content.pm, PackageManager, setApplicationCategory, categoryHint, Android.Content.PM.ApplicationCategories
+// There is AssetInt property (of int) which was removed at API Level 21. We don't/can't enumify it.
+
+27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, addOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags
+27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, removeOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags
+27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, setOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags
+27, android.database.sqlite, SQLiteDatabase.OpenParams, getOpenFlags, return, Android.Database.Sqlite.DatabaseOpenFlags
+
+// Android reference doc says it was added at 24 but I'm 100% sure it wasn't. They just add members and docs, and claims that they were part of 24.
+24, android.icu.util, TimeZone, getTimeZone, type, Android.Icu.Util.TimeZoneType
+
+27, android.media, MediaMetadataRetriever, getScaledFrameAtTime, option, Android.Media.Option
+// 27, android.os, SharedMemory, map, prot, ... is part of OsConstants.
+27, android.view.accessibility, AccessibilityRequestPreparer, ctor, requestTypes, Android.Views.Accessibility.AccessibilityRequestTypes
+// android.view.ViewStructure.setInputType never appeared before - it seems Google keeps breaking API on the docs, which is rather likely they are filling doc bits by fixing their tools.
+27, android.webkit, WebViewClient, onSafeBrowsingHit, threatType, Android.Webkit.SafeBrowsingThreat