XiMengJianYu/.svn/pristine/1f/1ff1d5b7094217c3b99871b1fa99fb96f38a2d4f.svn-base
2023-04-17 17:58:44 +08:00

161 lines
16 KiB
Plaintext
Executable File

-- Merging decision tree log ---
manifest
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:2:1-51:12
package
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:3:5-53
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
android:versionName
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
xmlns:android
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:2:11-69
android:versionCode
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
uses-permission#android.permission.INTERNET
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:5:5-67
MERGED from [XiMengJianYu:cm_utils:unspecified] D:\yanzhixiong\AndroidProject\XiMengJianYu\cm_utils\build\intermediates\bundles\default\AndroidManifest.xml:15:5-67
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:5:22-64
uses-permission#android.permission.GET_ACCOUNTS
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:8:5-71
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:8:22-68
uses-permission#android.permission.READ_PROFILE
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:9:5-71
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:9:22-68
uses-permission#android.permission.READ_CONTACTS
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:10:5-72
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:10:22-69
uses-permission#android.permission.ACCESS_NETWORK_STATE
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:11:5-79
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:11:22-76
application
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:13:5-50:19
MERGED from [XiMengJianYu:cm_utils:unspecified] D:\yanzhixiong\AndroidProject\XiMengJianYu\cm_utils\build\intermediates\bundles\default\AndroidManifest.xml:17:5-21:19
MERGED from [com.android.support.constraint:constraint-layout:1.0.2] C:\Users\Administrator\.android\build-cache\1a0c7c3418596ace2e62469559b3741d6e982f79\output\AndroidManifest.xml:9:5-20
MERGED from [com.android.support:design:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\c880f27e774be0fa32af63059bbbe754760e8740\output\AndroidManifest.xml:29:5-20
MERGED from [com.android.support:appcompat-v7:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\5864429ab938d714529caf4f9f53316afe87ddbe\output\AndroidManifest.xml:29:5-20
MERGED from [com.android.support:animated-vector-drawable:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\1ce4aebb88ad4a6c615126fbafc8d7676910201a\output\AndroidManifest.xml:26:5-20
MERGED from [com.android.support:support-vector-drawable:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\50a512e483d97145cd54e883a94d897ef64759a9\output\AndroidManifest.xml:26:5-20
MERGED from [com.android.support:transition:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\407ad3f2d9529dc7e70058845f08590c0678de63\output\AndroidManifest.xml:26:5-20
MERGED from [com.android.support:support-v4:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\a9ec5cc53983a622343357ba9ddf11bfd719de1a\output\AndroidManifest.xml:29:5-20
MERGED from [com.android.support:support-media-compat:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\dda6f0f8c7f1cb997c975a53df2bc055d6b66182\output\AndroidManifest.xml:29:5-20
MERGED from [com.android.support:support-fragment:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\0f9107a8af9ae599fe91a2e5785526d5357beb03\output\AndroidManifest.xml:29:5-20
MERGED from [com.android.support:support-core-ui:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\a1c4f8bc32c9596f659a2893f986f5153f8fab61\output\AndroidManifest.xml:29:5-20
MERGED from [com.android.support:support-core-utils:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\58bf9d7dac5229842fd07e5aeea8c070588f2d85\output\AndroidManifest.xml:29:5-20
MERGED from [com.android.support:support-compat:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\d4ad336b83816be3f5f8c2f8e76f92d4222db878\output\AndroidManifest.xml:29:5-20
android:label
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:17:9-41
android:supportsRtl
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:21:9-35
android:roundIcon
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:20:9-54
android:allowBackup
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:15:9-35
android:icon
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:16:9-42
android:largeHeap
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:18:9-33
android:persistent
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:19:9-34
android:theme
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:22:9-40
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:14:9-43
activity#com.example.administrator.ximengjianyu.activity.LoginActivity
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:23:9-30:20
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:23:19-57
intent-filter#android.intent.action.MAIN+android.intent.category.DEFAULT+android.intent.category.HOME+android.intent.category.LAUNCHER
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:24:13-29:29
action#android.intent.action.MAIN
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:25:17-69
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:25:25-66
category#android.intent.category.LAUNCHER
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:26:17-77
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:26:27-74
category#android.intent.category.DEFAULT
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:27:17-76
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:27:27-73
category#android.intent.category.HOME
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:28:17-73
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:28:27-70
activity#com.example.administrator.ximengjianyu.MainActivity
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:31:9-50
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:31:19-47
activity#com.example.administrator.ximengjianyu.activity.home.HomeActivity
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:32:9-64
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:32:19-61
activity#com.example.administrator.ximengjianyu.activity.home.NewPwdActivity
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:33:9-75
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:33:19-63
service#com.example.administrator.ximengjianyu.mqtt.push.MQTTService
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:34:9-66
android:name
ADDED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:34:18-55
uses-sdk
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
MERGED from [com.android.support:multidex:1.0.1] C:\Users\Administrator\.android\build-cache\79a4520ed1dea28bc78fb8b7c0842898a4d1ee4d\output\AndroidManifest.xml:18:5-42
MERGED from [XiMengJianYu:cm_utils:unspecified] D:\yanzhixiong\AndroidProject\XiMengJianYu\cm_utils\build\intermediates\bundles\default\AndroidManifest.xml:7:5-9:41
MERGED from [com.android.support.constraint:constraint-layout:1.0.2] C:\Users\Administrator\.android\build-cache\1a0c7c3418596ace2e62469559b3741d6e982f79\output\AndroidManifest.xml:5:5-7:41
MERGED from [com.android.support:design:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\c880f27e774be0fa32af63059bbbe754760e8740\output\AndroidManifest.xml:21:5-23:62
MERGED from [com.android.support:appcompat-v7:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\5864429ab938d714529caf4f9f53316afe87ddbe\output\AndroidManifest.xml:21:5-23:78
MERGED from [com.android.support:animated-vector-drawable:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\1ce4aebb88ad4a6c615126fbafc8d7676910201a\output\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:support-vector-drawable:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\50a512e483d97145cd54e883a94d897ef64759a9\output\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:recyclerview-v7:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\65d05c7457375a6cbdfed0277bc92bdbbadd1a47\output\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:transition:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\407ad3f2d9529dc7e70058845f08590c0678de63\output\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:support-v4:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\a9ec5cc53983a622343357ba9ddf11bfd719de1a\output\AndroidManifest.xml:21:5-23:54
MERGED from [com.android.support:support-media-compat:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\dda6f0f8c7f1cb997c975a53df2bc055d6b66182\output\AndroidManifest.xml:21:5-23:63
MERGED from [com.android.support:support-fragment:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\0f9107a8af9ae599fe91a2e5785526d5357beb03\output\AndroidManifest.xml:21:5-23:60
MERGED from [com.android.support:support-core-ui:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\a1c4f8bc32c9596f659a2893f986f5153f8fab61\output\AndroidManifest.xml:21:5-23:58
MERGED from [com.android.support:support-core-utils:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\58bf9d7dac5229842fd07e5aeea8c070588f2d85\output\AndroidManifest.xml:21:5-23:61
MERGED from [com.jakewharton:butterknife:8.8.1] C:\Users\Administrator\.android\build-cache\21e605de99e2dc4d32dd4887ec4e9424608be143\output\AndroidManifest.xml:5:5-43
MERGED from [com.android.support:support-compat:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\d4ad336b83816be3f5f8c2f8e76f92d4222db878\output\AndroidManifest.xml:21:5-23:58
tools:overrideLibrary
ADDED from [com.android.support:design:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\c880f27e774be0fa32af63059bbbe754760e8740\output\AndroidManifest.xml:23:9-59
android:targetSdkVersion
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
INJECTED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml
uses-permission#android.permission.MOUNT_UNMOUNT_FILESYSTEMS
ADDED from [XiMengJianYu:cm_utils:unspecified] D:\yanzhixiong\AndroidProject\XiMengJianYu\cm_utils\build\intermediates\bundles\default\AndroidManifest.xml:11:5-84
android:name
ADDED from [XiMengJianYu:cm_utils:unspecified] D:\yanzhixiong\AndroidProject\XiMengJianYu\cm_utils\build\intermediates\bundles\default\AndroidManifest.xml:11:22-81
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from [XiMengJianYu:cm_utils:unspecified] D:\yanzhixiong\AndroidProject\XiMengJianYu\cm_utils\build\intermediates\bundles\default\AndroidManifest.xml:13:5-81
android:name
ADDED from [XiMengJianYu:cm_utils:unspecified] D:\yanzhixiong\AndroidProject\XiMengJianYu\cm_utils\build\intermediates\bundles\default\AndroidManifest.xml:13:22-78
uses-permission#android.permission.READ_EXTERNAL_STORAGE
IMPLIED from D:\yanzhixiong\AndroidProject\XiMengJianYu\app\src\main\AndroidManifest.xml:2:1-51:12 reason: com.cm.cmokhttp requested WRITE_EXTERNAL_STORAGE
meta-data#android.support.VERSION
ADDED from [com.android.support:design:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\c880f27e774be0fa32af63059bbbe754760e8740\output\AndroidManifest.xml:25:5-27:41
MERGED from [com.android.support:appcompat-v7:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\5864429ab938d714529caf4f9f53316afe87ddbe\output\AndroidManifest.xml:25:5-27:41
MERGED from [com.android.support:animated-vector-drawable:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\1ce4aebb88ad4a6c615126fbafc8d7676910201a\output\AndroidManifest.xml:22:5-24:41
MERGED from [com.android.support:support-vector-drawable:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\50a512e483d97145cd54e883a94d897ef64759a9\output\AndroidManifest.xml:22:5-24:41
MERGED from [com.android.support:recyclerview-v7:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\65d05c7457375a6cbdfed0277bc92bdbbadd1a47\output\AndroidManifest.xml:22:5-24:41
MERGED from [com.android.support:transition:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\407ad3f2d9529dc7e70058845f08590c0678de63\output\AndroidManifest.xml:22:5-24:41
MERGED from [com.android.support:support-v4:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\a9ec5cc53983a622343357ba9ddf11bfd719de1a\output\AndroidManifest.xml:25:5-27:41
MERGED from [com.android.support:support-media-compat:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\dda6f0f8c7f1cb997c975a53df2bc055d6b66182\output\AndroidManifest.xml:25:5-27:41
MERGED from [com.android.support:support-fragment:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\0f9107a8af9ae599fe91a2e5785526d5357beb03\output\AndroidManifest.xml:25:5-27:41
MERGED from [com.android.support:support-core-ui:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\a1c4f8bc32c9596f659a2893f986f5153f8fab61\output\AndroidManifest.xml:25:5-27:41
MERGED from [com.android.support:support-core-utils:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\58bf9d7dac5229842fd07e5aeea8c070588f2d85\output\AndroidManifest.xml:25:5-27:41
MERGED from [com.android.support:support-compat:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\d4ad336b83816be3f5f8c2f8e76f92d4222db878\output\AndroidManifest.xml:25:5-27:41
android:value
ADDED from [com.android.support:design:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\c880f27e774be0fa32af63059bbbe754760e8740\output\AndroidManifest.xml:27:9-38
android:name
ADDED from [com.android.support:design:26.0.0-alpha1] C:\Users\Administrator\.android\build-cache\c880f27e774be0fa32af63059bbbe754760e8740\output\AndroidManifest.xml:26:9-47