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

Commit

Permalink
Merge pull request #3 from csabahenk/master
Browse files Browse the repository at this point in the history
Thanks for the patch. I'll add this into the 6.0.4 tag.
  • Loading branch information
psyrendust committed Jan 13, 2014
2 parents 4b8daa9 + 730d4ea commit 7f2127d
Show file tree
Hide file tree
Showing 2 changed files with 156 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changes from 4.0.2.1 to 4.3.0.67:
- minor adjustment in smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali
to make the patch apply cleanly
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
diff -ru '--exclude=.git' kindle4.3.0.67_orig/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali kindle4.3.0.67/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali
--- kindle4.3.0.67_orig/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali 2014-01-13 00:32:44.788420082 +0100
+++ kindle4.3.0.67/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali 2014-01-11 17:57:20.439183833 +0100
@@ -43,6 +43,8 @@

.field private security:Lcom/mobipocket/android/library/reader/AndroidSecurity;

+.field private pidList:Ljava/lang/String;
+
.field private totalMemory:J


@@ -83,6 +85,10 @@

iput-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->deviceType:Lcom/amazon/kcp/application/AmazonDeviceType;

+ const-string v0, "Open DRMed book to show PID list."
+
+ iput-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
+
.line 134
sget-object v0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->TAG:Ljava/lang/String;

@@ -1348,3 +1354,25 @@

return-wide v0
.end method
+
+.method public getPidList()Ljava/lang/String;
+ .locals 1
+
+ .prologue
+ .line 15
+ iget-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
+
+ return-object v0
+.end method
+
+.method public setPidList(Ljava/lang/String;)V
+ .locals 0
+ .parameter "value"
+
+ .prologue
+ .line 11
+ iput-object p1, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
+
+ .line 12
+ return-void
+.end method
Only in kindle4.3.0.67/smali/com/amazon/kcp/application: AndroidDeviceInformationProvider.smali.rej
diff -ru '--exclude=.git' kindle4.3.0.67_orig/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali kindle4.3.0.67/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali
--- kindle4.3.0.67_orig/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali 2014-01-13 00:32:45.121755742 +0100
+++ kindle4.3.0.67/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali 2014-01-11 17:54:48.949501717 +0100
@@ -30,3 +30,9 @@

.method public abstract getPid()Ljava/lang/String;
.end method
+
+.method public abstract getPidList()Ljava/lang/String;
+.end method
+
+.method public abstract setPidList(Ljava/lang/String;)V
+.end method
diff -ru '--exclude=.git' kindle4.3.0.67_orig/smali/com/amazon/kcp/info/AboutActivity.smali kindle4.3.0.67/smali/com/amazon/kcp/info/AboutActivity.smali
--- kindle4.3.0.67_orig/smali/com/amazon/kcp/info/AboutActivity.smali 2014-01-13 00:32:46.291763912 +0100
+++ kindle4.3.0.67/smali/com/amazon/kcp/info/AboutActivity.smali 2014-01-11 17:54:48.949501717 +0100
@@ -493,6 +493,57 @@
return-void
.end method

+.method private populatePIDList()V
+ .locals 7
+
+ .prologue
+ .line 313
+ invoke-static {}, Lcom/amazon/kcp/application/DeviceInformationProviderFactory;->getProvider()Lcom/amazon/kcp/application/IDeviceInformationProvider;
+
+ move-result-object v0
+
+ invoke-interface {v0}, Lcom/amazon/kcp/application/IDeviceInformationProvider;->getPidList()Ljava/lang/String;
+
+ move-result-object v1
+
+ .line 314
+ .local v1, PidList:Ljava/lang/String;
+ iget-object v3, p0, Lcom/amazon/kcp/info/AboutActivity;->groupItemList:Ljava/util/List;
+
+ new-instance v4, Lcom/amazon/kcp/info/AboutActivity$GroupItem;
+
+ const-string v5, "PID List"
+
+ const v6, 0x1
+
+ invoke-direct {v4, p0, v5, v6}, Lcom/amazon/kcp/info/AboutActivity$GroupItem;-><init>(Lcom/amazon/kcp/info/AboutActivity;Ljava/lang/String;Z)V
+
+ invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+ .line 315
+ new-instance v2, Ljava/util/ArrayList;
+
+ invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+
+ .line 316
+ .local v2, children:Ljava/util/List;,"Ljava/util/List<Lcom/amazon/kcp/info/AboutActivity$DetailItem;>;"
+ new-instance v3, Lcom/amazon/kcp/info/AboutActivity$DetailItem;
+
+ const-string v4, "PIDs"
+
+ 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
+
+ invoke-interface {v2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+ .line 317
+ iget-object v3, p0, Lcom/amazon/kcp/info/AboutActivity;->detailItemList:Ljava/util/List;
+
+ invoke-interface {v3, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+ .line 318
+ return-void
+.end method
+
.method private populateDisplayItems()V
.locals 1

@@ -538,6 +589,8 @@
.line 194
invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populateDisplayInformation()V

+ invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populatePIDList()V
+
.line 195
return-void

diff -ru '--exclude=.git' kindle4.3.0.67_orig/smali/com/amazon/system/security/Security.smali kindle4.3.0.67/smali/com/amazon/system/security/Security.smali
--- kindle4.3.0.67_orig/smali/com/amazon/system/security/Security.smali 2014-01-13 00:32:59.355188695 +0100
+++ kindle4.3.0.67/smali/com/amazon/system/security/Security.smali 2014-01-11 17:54:48.949501717 +0100
@@ -942,6 +942,16 @@

aput-object v0, v6, v8

+ invoke-static {}, Lcom/amazon/kcp/application/DeviceInformationProviderFactory;->getProvider()Lcom/amazon/kcp/application/IDeviceInformationProvider;
+
+ move-result-object v5
+
+ invoke-static {v6}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object v2
+
+ invoke-interface {v5, v2}, Lcom/amazon/kcp/application/IDeviceInformationProvider;->setPidList(Ljava/lang/String;)V
+
.line 353
return-object v6
.end method

0 comments on commit 7f2127d

Please sign in to comment.