From 2e3036055030b211429cbd6edd7c358ac9bb9fd3 Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期六, 28 八月 2021 13:59:55 +0800
Subject: [PATCH] 厂商集中整理

---
 /dev/null                                           |   10 -
 Shared.Droid.JPush/Additions/AboutAdditions.txt     |    0 
 Shared.Droid.JPush/Properties/AssemblyInfo.cs       |    2 
 Shared.Droid.JPush/Transforms/EnumFields.xml        |    5 
 Shared.Droid.JPush/HmsLazyInputStream.cs            |   28 ++++
 Shared.Droid.JPush/Jars/AboutJars.txt               |    0 
 Shared.Droid.JPush/Transforms/EnumMethods.xml       |    5 
 Shared.Droid.JPush/Jars/android_jpush_fcm_4.3.0.aar |    0 
 Shared.Droid.JPush/Transforms/Metadata.xml          |  188 +++++++++++++++++++++++++++++++
 Shared.Droid.JPush/Shared.Droid.JPush.csproj        |    8 +
 Shared.Droid.JPush/HmsContentProvider.cs            |   55 +++++++++
 11 files changed, 281 insertions(+), 20 deletions(-)

diff --git a/Shared.Droid.JPush/.vs/Shared.Droid.JPush/xs/UserPrefs.xml b/Shared.Droid.JPush/.vs/Shared.Droid.JPush/xs/UserPrefs.xml
deleted file mode 100644
index 6c3f569..0000000
--- a/Shared.Droid.JPush/.vs/Shared.Droid.JPush/xs/UserPrefs.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-锘�<Properties StartupConfiguration="{0F1466BC-E714-44E7-A25A-F3C9A7CB7A16}|Default">
-  <MonoDevelop.Ide.ItemProperties.Shared.Droid.JPush PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Shared.Droid.JPush/Transforms/Metadata.xml">
-    <Files>
-      <File FileName="Shared.Droid.JPush/Transforms/EnumMethods.xml" Line="1" Column="1" />
-      <File FileName="Shared.Droid.JPush/Transforms/Metadata.xml" Line="1" Column="1" />
-    </Files>
-    <Pads>
-      <Pad Id="ProjectPad">
-        <State name="__root__">
-          <Node name="Shared.Droid.JPush" expanded="True">
-            <Node name="Shared.Droid.JPush" expanded="True" selected="True">
-              <Node name="Additions" expanded="True" />
-              <Node name="Jars" expanded="True" />
-              <Node name="Properties" expanded="True" />
-              <Node name="Transforms" expanded="True" />
-            </Node>
-          </Node>
-        </State>
-      </Pad>
-    </Pads>
-  </MonoDevelop.Ide.Workbench>
-  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
-  <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore />
-  </MonoDevelop.Ide.DebuggingService.Breakpoints>
-  <MultiItemStartupConfigurations />
-</Properties>
\ No newline at end of file
diff --git a/Shared.Droid.JPush/.vs/Shared.Droid.JPush/xs/project-cache/Shared.Droid.JPush-Debug.json b/Shared.Droid.JPush/.vs/Shared.Droid.JPush/xs/project-cache/Shared.Droid.JPush-Debug.json
deleted file mode 100644
index e76becc..0000000
--- a/Shared.Droid.JPush/.vs/Shared.Droid.JPush/xs/project-cache/Shared.Droid.JPush-Debug.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v8.0/Mono.Android.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[],"Framework":null}],"Files":["/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Properties/AssemblyInfo.cs","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Jars/AboutJars.txt","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Additions/AboutAdditions.txt","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/Metadata.xml","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumFields.xml","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumMethods.xml"],"BuildActions":["Compile","None","None","TransformFile","TransformFile","TransformFile"],"Analyzers":[],"AdditionalFiles":[],"EditorConfigFiles":[]}
\ No newline at end of file
diff --git a/Shared.Droid.JPush/.vs/Shared.Droid.JPush/xs/project-cache/Shared.Droid.JPush-Release.json b/Shared.Droid.JPush/.vs/Shared.Droid.JPush/xs/project-cache/Shared.Droid.JPush-Release.json
deleted file mode 100644
index e76becc..0000000
--- a/Shared.Droid.JPush/.vs/Shared.Droid.JPush/xs/project-cache/Shared.Droid.JPush-Release.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v8.0/Mono.Android.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/11.1.0.17/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[],"Framework":null}],"Files":["/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Properties/AssemblyInfo.cs","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Jars/AboutJars.txt","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Additions/AboutAdditions.txt","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/Metadata.xml","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumFields.xml","/Users/jlchen/JLChen/ProjectsCode/HDLGit/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumMethods.xml"],"BuildActions":["Compile","None","None","TransformFile","TransformFile","TransformFile"],"Analyzers":[],"AdditionalFiles":[],"EditorConfigFiles":[]}
\ No newline at end of file
diff --git a/Shared.Droid.JPush/Shared.Droid.JPush/Additions/AboutAdditions.txt b/Shared.Droid.JPush/Additions/AboutAdditions.txt
similarity index 100%
rename from Shared.Droid.JPush/Shared.Droid.JPush/Additions/AboutAdditions.txt
rename to Shared.Droid.JPush/Additions/AboutAdditions.txt
diff --git a/Shared.Droid.JPush/HmsContentProvider.cs b/Shared.Droid.JPush/HmsContentProvider.cs
new file mode 100644
index 0000000..8078dac
--- /dev/null
+++ b/Shared.Droid.JPush/HmsContentProvider.cs
@@ -0,0 +1,55 @@
+锘�
+using Android.Content;
+using Android.Database;
+
+using System;
+using Huawei.Agconnect.Config;
+
+
+namespace Shared.Droid.JPush
+{
+    [ContentProvider(new string[] { "Shared.Droid.JPush.HmsContentProvider" })]
+    class HmsContentProvider : ContentProvider
+    {
+        public override int Delete(Android.Net.Uri uri, string selection, string[] selectionArgs)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override string GetType(Android.Net.Uri uri)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override Android.Net.Uri Insert(Android.Net.Uri uri, ContentValues values)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override bool OnCreate()
+        {
+
+            try
+            {
+                AGConnectServicesConfig config = AGConnectServicesConfig.FromContext(Context);
+                config.OverlayWith(new HmsLazyInputStream(Context));
+            }
+            catch (Exception e)
+            {
+
+            }
+
+            return false;
+        }
+
+        public override ICursor Query(Android.Net.Uri uri, string[] projection, string selection, string[] selectionArgs, string sortOrder)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override int Update(Android.Net.Uri uri, ContentValues values, string selection, string[] selectionArgs)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Shared.Droid.JPush/HmsLazyInputStream.cs b/Shared.Droid.JPush/HmsLazyInputStream.cs
new file mode 100644
index 0000000..963fc3a
--- /dev/null
+++ b/Shared.Droid.JPush/HmsLazyInputStream.cs
@@ -0,0 +1,28 @@
+锘縰sing Android.Content;
+using Android.Util;
+using System;
+using System.IO;
+using Huawei.Agconnect.Config;
+
+namespace Shared.Droid.JPush
+{
+    class HmsLazyInputStream : LazyInputStream
+    {
+        public HmsLazyInputStream(Context context) : base(context)
+        {
+        }
+
+        public override Stream Get(Context context)
+        {
+            try
+            {
+                return context.Assets.Open("agconnect-services.json");
+            }
+            catch (Exception e)
+            {
+                Log.Info(e.ToString(), "Can't open agconnect file");
+                return null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Shared.Droid.JPush/Shared.Droid.JPush/Jars/AboutJars.txt b/Shared.Droid.JPush/Jars/AboutJars.txt
similarity index 100%
rename from Shared.Droid.JPush/Shared.Droid.JPush/Jars/AboutJars.txt
rename to Shared.Droid.JPush/Jars/AboutJars.txt
diff --git a/Shared.Droid.JPush/Jars/android_jpush_fcm_4.3.0.aar b/Shared.Droid.JPush/Jars/android_jpush_fcm_4.3.0.aar
new file mode 100644
index 0000000..7a6c224
--- /dev/null
+++ b/Shared.Droid.JPush/Jars/android_jpush_fcm_4.3.0.aar
Binary files differ
diff --git a/Shared.Droid.JPush/Shared.Droid.JPush/Properties/AssemblyInfo.cs b/Shared.Droid.JPush/Properties/AssemblyInfo.cs
similarity index 93%
rename from Shared.Droid.JPush/Shared.Droid.JPush/Properties/AssemblyInfo.cs
rename to Shared.Droid.JPush/Properties/AssemblyInfo.cs
index 26b1026..6f30007 100644
--- a/Shared.Droid.JPush/Shared.Droid.JPush/Properties/AssemblyInfo.cs
+++ b/Shared.Droid.JPush/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 锘縰sing System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Android.App;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
diff --git a/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush.csproj b/Shared.Droid.JPush/Shared.Droid.JPush.csproj
similarity index 88%
rename from Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush.csproj
rename to Shared.Droid.JPush/Shared.Droid.JPush.csproj
index ffef35e..0149e07 100644
--- a/Shared.Droid.JPush/Shared.Droid.JPush/Shared.Droid.JPush.csproj
+++ b/Shared.Droid.JPush/Shared.Droid.JPush.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0F1466BC-E714-44E7-A25A-F3C9A7CB7A16}</ProjectGuid>
+    <ProjectGuid>{06B9C874-B9B2-4417-8280-B321F966E46B}</ProjectGuid>
     <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TemplateGuid>{77efb91c-a7e9-4b0e-a7c5-31eeec3c6d46}</TemplateGuid>
     <OutputType>Library</OutputType>
@@ -14,7 +14,8 @@
     <AssemblyName>Shared.Droid.JPush</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <Deterministic>True</Deterministic>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -42,11 +43,14 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="HmsContentProvider.cs" />
+    <Compile Include="HmsLazyInputStream.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Jars\AboutJars.txt" />
     <None Include="Additions\AboutAdditions.txt" />
+    <LibraryProjectZip Include="Jars\android_jpush_fcm_4.3.0.aar" />
   </ItemGroup>
   <ItemGroup>
     <TransformFile Include="Transforms\Metadata.xml" />
diff --git a/Shared.Droid.JPush/Shared.Droid.JPush.sln b/Shared.Droid.JPush/Shared.Droid.JPush.sln
deleted file mode 100644
index 2a1c5a3..0000000
--- a/Shared.Droid.JPush/Shared.Droid.JPush.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.808.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid.JPush", "Shared.Droid.JPush\Shared.Droid.JPush.csproj", "{0F1466BC-E714-44E7-A25A-F3C9A7CB7A16}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0F1466BC-E714-44E7-A25A-F3C9A7CB7A16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F1466BC-E714-44E7-A25A-F3C9A7CB7A16}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F1466BC-E714-44E7-A25A-F3C9A7CB7A16}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F1466BC-E714-44E7-A25A-F3C9A7CB7A16}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {17957775-0F35-4177-AE73-31D0AC2D9FBE}
-	EndGlobalSection
-EndGlobal
diff --git a/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/Metadata.xml b/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/Metadata.xml
deleted file mode 100644
index d091d82..0000000
--- a/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/Metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-锘�<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-    <!--
-  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
-  
-  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-  -->
-</metadata>
\ No newline at end of file
diff --git a/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumFields.xml b/Shared.Droid.JPush/Transforms/EnumFields.xml
similarity index 88%
rename from Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumFields.xml
rename to Shared.Droid.JPush/Transforms/EnumFields.xml
index e4a0f89..2295995 100644
--- a/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumFields.xml
+++ b/Shared.Droid.JPush/Transforms/EnumFields.xml
@@ -1,6 +1,5 @@
-锘�<?xml version="1.0" encoding="UTF-8"?>
-<enum-field-mappings>
-    <!--
+锘�<enum-field-mappings>
+  <!--
   This example converts the constants Fragment_id, Fragment_name,
   and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
   to an enum called Android.Support.V4.App.FragmentTagType with values
diff --git a/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumMethods.xml b/Shared.Droid.JPush/Transforms/EnumMethods.xml
similarity index 86%
rename from Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumMethods.xml
rename to Shared.Droid.JPush/Transforms/EnumMethods.xml
index 6ff109b..49216c6 100644
--- a/Shared.Droid.JPush/Shared.Droid.JPush/Transforms/EnumMethods.xml
+++ b/Shared.Droid.JPush/Transforms/EnumMethods.xml
@@ -1,6 +1,5 @@
-锘�<?xml version="1.0" encoding="UTF-8"?>
-<enum-method-mappings>
-    <!--
+锘�<enum-method-mappings>
+  <!--
   This example changes the Java method:
     android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
   to be:
diff --git a/Shared.Droid.JPush/Transforms/Metadata.xml b/Shared.Droid.JPush/Transforms/Metadata.xml
new file mode 100644
index 0000000..df4598b
--- /dev/null
+++ b/Shared.Droid.JPush/Transforms/Metadata.xml
@@ -0,0 +1,188 @@
+锘�<metadata>
+  <!--
+  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
+  
+  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
+  -->
+	
+	
+	<!--=======鍗庝负======-->
+	<!--base-->
+	<attr path="/api/package[@name='com.huawei.hms.common.data']/class[@name='DataHolderCreator']/method[@name='createFromParcel' and count(parameter)=1 and parameter[1][@type='android.os.Parcel']]" name="managedReturn">Java.Lang.Object</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.data']/class[@name='DataHolderCreator']/method[@name='newArray' and count(parameter)=1 and parameter[1][@type='int']]" name="managedReturn">Java.Lang.Object[]</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api']/class[@name='ResolvePendingResult']/method[@name='onComplete' and count(parameter)=1 and parameter[1][@type='T']]" name="managedReturn">Java.Lang.Object</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.internal']/class[@name='DialogRedirectImpl']/method[@name='redirect' and count(parameter)=0]" name="visibility">protected</attr>
+
+	<attr path="/api/package[@name='com.huawei.hms.common']/class[@name='FeatureCreator']/method[@name='createFromParcel' and count(parameter)=1 and parameter[1][@type='android.os.Parcel']]" name="managedReturn">Java.Lang.Object</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common']/class[@name='FeatureCreator']/method[@name='newArray' and count(parameter)=1 and parameter[1][@type='int']]" name="managedReturn">Java.Lang.Object[]</attr>
+
+	<attr path="/api/package[@name='com.huawei.hms.common.webserverpic']/class[@name='WebServerPicCreator']/method[@name='createFromParcel' and count(parameter)=1 and parameter[1][@type='android.os.Parcel']]" name="managedReturn">Java.Lang.Object</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.webserverpic']/class[@name='WebServerPicCreator']/method[@name='newArray' and count(parameter)=1 and parameter[1][@type='int']]" name="managedReturn">Java.Lang.Object[]</attr>
+
+	<remove-node path="/api/package[@name='com.huawei.hms.common.internal']/class[@name='TaskApiCall']/method[@name='doExecute']" />
+	<remove-node path="/api/package[@name='com.huawei.hms.common.data']/class[@name='DataHolder']/method[@name='finalize' and count(parameter)=0]" />
+	<remove-node path="/api/package[@name='com.huawei.hms.support.api.client']/class[@name='ResolvingResultCallbacks']/method[@name='onSuccess' and count(parameter)=1 and parameter[1][@type='R']]" />
+
+	<attr path="/api/package[@name='com.huawei.hms.support.hianalytics']/class[@name='HiAnalyticsClient']" name="extends">Java.Lang.Object</attr>
+
+	<add-node path="/api/package[@name='com.huawei.hms.support.api.client']/class[@name='ResolvingResultCallbacks']">
+		<method name="onSuccess" return="void" abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public">
+			<parameter name="context" type="java.lang.Object" />
+		</method>
+	</add-node>
+	<add-node path="/api/package[@name='com.huawei.hms.common.data']/class[@name='DBInnerIter']">
+		<method name="remove" return="void" abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" />
+	</add-node>
+
+	<!-- Renaming namespaces -->
+
+	<attr path="/api/package[@name='com.huawei.hms.actions']" name="managedName">Huawei.Hms.Actions</attr>
+	<attr path="/api/package[@name='com.huawei.hms.activity']" name="managedName">Huawei.Hms.Activity</attr>
+	<attr path="/api/package[@name='com.huawei.hms.activity.internal']" name="managedName">Huawei.Hms.Activity.Internal</attr>
+	<attr path="/api/package[@name='com.huawei.hms.adapter']" name="managedName">Huawei.Hms.Adapter</attr>
+	<attr path="/api/package[@name='com.huawei.hms.adapter.internal']" name="managedName">Huawei.Hms.Adapter.Internal</attr>
+	<attr path="/api/package[@name='com.huawei.hms.api']" name="managedName">Huawei.Hms.Api</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common']" name="managedName">Huawei.Hms.Common</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.api']" name="managedName">Huawei.Hms.Common.Api</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.api.internal']" name="managedName">Huawei.Hms.Common.Api.Internal</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.data']" name="managedName">Huawei.Hms.Common.Data</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.internal']" name="managedName">Huawei.Hms.Common.Internal</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.internal.safeparcel']" name="managedName">Huawei.Hms.Common.Internal.SafeParcel</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.size']" name="managedName">Huawei.Hms.Common.Size</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.sqlite']" name="managedName">Huawei.Hms.Common.S</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.util']" name="managedName">Huawei.Hms.Common.Util</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.webserverpic']" name="managedName">Huawei.Hms.Common.WebServicePic</attr>
+	<attr path="/api/package[@name='com.huawei.hms.core.aidl']" name="managedName">Huawei.Hms.Core.Aidl</attr>
+	<attr path="/api/package[@name='com.huawei.hms.core.aidl.annotation']" name="managedName">Huawei.Hms.Core.Aidl.Annotation</attr>
+	<attr path="/api/package[@name='com.huawei.hms.security']" name="managedName">Huawei.Hms.Security</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api']" name="managedName">Huawei.Hms.Support.Api</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.client']" name="managedName">Huawei.Hms.Support.Api.Client</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.core']" name="managedName">Huawei.Hms.Support.Api.Core</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.entity.auth']" name="managedName">Huawei.Hms.Support.Api.Entity.Auth</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.entity.core']" name="managedName">Huawei.Hms.Support.Api.Entity.Core</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.transport']" name="managedName">Huawei.Hms.Support.Api.Transport</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.hianalytics']" name="managedName">Huawei.Hms.Support.HiAnalytics</attr>
+	<attr path="/api/package[@name='com.huawei.hms.utils']" name="managedName">Huawei.Hms.Utils</attr>
+	
+	<!--HmsDevice-->
+	<attr path="/api/package[@name='com.huawei.hms.utils']/class[@name='IOUtils']/method[@name='closeQuietly' and count(parameter)=1 and parameter[1][@type='java.io.OutputStream']]" name="managedName">CloseQuietlyOutputStream</attr>
+	<attr path="/api/package[@name='com.huawei.hms.utils']/class[@name='IOUtils']/method[@name='closeQuietly' and count(parameter)=1 and parameter[1][@type='java.io.InputStream']]" name="managedName">CloseQuietlyInputStream</attr>
+
+	<attr path="/api/package[@name='com.huawei.hms.android']" name="managedName">Huawei.Hms.Android</attr>
+	<attr path="/api/package[@name='com.huawei.hms.base.device']" name="managedName">Huawei.Hms.Base.Device</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common']" name="managedName">Huawei.Hms.Common</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.internal']" name="managedName">Huawei.Hms.Common.Internal</attr>
+	<attr path="/api/package[@name='com.huawei.hms.common.util']" name="managedName">Huawei.Hms.Common.Util</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.gentyref']" name="managedName">Huawei.Hms.Support.Gentyref</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.log.common']" name="managedName">Huawei.Hms.Support.Log.Common</attr>
+	<attr path="/api/package[@name='com.huawei.hms.utils']" name="managedName">Huawei.Hms.Utils</attr>
+	<attr path="/api/package[@name='com.huawei.hms.utils.a']" name="managedName">Huawei.Hms.Utils.A</attr>
+	
+	<!--HmsOpenDevice-->
+	<attr path="/api/package[@name='com.huawei.hms.opendevice']/class[@name='OpenDeviceHmsClientBuilder']/method[@name='buildClient']" name="managedReturn">Java.Lang.Object</attr>
+	<attr path="/api/package[@name='com.huawei.hms.aaid.task']/class[@name='PushClientBuilder']/method[@name='buildClient']" name="managedReturn">Java.Lang.Object</attr>
+	<remove-node path="/api/package[@name='com.huawei.hms.opendevice']/class[@name='OpenDeviceTaskApiCall']"/>
+
+	<attr path="/api/package[@name='com.huawei.hms.aaid']" name="managedName">Huawei.Hms.Aaid</attr>
+	<attr path="/api/package[@name='com.huawei.hms.aaid.constant']" name="managedName">Huawei.Hms.Aaid.Constant</attr>
+	<attr path="/api/package[@name='com.huawei.hms.aaid.encrypt']" name="managedName">Huawei.Hms.Aaid.Encrypt</attr>
+	<attr path="/api/package[@name='com.huawei.hms.aaid.entity']" name="managedName">Huawei.Hms.Aaid.Entity</attr>
+	<attr path="/api/package[@name='com.huawei.hms.aaid.init']" name="managedName">Huawei.Hms.Aaid.Init</attr>
+	<attr path="/api/package[@name='com.huawei.hms.aaid.plugin']" name="managedName">Huawei.Hms.Aaid.Plugin</attr>
+	<attr path="/api/package[@name='com.huawei.hms.aaid.task']" name="managedName">Huawei.Hms.Aaid.Task</attr>
+	<attr path="/api/package[@name='com.huawei.hms.aaid.utils']" name="managedName">Huawei.Hms.Aaid.Utils</attr>
+	<attr path="/api/package[@name='com.huawei.hms.opendevice']" name="managedName">Huawei.Hms.OpenDevice</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.entity.opendevice']" name="managedName">Huawei.Hms.Support.Api.Entity.OpenDevice</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.opendevice']" name="managedName">Huawei.Hms.Support.Api.OpenDevice</attr>
+	
+	<!--HmsNetworkCommon-->
+	<attr path="/api/package[@name='com.huawei.hms.framework.common']/class[@name='IoUtils']/method[@name='closeSecure' and count(parameter)=1 and parameter[1][@type='java.io.OutputStream']]" name="managedName">CloseOutputStreamSecure</attr>
+	<attr path="/api/package[@name='com.huawei.hms.framework.common']/class[@name='IoUtils']/method[@name='closeSecure' and count(parameter)=1 and parameter[1][@type='java.io.InputStream']]" name="managedName">CloseInputStreamSecure</attr>
+	<attr path="/api/package[@name='com.huawei.hms.framework.common']" name="managedName">Huawei.Hms.Framework.Common</attr>
+	<attr path="/api/package[@name='com.huawei.hms.framework.common.hianalytics']" name="managedName">Huawei.Hms.Framework.Common.HiAnalytics</attr>
+	<add-node path="/api/package[@name='com.huawei.hms.framework.common']/class[@name='RunnableScheduledFutureEnhance']">
+		<method name="compareTo" return="int" abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public">
+			<parameter name="context" type="java.lang.Object" />
+		</method>
+	</add-node>
+	
+	<!--HmsSecurityBase-->
+	<attr path="/api/package[@name='com.huawei.secure.android.common.util']/class[@name='IOUtil']/method[@name='closeSecure' and count(parameter)=1 and parameter[1][@type='java.io.OutputStream']]" name="managedName">CloseOutputStreamSecure</attr>
+	<attr path="/api/package[@name='com.huawei.secure.android.common.util']/class[@name='IOUtil']/method[@name='closeSecure' and count(parameter)=1 and parameter[1][@type='java.io.InputStream']]" name="managedName">CloseInputStreamSecure</attr>
+
+	<attr path="/api/package[@name='com.huawei.secure.android.common']" name="managedName">Huawei.Secure.Android.Common</attr>
+	<attr path="/api/package[@name='com.huawei.secure.android.common.anonymization']" name="managedName">Huawei.Secure.Android.Common.Anonymization</attr>
+	<attr path="/api/package[@name='com.huawei.secure.android.common.base']" name="managedName">Huawei.Secure.Android.Common.Base</attr>
+	<attr path="/api/package[@name='com.huawei.secure.android.common.exception']" name="managedName">Huawei.Secure.Android.Common.Exception</attr>
+	<attr path="/api/package[@name='com.huawei.secure.android.common.sign']" name="managedName">Huawei.Secure.Android.Common.Sign</attr>
+	<attr path="/api/package[@name='com.huawei.secure.android.common.util']" name="managedName">Huawei.Secure.Android.Common.Util</attr>
+	<attr path="/api/package[@name='com.huawei.secure.android.common.webview']" name="managedName">Huawei.Secure.Android.Common.Webview</attr>
+	<attr path="/api/package[@name='com.huawei.secure.android.common.xml']" name="managedName">Huawei.Secure.Android.Common.Xml</attr>
+	
+	<!--agconnnect-->
+	<attr path="/api/package[@name='com.huawei.agconnect.core']/class[@name='Service']" name="managedName">AgconnectService</attr>
+	<attr path="/api/package[@name='com.huawei.agconnect']" name="managedName">Huawei.Agconnect</attr>
+	<attr path="/api/package[@name='com.huawei.agconnect.annotation']" name="managedName">Huawei.Agconnect.Annotation</attr>
+	<attr path="/api/package[@name='com.huawei.agconnect.config']" name="managedName">Huawei.Agconnect.Config</attr>
+	<attr path="/api/package[@name='com.huawei.agconnect.core']" name="managedName">Huawei.Agconnect.Core</attr>
+	<attr path="/api/package[@name='com.huawei.agconnect.core.provider']" name="managedName">Huawei.Agconnect.Core.Provider</attr>
+	<attr path="/api/package[@name='com.huawei.agconnect.core.service']" name="managedName">Huawei.Agconnect.Core.Service</attr>
+	<attr path="/api/package[@name='com.huawei.agconnect.core.service.auth']" name="managedName">Huawei.Agconnect.Core.Service.Auth</attr>
+	<attr path="/api/package[@name='com.huawei.agconnect.exception']" name="managedName">Huawei.Agconnect.Exception</attr>
+
+	<!--push-->
+	<attr path="/api/package[@name='com.huawei.hms.push.task']/class[@name='IntentCallable']/method[@name='call']" name="managedReturn">Java.Lang.Object</attr>
+	<attr path="/api/package[@name='com.huawei.hms.push']" name="managedName">Huawei.Hms.Push</attr>
+	<attr path="/api/package[@name='com.huawei.hms.push.constant']" name="managedName">Huawei.Hms.Push.Constant</attr>
+	<attr path="/api/package[@name='com.huawei.hms.push.task']" name="managedName">Huawei.Hms.Push.Task</attr>
+	<attr path="/api/package[@name='com.huawei.hms.push.ups']" name="managedName">Huawei.Hms.Push.Ups</attr>
+	<attr path="/api/package[@name='com.huawei.hms.push.ups.entity']" name="managedName">Huawei.Hms.Push.Ups.Entity</attr>
+	<attr path="/api/package[@name='com.huawei.hms.push.utils']" name="managedName">Huawei.Hms.Push.Utils</attr>
+	<attr path="/api/package[@name='com.huawei.hms.push.utils.ha']" name="managedName">Huawei.Hms.Push.Utils.HA</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.entity.push']" name="managedName">Huawei.Hms.Support.Api.Entity.Push</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push']" name="managedName">Huawei.Hms.Support.Api.Push</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.base']" name="managedName">Huawei.Hms.Support.Api.Push.Base</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.base']" name="managedName">Huawei.Hms.Support.Api.Push.Base</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.pushselfshow']" name="managedName">Huawei.Hms.Support.Api.Push.PushSelfShow</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.pushselfshow.click']" name="managedName">Huawei.Hms.Support.Api.Push.PushSelfShow.Click</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.pushselfshow.entity']" name="managedName">Huawei.Hms.Support.Api.Push.PushSelfShow.Entity</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.pushselfshow.prepare']" name="managedName">Huawei.Hms.Support.Api.Push.PushSelfShow.Prepare</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.pushselfshow.utils']" name="managedName">Huawei.Hms.Support.Api.Push.PushSelfShow.Utils</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.service']" name="managedName">Huawei.Hms.Support.Api.Push.Service</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.utils']" name="managedName">Huawei.Hms.Support.Api.Push.Utils</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.utils.common']" name="managedName">Huawei.Hms.Support.Api.Push.Utils.Common</attr>
+	<attr path="/api/package[@name='com.huawei.hms.support.api.push.utils.common.base']" name="managedName">Huawei.Hms.Support.Api.Push.Utils.Common.Base</attr>
+	<!--=======鍗庝负End========-->
+	
+	<!--=======灏忕背===========-->
+	<remove-node path="/api/package[@name='com.xiaomi.mipush.sdk']/class[@name='PushMessageHandler']/method[@name='b' and count(parameter)=0]"/>
+	<add-node path="/api/package[@name='com.xiaomi.mipush.sdk']/class[@name='PushMessageHandler']">
+		<method  name="b" return="boolean" abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" jni-signature="()Z" jni-return="Z" bridge="false" synthetic="false" visibility="protected">
+		</method>
+	</add-node>
+	<remove-node path="/api/package[@name='com.xiaomi.mipush.sdk']/class[@name='PushMessageHandler']/method[@name='a' and count(parameter)=0]"/>
+	<add-node path="/api/package[@name='com.xiaomi.mipush.sdk']/class[@name='PushMessageHandler']">
+		<method  name="a" return="boolean" abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" jni-signature="()Z" jni-return="Z" bridge="false" synthetic="false" visibility="protected">
+		</method>
+	</add-node>
+	<remove-node path="/api/package[@name='com.xiaomi.push.service']/class[@name='XMPushService']/method[@name='a' and count(parameter)=1 and parameter[1][@type='int']]"/>
+	<!--=======灏忕背End========-->
+	
+	<!--=======榄呮棌=========-->
+	<attr path="/api/package[@name='com.meizu.cloud.pushsdk.notification.model']/class[@name='ActVideoSetting']" name="managedName">MeizuActVideoSetting</attr>
+	<attr path="/api/package[@name='com.meizu.cloud.pushsdk.notification.model']/class[@name='AdvanceSetting']" name="managedName">MeizuAdvanceSetting</attr>
+	<attr path="/api/package[@name='com.meizu.cloud.pushsdk.notification.model']/class[@name='AdvanceSettingEx']" name="managedName">MeizuAdvanceSettingEx</attr>
+	<attr path="/api/package[@name='com.meizu.cloud.pushsdk.notification.model']/class[@name='NotifyType']" name="managedName">MeizuNotifyType</attr>
+	<attr path="/api/package[@name='com.meizu.cloud.pushsdk.notification.model']/class[@name='NotificationStyle']" name="managedName">MeizuNotificationStyle</attr>
+	<attr path="/api/package[@name='com.meizu.cloud.pushsdk.notification.model']/class[@name='AdvertisementOption']" name="managedName">MeizuAdvertisementOption</attr>
+	<attr path="/api/package[@name='com.meizu.cloud.pushsdk.notification.model']/class[@name='AppIconSetting']" name="managedName">MeizuAppIconSetting</attr>
+	<attr path="/api/package[@name='com.meizu.cloud.pushsdk.notification.model']/class[@name='BrightRemindSetting']" name="managedName">MeizuBrightRemindSetting</attr>
+	<attr path="/api/package[@name='com.meizu.cloud.pushsdk.notification.model']/class[@name='TimeDisplaySetting']" name="managedName">MeizuTimeDisplaySetting</attr>
+	<!--=======榄呮棌End=========-->
+	
+	<!--========鏋佸厜=========-->
+	<!--<attr path="/api/package[@name='cn.jpush.android.data']" name="managedname">cn.jpush.android.jdata</attr>-->
+	<!--======鏋佸厜End========-->
+</metadata>

--
Gitblit v1.8.0