Subversion Repositories SmartDukaan

Rev

Details | Last modification | View Log | RSS feed

Rev Author Line No. Line
21478 rajender 1
-- Merging decision tree log ---
2
manifest
3
ADDED from AndroidManifest.xml:2:1
4
	xmlns:android
5
		ADDED from AndroidManifest.xml:2:11
6
	package
7
		ADDED from AndroidManifest.xml:3:5
8
		INJECTED from AndroidManifest.xml:0:0
9
		INJECTED from AndroidManifest.xml:0:0
10
	android:versionName
11
		INJECTED from AndroidManifest.xml:0:0
12
		INJECTED from AndroidManifest.xml:0:0
13
	android:versionCode
14
		INJECTED from AndroidManifest.xml:0:0
15
		INJECTED from AndroidManifest.xml:0:0
16
permission#com.saholic.profittill.main.permission.C2D_MESSAGE
17
ADDED from AndroidManifest.xml:5:5
18
	android:protectionLevel
19
		ADDED from AndroidManifest.xml:7:9
20
	android:name
21
		ADDED from AndroidManifest.xml:6:9
22
uses-permission#android.permission.ACCESS_WIFI_STATE
23
ADDED from AndroidManifest.xml:9:5
24
	android:name
25
		ADDED from AndroidManifest.xml:9:22
26
uses-permission#android.permission.READ_PHONE_STATE
27
ADDED from AndroidManifest.xml:10:5
28
	android:name
29
		ADDED from AndroidManifest.xml:10:22
30
uses-permission#android.permission.READ_LOGS
31
ADDED from AndroidManifest.xml:11:5
32
	android:name
33
		ADDED from AndroidManifest.xml:11:22
34
uses-permission#android.permission.GET_TASKS
35
ADDED from AndroidManifest.xml:12:5
36
	android:name
37
		ADDED from AndroidManifest.xml:12:22
38
uses-permission#android.permission.INTERNET
39
ADDED from AndroidManifest.xml:13:5
40
MERGED from com.mixpanel.android:mixpanel-android:4.5.1:17:5
41
	android:name
42
		ADDED from AndroidManifest.xml:13:22
43
uses-permission#android.permission.GET_ACCOUNTS
44
ADDED from AndroidManifest.xml:14:5
45
	android:name
46
		ADDED from AndroidManifest.xml:14:22
47
uses-permission#android.permission.USE_CREDENTIALS
48
ADDED from AndroidManifest.xml:15:5
49
	android:name
50
		ADDED from AndroidManifest.xml:15:22
51
uses-permission#android.permission.ACCESS_NETWORK_STATE
52
ADDED from AndroidManifest.xml:16:5
53
	android:name
54
		ADDED from AndroidManifest.xml:16:22
55
uses-permission#android.permission.NETWORK
56
ADDED from AndroidManifest.xml:17:5
57
	android:name
58
		ADDED from AndroidManifest.xml:17:22
59
uses-permission#android.permission.BLUETOOTH
60
ADDED from AndroidManifest.xml:18:5
61
	android:name
62
		ADDED from AndroidManifest.xml:18:22
63
uses-permission#android.permission.WAKE_LOCK
64
ADDED from AndroidManifest.xml:19:5
65
	android:name
66
		ADDED from AndroidManifest.xml:19:22
67
uses-permission#android.permission.VIBRATE
68
ADDED from AndroidManifest.xml:20:5
69
	android:name
70
		ADDED from AndroidManifest.xml:20:22
71
uses-permission#com.google.android.c2dm.permission.RECEIVE
72
ADDED from AndroidManifest.xml:22:5
73
	android:name
74
		ADDED from AndroidManifest.xml:22:22
75
uses-permission#android.permission.CALL_PHONE
76
ADDED from AndroidManifest.xml:23:5
77
	android:name
78
		ADDED from AndroidManifest.xml:23:22
79
application
80
ADDED from AndroidManifest.xml:25:5
81
MERGED from com.android.support:appcompat-v7:21.0.3:16:5
82
MERGED from com.android.support:support-v4:21.0.3:16:5
83
MERGED from com.google.android.gms:play-services:6.1.71:16:5
84
MERGED from com.android.support:support-v4:21.0.3:16:5
85
MERGED from com.facebook.android:facebook-android-sdk:3.20.0:24:5
86
MERGED from com.android.support:support-v4:21.0.3:16:5
87
MERGED from com.mixpanel.android:mixpanel-android:4.5.1:44:5
88
MERGED from com.android.support:support-v4:21.0.3:16:5
89
	android:label
90
		ADDED from AndroidManifest.xml:29:9
91
	android:allowBackup
92
		ADDED from AndroidManifest.xml:27:9
93
	android:icon
94
		ADDED from AndroidManifest.xml:28:9
95
	android:theme
96
		ADDED from AndroidManifest.xml:30:9
97
	android:name
98
		ADDED from AndroidManifest.xml:26:9
99
	tools:ignore
100
		ADDED from com.mixpanel.android:mixpanel-android:4.5.1:44:18
101
meta-data#com.google.android.gms.version
102
ADDED from AndroidManifest.xml:31:9
103
	android:name
104
		ADDED from AndroidManifest.xml:32:13
105
	android:value
106
		ADDED from AndroidManifest.xml:33:13
107
meta-data#com.google.android.gms.analytics.globalConfigResource
108
ADDED from AndroidManifest.xml:34:9
109
	android:resource
110
		ADDED from AndroidManifest.xml:36:13
111
	android:name
112
		ADDED from AndroidManifest.xml:35:13
113
meta-data#com.facebook.sdk.ApplicationId
114
ADDED from AndroidManifest.xml:37:9
115
	android:name
116
		ADDED from AndroidManifest.xml:38:13
117
	android:value
118
		ADDED from AndroidManifest.xml:39:13
119
activity#com.saholic.profittill.SplashScreen
120
ADDED from AndroidManifest.xml:41:9
121
	android:label
122
		ADDED from AndroidManifest.xml:43:13
123
	android:name
124
		ADDED from AndroidManifest.xml:42:13
125
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
126
ADDED from AndroidManifest.xml:44:13
127
action#android.intent.action.MAIN
128
ADDED from AndroidManifest.xml:45:17
129
	android:name
130
		ADDED from AndroidManifest.xml:45:25
131
category#android.intent.category.LAUNCHER
132
ADDED from AndroidManifest.xml:47:17
133
	android:name
134
		ADDED from AndroidManifest.xml:47:27
135
activity#com.saholic.profittill.main.LoginActivity
136
ADDED from AndroidManifest.xml:50:9
137
	android:windowSoftInputMode
138
		ADDED from AndroidManifest.xml:53:13
139
	android:label
140
		ADDED from AndroidManifest.xml:52:13
141
	android:name
142
		ADDED from AndroidManifest.xml:51:13
143
activity#com.saholic.profittill.main.DealsHome
144
ADDED from AndroidManifest.xml:55:9
145
	android:label
146
		ADDED from AndroidManifest.xml:57:13
147
	android:name
148
		ADDED from AndroidManifest.xml:56:13
149
activity#com.saholic.profittill.main.MainActivity
150
ADDED from AndroidManifest.xml:59:9
151
	android:uiOptions
152
		ADDED from AndroidManifest.xml:62:13
153
	android:configChanges
154
		ADDED from AndroidManifest.xml:61:13
155
	android:name
156
		ADDED from AndroidManifest.xml:60:13
157
activity#com.facebook.LoginActivity
158
ADDED from AndroidManifest.xml:64:9
159
	android:theme
160
		ADDED from AndroidManifest.xml:66:13
161
	android:name
162
		ADDED from AndroidManifest.xml:65:13
163
ADDED from AndroidManifest.xml:68:9
164
	android:permission
165
		ADDED from AndroidManifest.xml:70:13
166
	android:name
167
		ADDED from AndroidManifest.xml:69:13
168
intent-filter#com.google.android.c2dm.intent.RECEIVE+com.google.android.c2dm.intent.REGISTRATION+com.saholic.profittill.main
169
ADDED from AndroidManifest.xml:71:13
170
action#com.google.android.c2dm.intent.RECEIVE
171
ADDED from AndroidManifest.xml:72:17
172
	android:name
173
		ADDED from AndroidManifest.xml:72:25
174
action#com.google.android.c2dm.intent.REGISTRATION
175
ADDED from AndroidManifest.xml:73:17
176
	android:name
177
		ADDED from AndroidManifest.xml:73:25
178
category#com.saholic.profittill.main
179
ADDED from AndroidManifest.xml:75:17
180
	android:name
181
		ADDED from AndroidManifest.xml:75:27
182
service#com.saholic.profittill.main.GCMNotificationIntentService
183
ADDED from AndroidManifest.xml:79:9
184
	android:exported
185
		ADDED from AndroidManifest.xml:81:13
186
	android:name
187
		ADDED from AndroidManifest.xml:80:13
188
activity#com.saholic.profittill.main.MObileNumberVerificationActivity
189
ADDED from AndroidManifest.xml:84:9
190
	android:label
191
		ADDED from AndroidManifest.xml:86:13
192
	android:name
193
		ADDED from AndroidManifest.xml:85:13
194
activity#com.saholic.profittill.main.MobileNumber
195
ADDED from AndroidManifest.xml:88:9
196
	android:label
197
		ADDED from AndroidManifest.xml:90:13
198
	android:name
199
		ADDED from AndroidManifest.xml:89:13
200
activity#com.saholic.profittill.main.MobileVerificationFirstTime
201
ADDED from AndroidManifest.xml:92:9
202
	android:label
203
		ADDED from AndroidManifest.xml:94:13
204
	android:name
205
		ADDED from AndroidManifest.xml:93:13
206
activity#com.saholic.profittill.Utils.SplashInternetNotWorking
207
ADDED from AndroidManifest.xml:96:9
208
	android:label
209
		ADDED from AndroidManifest.xml:98:13
210
	android:name
211
		ADDED from AndroidManifest.xml:97:13
212
meta-data#TESTIN_APPKEY
213
ADDED from AndroidManifest.xml:101:9
214
	android:name
215
		ADDED from AndroidManifest.xml:102:13
216
	android:value
217
		ADDED from AndroidManifest.xml:103:13
218
meta-data#TESTIN_CHANNEL
219
ADDED from AndroidManifest.xml:105:9
220
	android:name
221
		ADDED from AndroidManifest.xml:106:13
222
	android:value
223
		ADDED from AndroidManifest.xml:107:13
224
activity#com.saholic.profittill.main.ReferrerActivity
225
ADDED from AndroidManifest.xml:109:9
226
	android:label
227
		ADDED from AndroidManifest.xml:112:13
228
	android:configChanges
229
		ADDED from AndroidManifest.xml:111:13
230
	android:name
231
		ADDED from AndroidManifest.xml:110:13
232
receiver#com.saholic.profittill.main.ReferrerReceiver
233
ADDED from AndroidManifest.xml:115:9
234
	android:exported
235
		ADDED from AndroidManifest.xml:118:13
236
	android:enabled
237
		ADDED from AndroidManifest.xml:117:13
238
	android:name
239
		ADDED from AndroidManifest.xml:116:13
240
intent-filter#com.android.vending.INSTALL_REFERRER
241
ADDED from AndroidManifest.xml:119:13
242
action#com.android.vending.INSTALL_REFERRER
243
ADDED from AndroidManifest.xml:120:17
244
	android:name
245
		ADDED from AndroidManifest.xml:120:25
246
uses-sdk
247
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
248
MERGED from com.android.support:appcompat-v7:21.0.3:15:5
249
MERGED from com.android.support:support-v4:21.0.3:15:5
250
MERGED from com.google.android.gms:play-services:6.1.71:15:5
251
MERGED from com.android.support:support-v4:21.0.3:15:5
252
MERGED from com.facebook.android:facebook-android-sdk:3.20.0:20:5
253
MERGED from com.android.support:support-v4:21.0.3:15:5
254
MERGED from com.mixpanel.android:mixpanel-android:4.5.1:11:5
255
MERGED from ProfitTill:library:unspecified:7:5
256
MERGED from com.android.support:support-v4:21.0.3:15:5
257
	android:targetSdkVersion
258
		INJECTED from AndroidManifest.xml:0:0
259
		INJECTED from AndroidManifest.xml:0:0
260
	android:minSdkVersion
261
		INJECTED from AndroidManifest.xml:0:0
262
		INJECTED from AndroidManifest.xml:0:0
263
	tools:ignore
264
		ADDED from com.mixpanel.android:mixpanel-android:4.5.1:14:9