diff options
Diffstat (limited to 'manifest-merger-release-report.txt')
| -rw-r--r-- | manifest-merger-release-report.txt | 270 |
1 files changed, 270 insertions, 0 deletions
diff --git a/manifest-merger-release-report.txt b/manifest-merger-release-report.txt new file mode 100644 index 00000000..b02dcf65 --- /dev/null +++ b/manifest-merger-release-report.txt @@ -0,0 +1,270 @@ +-- Merging decision tree log --- +manifest +ADDED from AndroidManifest.xml:2:1 + package + ADDED from AndroidManifest.xml:3:5 + android:versionName + INJECTED from AndroidManifest.xml:0:0 + INJECTED from AndroidManifest.xml:0:0 + xmlns:tools + ADDED from AndroidManifest.xml:5:5 + xmlns:android + ADDED from AndroidManifest.xml:4:5 + android:versionCode + INJECTED from AndroidManifest.xml:0:0 + INJECTED from AndroidManifest.xml:0:0 +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +ADDED from AndroidManifest.xml:7:5 + android:name + ADDED from AndroidManifest.xml:7:22 +uses-permission#android.permission.READ_EXTERNAL_STORAGE +ADDED from AndroidManifest.xml:8:5 + android:name + ADDED from AndroidManifest.xml:8:22 +uses-permission#android.permission.READ_CONTACTS +ADDED from AndroidManifest.xml:9:5 + android:name + ADDED from AndroidManifest.xml:9:22 +uses-permission#android.permission.READ_PROFILE +ADDED from AndroidManifest.xml:10:5 + android:name + ADDED from AndroidManifest.xml:10:22 +uses-permission#android.permission.INTERNET +ADDED from AndroidManifest.xml:11:5 + android:name + ADDED from AndroidManifest.xml:11:22 +uses-permission#android.permission.ACCESS_NETWORK_STATE +ADDED from AndroidManifest.xml:12:5 + android:name + ADDED from AndroidManifest.xml:12:22 +uses-permission#android.permission.WAKE_LOCK +ADDED from AndroidManifest.xml:13:5 + android:name + ADDED from AndroidManifest.xml:13:22 +uses-permission#android.permission.RECEIVE_BOOT_COMPLETED +ADDED from AndroidManifest.xml:14:5 + android:name + ADDED from AndroidManifest.xml:14:22 +uses-permission#android.permission.VIBRATE +ADDED from AndroidManifest.xml:15:5 + android:name + ADDED from AndroidManifest.xml:15:22 +uses-permission#android.permission.NFC +ADDED from AndroidManifest.xml:16:5 + android:name + ADDED from AndroidManifest.xml:16:22 +application +ADDED from AndroidManifest.xml:18:5 +MERGED from Conversations.libs:openpgp-api-lib:unspecified:11:5 +MERGED from Conversations.libs:MemorizingTrustManager:unspecified:11:5 +MERGED from com.android.support:support-v13:21.0.3:16:5 +MERGED from com.android.support:support-v4:21.0.3:16:5 + android:label + ADDED from AndroidManifest.xml:21:9 + REJECTED from Conversations.libs:MemorizingTrustManager:unspecified:11:18 + android:allowBackup + ADDED from AndroidManifest.xml:19:9 + android:icon + ADDED from AndroidManifest.xml:20:9 + android:theme + ADDED from AndroidManifest.xml:22:9 + tools:replace + ADDED from AndroidManifest.xml:23:9 +service#eu.siacs.conversations.services.XmppConnectionService +ADDED from AndroidManifest.xml:24:9 + android:name + ADDED from AndroidManifest.xml:24:18 +receiver#eu.siacs.conversations.services.EventReceiver +ADDED from AndroidManifest.xml:26:9 + android:name + ADDED from AndroidManifest.xml:26:19 +intent-filter#android.intent.action.ACTION_SHUTDOWN+android.intent.action.BOOT_COMPLETED+android.net.conn.CONNECTIVITY_CHANGE +ADDED from AndroidManifest.xml:27:13 +action#android.intent.action.BOOT_COMPLETED +ADDED from AndroidManifest.xml:28:17 + android:name + ADDED from AndroidManifest.xml:28:25 +action#android.net.conn.CONNECTIVITY_CHANGE +ADDED from AndroidManifest.xml:29:17 + android:name + ADDED from AndroidManifest.xml:29:25 +action#android.intent.action.ACTION_SHUTDOWN +ADDED from AndroidManifest.xml:30:17 + android:name + ADDED from AndroidManifest.xml:30:25 +activity#eu.siacs.conversations.ui.ConversationActivity +ADDED from AndroidManifest.xml:34:9 + android:label + ADDED from AndroidManifest.xml:36:13 + android:launchMode + ADDED from AndroidManifest.xml:37:13 + android:windowSoftInputMode + ADDED from AndroidManifest.xml:38:13 + android:name + ADDED from AndroidManifest.xml:35:13 +intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER +ADDED from AndroidManifest.xml:39:13 +action#android.intent.action.MAIN +ADDED from AndroidManifest.xml:40:17 + android:name + ADDED from AndroidManifest.xml:40:25 +category#android.intent.category.LAUNCHER +ADDED from AndroidManifest.xml:42:17 + android:name + ADDED from AndroidManifest.xml:42:27 +activity#eu.siacs.conversations.ui.StartConversationActivity +ADDED from AndroidManifest.xml:45:9 + android:label + ADDED from AndroidManifest.xml:48:13 + android:configChanges + ADDED from AndroidManifest.xml:47:13 + android:name + ADDED from AndroidManifest.xml:46:13 +intent-filter#android.intent.action.SENDTO+android.intent.category.DEFAULT +ADDED from AndroidManifest.xml:49:13 +action#android.intent.action.SENDTO +ADDED from AndroidManifest.xml:50:17 + android:name + ADDED from AndroidManifest.xml:50:25 +category#android.intent.category.DEFAULT +ADDED from AndroidManifest.xml:52:17 + android:name + ADDED from AndroidManifest.xml:52:27 +data +ADDED from AndroidManifest.xml:54:17 + android:scheme + ADDED from AndroidManifest.xml:54:23 +intent-filter#android.intent.action.VIEW+android.intent.category.BROWSABLE+android.intent.category.DEFAULT +ADDED from AndroidManifest.xml:57:13 +action#android.intent.action.VIEW +ADDED from AndroidManifest.xml:58:17 + android:name + ADDED from AndroidManifest.xml:58:25 +category#android.intent.category.BROWSABLE +ADDED from AndroidManifest.xml:61:17 + android:name + ADDED from AndroidManifest.xml:61:27 +intent-filter#android.intent.category.DEFAULT+android.nfc.action.NDEF_DISCOVERED +ADDED from AndroidManifest.xml:65:13 +action#android.nfc.action.NDEF_DISCOVERED +ADDED from AndroidManifest.xml:66:17 + android:name + ADDED from AndroidManifest.xml:66:25 +activity#eu.siacs.conversations.ui.SettingsActivity +ADDED from AndroidManifest.xml:73:9 + android:label + ADDED from AndroidManifest.xml:75:13 + android:name + ADDED from AndroidManifest.xml:74:13 +activity#eu.siacs.conversations.ui.ChooseContactActivity +ADDED from AndroidManifest.xml:76:9 + android:label + ADDED from AndroidManifest.xml:78:13 + android:name + ADDED from AndroidManifest.xml:77:13 +activity#eu.siacs.conversations.ui.BlocklistActivity +ADDED from AndroidManifest.xml:79:9 + android:label + ADDED from AndroidManifest.xml:81:13 + android:name + ADDED from AndroidManifest.xml:80:13 +activity#eu.siacs.conversations.ui.ChangePasswordActivity +ADDED from AndroidManifest.xml:82:6 + android:label + ADDED from AndroidManifest.xml:84:7 + android:name + ADDED from AndroidManifest.xml:83:7 +activity#eu.siacs.conversations.ui.ManageAccountActivity +ADDED from AndroidManifest.xml:85:9 + android:label + ADDED from AndroidManifest.xml:88:13 + android:configChanges + ADDED from AndroidManifest.xml:87:13 + android:name + ADDED from AndroidManifest.xml:86:13 +activity#eu.siacs.conversations.ui.EditAccountActivity +ADDED from AndroidManifest.xml:89:9 + android:windowSoftInputMode + ADDED from AndroidManifest.xml:91:13 + android:name + ADDED from AndroidManifest.xml:90:13 +activity#eu.siacs.conversations.ui.ConferenceDetailsActivity +ADDED from AndroidManifest.xml:92:9 + android:label + ADDED from AndroidManifest.xml:94:13 + android:windowSoftInputMode + ADDED from AndroidManifest.xml:95:13 + android:name + ADDED from AndroidManifest.xml:93:13 +activity#eu.siacs.conversations.ui.ContactDetailsActivity +ADDED from AndroidManifest.xml:96:9 + android:label + ADDED from AndroidManifest.xml:98:13 + android:windowSoftInputMode + ADDED from AndroidManifest.xml:99:13 + android:name + ADDED from AndroidManifest.xml:97:13 +activity#eu.siacs.conversations.ui.PublishProfilePictureActivity +ADDED from AndroidManifest.xml:100:9 + android:label + ADDED from AndroidManifest.xml:102:13 + android:windowSoftInputMode + ADDED from AndroidManifest.xml:103:13 + android:name + ADDED from AndroidManifest.xml:101:13 +activity#eu.siacs.conversations.ui.VerifyOTRActivity +ADDED from AndroidManifest.xml:104:9 + android:label + ADDED from AndroidManifest.xml:106:13 + android:windowSoftInputMode + ADDED from AndroidManifest.xml:107:13 + android:name + ADDED from AndroidManifest.xml:105:13 +activity#eu.siacs.conversations.ui.ShareWithActivity +ADDED from AndroidManifest.xml:108:9 + android:label + ADDED from AndroidManifest.xml:110:13 + android:name + ADDED from AndroidManifest.xml:109:13 +intent-filter#android.intent.action.SEND+android.intent.category.DEFAULT +ADDED from AndroidManifest.xml:111:13 +action#android.intent.action.SEND +ADDED from AndroidManifest.xml:112:17 + android:name + ADDED from AndroidManifest.xml:112:25 +activity#de.duenndns.ssl.MemorizingActivity +ADDED from AndroidManifest.xml:126:9 +MERGED from Conversations.libs:MemorizingTrustManager:unspecified:12:9 + android:theme + ADDED from AndroidManifest.xml:128:13 + REJECTED from Conversations.libs:MemorizingTrustManager:unspecified:14:13 + tools:replace + ADDED from AndroidManifest.xml:129:13 + android:name + ADDED from AndroidManifest.xml:127:13 +activity#eu.siacs.conversations.ui.AboutActivity +ADDED from AndroidManifest.xml:130:9 + android:label + ADDED from AndroidManifest.xml:132:13 + android:parentActivityName + ADDED from AndroidManifest.xml:133:13 + android:name + ADDED from AndroidManifest.xml:131:13 +meta-data#android.support.PARENT_ACTIVITY +ADDED from AndroidManifest.xml:134:13 + android:value + ADDED from AndroidManifest.xml:136:17 + android:name + ADDED from AndroidManifest.xml:135:17 +uses-sdk +INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested +MERGED from Conversations.libs:openpgp-api-lib:unspecified:7:5 +MERGED from Conversations.libs:MemorizingTrustManager:unspecified:7:5 +MERGED from com.android.support:support-v13:21.0.3:15:5 +MERGED from com.android.support:support-v4:21.0.3:15:5 + android:targetSdkVersion + INJECTED from AndroidManifest.xml:0:0 + INJECTED from AndroidManifest.xml:0:0 + android:minSdkVersion + INJECTED from AndroidManifest.xml:0:0 + INJECTED from AndroidManifest.xml:0:0 |