Skip to content
This repository was archived by the owner on Sep 4, 2019. It is now read-only.

Commit 4b8daa9

Browse files
committed
Merge pull request #2 from kanzure/kindle-for-android-4.0.2.1
Patch for kindle 4.0.2.1 (kindle for android)
2 parents cee4bba + 3b67d8c commit 4b8daa9

File tree

1 file changed

+238
-0
lines changed

1 file changed

+238
-0
lines changed
Lines changed: 238 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
Only in kindle4.0.2.1: build
2+
diff -r -u10 kindle4.0.2.1_orig/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali kindle4.0.2.1/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali
3+
--- kindle4.0.2.1_orig/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali 2013-05-22 18:39:03.000000000 -0500
4+
+++ kindle4.0.2.1/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali 2013-05-23 16:54:53.000000000 -0500
5+
@@ -36,20 +36,22 @@
6+
.field private maxCpuSpeed:J
7+
8+
.field private maxMemory:J
9+
10+
.field private minCpuSpeed:J
11+
12+
.field private resources:Landroid/content/res/Resources;
13+
14+
.field private security:Lcom/mobipocket/android/library/reader/AndroidSecurity;
15+
16+
+.field private pidList:Ljava/lang/String;
17+
+
18+
.field private totalMemory:J
19+
20+
21+
# direct methods
22+
.method static constructor <clinit>()V
23+
.locals 1
24+
25+
.prologue
26+
.line 30
27+
const-class v0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;
28+
@@ -72,20 +74,24 @@
29+
.prologue
30+
.line 130
31+
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
32+
33+
.line 131
34+
iput-object p1, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->security:Lcom/mobipocket/android/library/reader/AndroidSecurity;
35+
36+
.line 132
37+
iput-object p2, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->deviceType:Lcom/amazon/kcp/application/AmazonDeviceType;
38+
39+
+ const-string v0, "Open DRMed book to show PID list."
40+
+
41+
+ iput-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
42+
+
43+
.line 133
44+
sget-object v0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->TAG:Ljava/lang/String;
45+
46+
new-instance v0, Ljava/lang/StringBuilder;
47+
48+
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
49+
50+
const-string v1, "Device Type is set to \""
51+
52+
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
53+
@@ -1235,10 +1241,33 @@
54+
move-result-wide v0
55+
56+
iput-wide v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->totalMemory:J
57+
58+
.line 308
59+
:cond_0
60+
iget-wide v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->totalMemory:J
61+
62+
return-wide v0
63+
.end method
64+
+
65+
+.method public getPidList()Ljava/lang/String;
66+
+ .locals 1
67+
+
68+
+ .prologue
69+
+ .line 15
70+
+ iget-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
71+
+
72+
+ return-object v0
73+
+.end method
74+
+
75+
+.method public setPidList(Ljava/lang/String;)V
76+
+ .locals 0
77+
+ .parameter "value"
78+
+
79+
+ .prologue
80+
+ .line 11
81+
+ iput-object p1, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
82+
+
83+
+ .line 12
84+
+ return-void
85+
+.end method
86+
+
87+
diff -r -u10 kindle4.0.2.1_orig/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali kindle4.0.2.1/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali
88+
--- kindle4.0.2.1_orig/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali 2013-05-22 18:39:03.000000000 -0500
89+
+++ kindle4.0.2.1/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali 2013-05-23 16:55:58.000000000 -0500
90+
@@ -23,10 +23,16 @@
91+
.end method
92+
93+
.method public abstract getDeviceTypeId()Ljava/lang/String;
94+
.end method
95+
96+
.method public abstract getOsVersion()Ljava/lang/String;
97+
.end method
98+
99+
.method public abstract getPid()Ljava/lang/String;
100+
.end method
101+
+
102+
+.method public abstract getPidList()Ljava/lang/String;
103+
+.end method
104+
+
105+
+.method public abstract setPidList(Ljava/lang/String;)V
106+
+.end method
107+
diff -r -u10 kindle4.0.2.1_orig/smali/com/amazon/kcp/info/AboutActivity.smali kindle4.0.2.1/smali/com/amazon/kcp/info/AboutActivity.smali
108+
--- kindle4.0.2.1_orig/smali/com/amazon/kcp/info/AboutActivity.smali 2013-05-22 18:39:03.000000000 -0500
109+
+++ kindle4.0.2.1/smali/com/amazon/kcp/info/AboutActivity.smali 2013-05-23 17:18:14.000000000 -0500
110+
@@ -486,20 +486,71 @@
111+
.end local v2 #screenDpi:Ljava/lang/String;
112+
:cond_0
113+
iget-object v5, p0, Lcom/amazon/kcp/info/AboutActivity;->detailItemList:Ljava/util/List;
114+
115+
invoke-interface {v5, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
116+
117+
.line 317
118+
return-void
119+
.end method
120+
121+
+.method private populatePIDList()V
122+
+ .locals 7
123+
+
124+
+ .prologue
125+
+ .line 313
126+
+ invoke-static {}, Lcom/amazon/kcp/application/DeviceInformationProviderFactory;->getProvider()Lcom/amazon/kcp/application/IDeviceInformationProvider;
127+
+
128+
+ move-result-object v0
129+
+
130+
+ invoke-interface {v0}, Lcom/amazon/kcp/application/IDeviceInformationProvider;->getPidList()Ljava/lang/String;
131+
+
132+
+ move-result-object v1
133+
+
134+
+ .line 314
135+
+ .local v1, PidList:Ljava/lang/String;
136+
+ iget-object v3, p0, Lcom/amazon/kcp/info/AboutActivity;->groupItemList:Ljava/util/List;
137+
+
138+
+ new-instance v4, Lcom/amazon/kcp/info/AboutActivity$GroupItem;
139+
+
140+
+ const-string v5, "PID List"
141+
+
142+
+ const v6, 0x1
143+
+
144+
+ invoke-direct {v4, p0, v5, v6}, Lcom/amazon/kcp/info/AboutActivity$GroupItem;-><init>(Lcom/amazon/kcp/info/AboutActivity;Ljava/lang/String;Z)V
145+
+
146+
+ invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
147+
+
148+
+ .line 315
149+
+ new-instance v2, Ljava/util/ArrayList;
150+
+
151+
+ invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
152+
+
153+
+ .line 316
154+
+ .local v2, children:Ljava/util/List;,"Ljava/util/List<Lcom/amazon/kcp/info/AboutActivity$DetailItem;>;"
155+
+ new-instance v3, Lcom/amazon/kcp/info/AboutActivity$DetailItem;
156+
+
157+
+ const-string v4, "PIDs"
158+
+
159+
+ invoke-direct {v3, p0, v4, v1}, Lcom/amazon/kcp/info/AboutActivity$DetailItem;-><init>(Lcom/amazon/kcp/info/AboutActivity;Ljava/lang/String;Ljava/lang/String;)V
160+
+
161+
+ invoke-interface {v2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
162+
+
163+
+ .line 317
164+
+ iget-object v3, p0, Lcom/amazon/kcp/info/AboutActivity;->detailItemList:Ljava/util/List;
165+
+
166+
+ invoke-interface {v3, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
167+
+
168+
+ .line 318
169+
+ return-void
170+
+.end method
171+
+
172+
.method private populateDisplayItems()V
173+
.locals 1
174+
175+
.prologue
176+
.line 171
177+
iget-object v0, p0, Lcom/amazon/kcp/info/AboutActivity;->groupItemList:Ljava/util/List;
178+
179+
if-nez v0, :cond_0
180+
181+
.line 173
182+
@@ -531,20 +582,22 @@
183+
184+
.line 192
185+
invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populateRamInformation()V
186+
187+
.line 193
188+
invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populateStorageInformation()V
189+
190+
.line 194
191+
invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populateDisplayInformation()V
192+
193+
+ invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populatePIDList()V
194+
+
195+
.line 195
196+
return-void
197+
198+
.line 177
199+
:cond_0
200+
iget-object v0, p0, Lcom/amazon/kcp/info/AboutActivity;->groupItemList:Ljava/util/List;
201+
202+
invoke-interface {v0}, Ljava/util/List;->clear()V
203+
204+
goto :goto_0
205+
diff -r -u10 kindle4.0.2.1_orig/smali/com/amazon/system/security/Security.smali kindle4.0.2.1/smali/com/amazon/system/security/Security.smali
206+
--- kindle4.0.2.1_orig/smali/com/amazon/system/security/Security.smali 2013-05-22 18:39:04.000000000 -0500
207+
+++ kindle4.0.2.1/smali/com/amazon/system/security/Security.smali 2013-05-23 17:19:05.000000000 -0500
208+
@@ -920,20 +920,30 @@
209+
210+
.line 350
211+
:cond_2
212+
add-int/lit8 v8, v8, 0x1
213+
214+
.line 351
215+
sget-object v0, Lcom/amazon/system/security/Security;->CUSTOM_PID_FOR_BUNDLED_DICTIONARY_DRM:Ljava/lang/String;
216+
217+
aput-object v0, v6, v8
218+
219+
+ invoke-static {}, Lcom/amazon/kcp/application/DeviceInformationProviderFactory;->getProvider()Lcom/amazon/kcp/application/IDeviceInformationProvider;
220+
+
221+
+ move-result-object v5
222+
+
223+
+ invoke-static {v6}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
224+
+
225+
+ move-result-object v2
226+
+
227+
+ invoke-interface {v5, v2}, Lcom/amazon/kcp/application/IDeviceInformationProvider;->setPidList(Ljava/lang/String;)V
228+
+
229+
.line 353
230+
return-object v6
231+
.end method
232+
233+
234+
# virtual methods
235+
.method public customDrmOnly()I
236+
.locals 1
237+
238+
.prologue

0 commit comments

Comments
 (0)