patches/opd/4.1/pa/20121016/core.patch

   1 diff -Npru -x '*RIL*' stock-core/smali/java/lang/PrivacyInputStream.smali pdroid-core/smali/java/lang/PrivacyInputStream.smali
   2 --- stock-core/smali/java/lang/PrivacyInputStream.smali 1969-12-31 18:00:00.000000000 -0600
   3 +++ pdroid-core/smali/java/lang/PrivacyInputStream.smali        2012-10-18 15:40:07.972809203 -0500
   4 @@ -0,0 +1,67 @@
   5 +.class public Ljava/lang/PrivacyInputStream;
   6 +.super Ljava/io/InputStream;
   7 +.source "PrivacyInputStream.java"
   8 +
   9 +
  10 +# direct methods
  11 +.method public constructor <init>()V
  12 +    .registers 1
  13 +
  14 +    invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
  15 +
  16 +    return-void
  17 +.end method
  18 +
  19 +
  20 +# virtual methods
  21 +.method public close()V
  22 +    .registers 1
  23 +    .annotation system Ldalvik/annotation/Throws;
  24 +        value = {
  25 +            Ljava/io/IOException;
  26 +        }
  27 +    .end annotation
  28 +
  29 +    invoke-super {p0}, Ljava/io/InputStream;->close()V
  30 +
  31 +    return-void
  32 +.end method
  33 +
  34 +.method public read()I
  35 +    .registers 2
  36 +    .annotation system Ldalvik/annotation/Throws;
  37 +        value = {
  38 +            Ljava/io/IOException;
  39 +        }
  40 +    .end annotation
  41 +
  42 +    const/4 v0, -0x1
  43 +
  44 +    return v0
  45 +.end method
  46 +
  47 +.method public read([B)I
  48 +    .registers 3
  49 +    .annotation system Ldalvik/annotation/Throws;
  50 +        value = {
  51 +            Ljava/io/IOException;
  52 +        }
  53 +    .end annotation
  54 +
  55 +    const/4 v0, -0x1
  56 +
  57 +    return v0
  58 +.end method
  59 +
  60 +.method public read([BII)I
  61 +    .registers 5
  62 +    .annotation system Ldalvik/annotation/Throws;
  63 +        value = {
  64 +            Ljava/io/IOException;
  65 +        }
  66 +    .end annotation
  67 +
  68 +    const/4 v0, -0x1
  69 +
  70 +    return v0
  71 +.end method
  72 diff -Npru -x '*RIL*' stock-core/smali/java/lang/PrivacyProcessManager$PrivacyFileReader.smali pdroid-core/smali/java/lang/PrivacyProcessManager$PrivacyFileReader.smali
  73 --- stock-core/smali/java/lang/PrivacyProcessManager$PrivacyFileReader.smali    1969-12-31 18:00:00.000000000 -0600
  74 +++ pdroid-core/smali/java/lang/PrivacyProcessManager$PrivacyFileReader.smali   2012-10-18 15:40:07.972809203 -0500
  75 @@ -0,0 +1,91 @@
  76 +.class public Ljava/lang/PrivacyProcessManager$PrivacyFileReader;
  77 +.super Ljava/lang/Object;
  78 +.source "PrivacyProcessManager.java"
  79 +
  80 +
  81 +# annotations
  82 +.annotation system Ldalvik/annotation/EnclosingClass;
  83 +    value = Ljava/lang/PrivacyProcessManager;
  84 +.end annotation
  85 +
  86 +.annotation system Ldalvik/annotation/InnerClass;
  87 +    accessFlags = 0x9
  88 +    name = "PrivacyFileReader"
  89 +.end annotation
  90 +
  91 +
  92 +# instance fields
  93 +.field private buffReader:Ljava/io/BufferedReader;
  94 +
  95 +.field private inputStream:Ljava/io/FileInputStream;
  96 +
  97 +
  98 +# direct methods
  99 +.method public constructor <init>(Ljava/lang/String;)V
 100 +    .registers 5
 101 +    .annotation system Ldalvik/annotation/Throws;
 102 +        value = {
 103 +            Ljava/io/FileNotFoundException;
 104 +        }
 105 +    .end annotation
 106 +
 107 +    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 108 +
 109 +    new-instance v0, Ljava/io/FileInputStream;
 110 +
 111 +    new-instance v1, Ljava/io/File;
 112 +
 113 +    invoke-direct {v1, p1}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 114 +
 115 +    invoke-direct {v0, v1}, Ljava/io/FileInputStream;-><init>(Ljava/io/File;)V
 116 +
 117 +    iput-object v0, p0, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->inputStream:Ljava/io/FileInputStream;
 118 +
 119 +    new-instance v0, Ljava/io/BufferedReader;
 120 +
 121 +    new-instance v1, Ljava/io/InputStreamReader;
 122 +
 123 +    iget-object v2, p0, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->inputStream:Ljava/io/FileInputStream;
 124 +
 125 +    invoke-direct {v1, v2}, Ljava/io/InputStreamReader;-><init>(Ljava/io/InputStream;)V
 126 +
 127 +    invoke-direct {v0, v1}, Ljava/io/BufferedReader;-><init>(Ljava/io/Reader;)V
 128 +
 129 +    iput-object v0, p0, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->buffReader:Ljava/io/BufferedReader;
 130 +
 131 +    return-void
 132 +.end method
 133 +
 134 +
 135 +# virtual methods
 136 +.method public close()V
 137 +    .registers 2
 138 +    .annotation system Ldalvik/annotation/Throws;
 139 +        value = {
 140 +            Ljava/io/IOException;
 141 +        }
 142 +    .end annotation
 143 +
 144 +    iget-object v0, p0, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->inputStream:Ljava/io/FileInputStream;
 145 +
 146 +    invoke-virtual {v0}, Ljava/io/FileInputStream;->close()V
 147 +
 148 +    return-void
 149 +.end method
 150 +
 151 +.method public readLine()Ljava/lang/String;
 152 +    .registers 2
 153 +    .annotation system Ldalvik/annotation/Throws;
 154 +        value = {
 155 +            Ljava/io/IOException;
 156 +        }
 157 +    .end annotation
 158 +
 159 +    iget-object v0, p0, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->buffReader:Ljava/io/BufferedReader;
 160 +
 161 +    invoke-virtual {v0}, Ljava/io/BufferedReader;->readLine()Ljava/lang/String;
 162 +
 163 +    move-result-object v0
 164 +
 165 +    return-object v0
 166 +.end method
 167 diff -Npru -x '*RIL*' stock-core/smali/java/lang/PrivacyProcessManager.smali pdroid-core/smali/java/lang/PrivacyProcessManager.smali
 168 --- stock-core/smali/java/lang/PrivacyProcessManager.smali      1969-12-31 18:00:00.000000000 -0600
 169 +++ pdroid-core/smali/java/lang/PrivacyProcessManager.smali     2012-10-18 15:40:07.972809203 -0500
 170 @@ -0,0 +1,479 @@
 171 +.class public Ljava/lang/PrivacyProcessManager;
 172 +.super Ljava/lang/Object;
 173 +.source "PrivacyProcessManager.java"
 174 +
 175 +
 176 +# annotations
 177 +.annotation system Ldalvik/annotation/MemberClasses;
 178 +    value = {
 179 +        Ljava/lang/PrivacyProcessManager$PrivacyFileReader;
 180 +    }
 181 +.end annotation
 182 +
 183 +
 184 +# static fields
 185 +.field private static final GET_COMMAND_WAIT_MS:I = 0xa
 186 +
 187 +.field private static final GET_COMMAND_WAIT_STEP:I = 0x5
 188 +
 189 +
 190 +# direct methods
 191 +.method public constructor <init>()V
 192 +    .registers 1
 193 +
 194 +    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 195 +
 196 +    return-void
 197 +.end method
 198 +
 199 +.method private static getPackageName()Ljava/lang/String;
 200 +    .registers 3
 201 +    .annotation system Ldalvik/annotation/Throws;
 202 +        value = {
 203 +            Ljava/io/IOException;,
 204 +            Ljava/io/FileNotFoundException;
 205 +        }
 206 +    .end annotation
 207 +
 208 +    new-instance v0, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;
 209 +
 210 +    const-string v2, "/proc/self/cmdline"
 211 +
 212 +    invoke-direct {v0, v2}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;-><init>(Ljava/lang/String;)V
 213 +
 214 +    invoke-virtual {v0}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->readLine()Ljava/lang/String;
 215 +
 216 +    move-result-object v2
 217 +
 218 +    invoke-virtual {v2}, Ljava/lang/String;->trim()Ljava/lang/String;
 219 +
 220 +    move-result-object v1
 221 +
 222 +    invoke-virtual {v0}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->close()V
 223 +
 224 +    return-object v1
 225 +.end method
 226 +
 227 +.method public static hasPrivacyPermission(Ljava/lang/String;)Z
 228 +    .registers 12
 229 +
 230 +    const/4 v6, 0x0
 231 +
 232 +    const/4 v5, 0x1
 233 +
 234 +    :try_start_2
 235 +    invoke-static {}, Ljava/lang/PrivacyProcessManager;->getPackageName()Ljava/lang/String;
 236 +
 237 +    move-result-object v6
 238 +
 239 +    sget-object v8, Ljava/lang/System;->out:Ljava/io/PrintStream;
 240 +
 241 +    new-instance v9, Ljava/lang/StringBuilder;
 242 +
 243 +    invoke-direct {v9}, Ljava/lang/StringBuilder;-><init>()V
 244 +
 245 +    const-string v10, "PrivacyProcessManager: got package name: "
 246 +
 247 +    invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 248 +
 249 +    move-result-object v9
 250 +
 251 +    invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 252 +
 253 +    move-result-object v9
 254 +
 255 +    invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 256 +
 257 +    move-result-object v9
 258 +
 259 +    invoke-virtual {v8, v9}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 260 +    :try_end_1e
 261 +    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_1e} :catch_57
 262 +
 263 +    :goto_1e
 264 +    const/4 v2, 0x0
 265 +
 266 +    :try_start_1f
 267 +    new-instance v8, Ljava/lang/StringBuilder;
 268 +
 269 +    invoke-direct {v8}, Ljava/lang/StringBuilder;-><init>()V
 270 +
 271 +    const-string v9, "/data/system/privacy/"
 272 +
 273 +    invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 274 +
 275 +    move-result-object v8
 276 +
 277 +    invoke-virtual {v8, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 278 +
 279 +    move-result-object v8
 280 +
 281 +    const-string v9, "/"
 282 +
 283 +    invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 284 +
 285 +    move-result-object v8
 286 +
 287 +    invoke-virtual {v8, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 288 +
 289 +    move-result-object v8
 290 +
 291 +    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 292 +
 293 +    move-result-object v7
 294 +
 295 +    new-instance v3, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;
 296 +
 297 +    invoke-direct {v3, v7}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;-><init>(Ljava/lang/String;)V
 298 +    :try_end_41
 299 +    .catch Ljava/io/FileNotFoundException; {:try_start_1f .. :try_end_41} :catch_85
 300 +    .catch Ljava/lang/Exception; {:try_start_1f .. :try_end_41} :catch_65
 301 +
 302 +    :try_start_41
 303 +    invoke-virtual {v3}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->readLine()Ljava/lang/String;
 304 +
 305 +    move-result-object v4
 306 +
 307 +    if-eqz v4, :cond_63
 308 +
 309 +    invoke-virtual {v4}, Ljava/lang/String;->trim()Ljava/lang/String;
 310 +
 311 +    move-result-object v8
 312 +
 313 +    invoke-static {v8}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
 314 +
 315 +    move-result v0
 316 +
 317 +    :goto_4f
 318 +    invoke-virtual {v3}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->close()V
 319 +    :try_end_52
 320 +    .catch Ljava/io/FileNotFoundException; {:try_start_41 .. :try_end_52} :catch_87
 321 +    .catch Ljava/lang/Exception; {:try_start_41 .. :try_end_52} :catch_82
 322 +
 323 +    const/4 v8, 0x1
 324 +
 325 +    if-ne v0, v8, :cond_56
 326 +
 327 +    const/4 v5, 0x0
 328 +
 329 +    :cond_56
 330 +    :goto_56
 331 +    return v5
 332 +
 333 +    :catch_57
 334 +    move-exception v1
 335 +
 336 +    sget-object v8, Ljava/lang/System;->err:Ljava/io/PrintStream;
 337 +
 338 +    const-string v9, "PrivacyProcessManager: could not find package name"
 339 +
 340 +    invoke-virtual {v8, v9}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 341 +
 342 +    invoke-virtual {v1}, Ljava/lang/Exception;->printStackTrace()V
 343 +
 344 +    goto :goto_1e
 345 +
 346 +    :cond_63
 347 +    const/4 v0, -0x1
 348 +
 349 +    goto :goto_4f
 350 +
 351 +    :catch_65
 352 +    move-exception v1
 353 +
 354 +    :goto_66
 355 +    sget-object v8, Ljava/lang/System;->err:Ljava/io/PrintStream;
 356 +
 357 +    new-instance v9, Ljava/lang/StringBuilder;
 358 +
 359 +    invoke-direct {v9}, Ljava/lang/StringBuilder;-><init>()V
 360 +
 361 +    const-string v10, "PrivacyProcessManager: could not read privacy settings: "
 362 +
 363 +    invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 364 +
 365 +    move-result-object v9
 366 +
 367 +    invoke-virtual {v9, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 368 +
 369 +    move-result-object v9
 370 +
 371 +    invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 372 +
 373 +    move-result-object v9
 374 +
 375 +    invoke-virtual {v8, v9}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 376 +
 377 +    invoke-virtual {v1}, Ljava/lang/Exception;->printStackTrace()V
 378 +
 379 +    goto :goto_56
 380 +
 381 +    :catch_82
 382 +    move-exception v1
 383 +
 384 +    move-object v2, v3
 385 +
 386 +    goto :goto_66
 387 +
 388 +    :catch_85
 389 +    move-exception v8
 390 +
 391 +    goto :goto_56
 392 +
 393 +    :catch_87
 394 +    move-exception v8
 395 +
 396 +    move-object v2, v3
 397 +
 398 +    goto :goto_56
 399 +.end method
 400 +
 401 +.method public static hasPrivacyPermission(Ljava/lang/String;I)Z
 402 +    .registers 16
 403 +
 404 +    const/4 v7, 0x0
 405 +
 406 +    const/4 v6, 0x1
 407 +
 408 +    :try_start_2
 409 +    invoke-static {}, Ljava/lang/PrivacyProcessManager;->getPackageName()Ljava/lang/String;
 410 +    :try_end_5
 411 +    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_5} :catch_39
 412 +
 413 +    move-result-object v7
 414 +
 415 +    :goto_6
 416 +    const/4 v2, 0x0
 417 +
 418 +    :try_start_7
 419 +    new-instance v11, Ljava/lang/StringBuilder;
 420 +
 421 +    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
 422 +
 423 +    const-string v12, "/proc/"
 424 +
 425 +    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 426 +
 427 +    move-result-object v11
 428 +
 429 +    invoke-virtual {v11, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 430 +
 431 +    move-result-object v11
 432 +
 433 +    const-string v12, "/cmdline"
 434 +
 435 +    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 436 +
 437 +    move-result-object v11
 438 +
 439 +    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 440 +
 441 +    move-result-object v0
 442 +
 443 +    new-instance v3, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;
 444 +
 445 +    invoke-direct {v3, v0}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;-><init>(Ljava/lang/String;)V
 446 +    :try_end_25
 447 +    .catch Ljava/io/FileNotFoundException; {:try_start_7 .. :try_end_25} :catch_b9
 448 +    .catch Ljava/lang/Exception; {:try_start_7 .. :try_end_25} :catch_97
 449 +
 450 +    :try_start_25
 451 +    const-string v8, ""
 452 +
 453 +    const/16 v4, 0xa
 454 +
 455 +    :goto_29
 456 +    invoke-virtual {v3}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->readLine()Ljava/lang/String;
 457 +    :try_end_2c
 458 +    .catch Ljava/io/FileNotFoundException; {:try_start_25 .. :try_end_2c} :catch_bb
 459 +    .catch Ljava/lang/Exception; {:try_start_25 .. :try_end_2c} :catch_b6
 460 +
 461 +    move-result-object v8
 462 +
 463 +    if-nez v8, :cond_45
 464 +
 465 +    if-ltz v4, :cond_45
 466 +
 467 +    const-wide/16 v11, 0x5
 468 +
 469 +    :try_start_33
 470 +    invoke-static {v11, v12}, Ljava/lang/Thread;->sleep(J)V
 471 +    :try_end_36
 472 +    .catch Ljava/lang/InterruptedException; {:try_start_33 .. :try_end_36} :catch_b4
 473 +    .catch Ljava/io/FileNotFoundException; {:try_start_33 .. :try_end_36} :catch_bb
 474 +    .catch Ljava/lang/Exception; {:try_start_33 .. :try_end_36} :catch_b6
 475 +
 476 +    :goto_36
 477 +    add-int/lit8 v4, v4, -0x5
 478 +
 479 +    goto :goto_29
 480 +
 481 +    :catch_39
 482 +    move-exception v1
 483 +
 484 +    sget-object v11, Ljava/lang/System;->err:Ljava/io/PrintStream;
 485 +
 486 +    const-string v12, "PrivacyProcessManager: could not find package name or UID"
 487 +
 488 +    invoke-virtual {v11, v12}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 489 +
 490 +    invoke-virtual {v1}, Ljava/lang/Exception;->printStackTrace()V
 491 +
 492 +    goto :goto_6
 493 +
 494 +    :cond_45
 495 +    :try_start_45
 496 +    invoke-virtual {v3}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->close()V
 497 +
 498 +    if-eqz v8, :cond_be
 499 +
 500 +    invoke-virtual {v8}, Ljava/lang/String;->trim()Ljava/lang/String;
 501 +
 502 +    move-result-object v11
 503 +
 504 +    invoke-virtual {v11}, Ljava/lang/String;->length()I
 505 +
 506 +    move-result v11
 507 +
 508 +    const/4 v12, 0x5
 509 +
 510 +    if-le v11, v12, :cond_be
 511 +
 512 +    const-string v11, "logcat"
 513 +
 514 +    invoke-virtual {v8, v11}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 515 +
 516 +    move-result v11
 517 +
 518 +    if-eqz v11, :cond_be
 519 +
 520 +    new-instance v11, Ljava/lang/StringBuilder;
 521 +
 522 +    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
 523 +
 524 +    const-string v12, "/data/system/privacy/"
 525 +
 526 +    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 527 +
 528 +    move-result-object v11
 529 +
 530 +    invoke-virtual {v11, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 531 +
 532 +    move-result-object v11
 533 +
 534 +    const-string v12, "/"
 535 +
 536 +    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 537 +
 538 +    move-result-object v11
 539 +
 540 +    invoke-virtual {v11, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 541 +
 542 +    move-result-object v11
 543 +
 544 +    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 545 +
 546 +    move-result-object v9
 547 +
 548 +    new-instance v2, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;
 549 +
 550 +    invoke-direct {v2, v9}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;-><init>(Ljava/lang/String;)V
 551 +    :try_end_7f
 552 +    .catch Ljava/io/FileNotFoundException; {:try_start_45 .. :try_end_7f} :catch_bb
 553 +    .catch Ljava/lang/Exception; {:try_start_45 .. :try_end_7f} :catch_b6
 554 +
 555 +    :try_start_7f
 556 +    invoke-virtual {v2}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->readLine()Ljava/lang/String;
 557 +
 558 +    move-result-object v5
 559 +
 560 +    if-eqz v5, :cond_95
 561 +
 562 +    invoke-virtual {v5}, Ljava/lang/String;->trim()Ljava/lang/String;
 563 +
 564 +    move-result-object v11
 565 +
 566 +    invoke-static {v11}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
 567 +
 568 +    move-result v10
 569 +
 570 +    :goto_8d
 571 +    invoke-virtual {v2}, Ljava/lang/PrivacyProcessManager$PrivacyFileReader;->close()V
 572 +    :try_end_90
 573 +    .catch Ljava/io/FileNotFoundException; {:try_start_7f .. :try_end_90} :catch_b9
 574 +    .catch Ljava/lang/Exception; {:try_start_7f .. :try_end_90} :catch_97
 575 +
 576 +    const/4 v11, 0x1
 577 +
 578 +    if-ne v10, v11, :cond_94
 579 +
 580 +    const/4 v6, 0x0
 581 +
 582 +    :cond_94
 583 +    :goto_94
 584 +    return v6
 585 +
 586 +    :cond_95
 587 +    const/4 v10, -0x1
 588 +
 589 +    goto :goto_8d
 590 +
 591 +    :catch_97
 592 +    move-exception v1
 593 +
 594 +    :goto_98
 595 +    sget-object v11, Ljava/lang/System;->err:Ljava/io/PrintStream;
 596 +
 597 +    new-instance v12, Ljava/lang/StringBuilder;
 598 +
 599 +    invoke-direct {v12}, Ljava/lang/StringBuilder;-><init>()V
 600 +
 601 +    const-string v13, "PrivacyProcessManager: could not read privacy settings: "
 602 +
 603 +    invoke-virtual {v12, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 604 +
 605 +    move-result-object v12
 606 +
 607 +    invoke-virtual {v12, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 608 +
 609 +    move-result-object v12
 610 +
 611 +    invoke-virtual {v12}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 612 +
 613 +    move-result-object v12
 614 +
 615 +    invoke-virtual {v11, v12}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 616 +
 617 +    invoke-virtual {v1}, Ljava/lang/Exception;->printStackTrace()V
 618 +
 619 +    goto :goto_94
 620 +
 621 +    :catch_b4
 622 +    move-exception v11
 623 +
 624 +    goto :goto_36
 625 +
 626 +    :catch_b6
 627 +    move-exception v1
 628 +
 629 +    move-object v2, v3
 630 +
 631 +    goto :goto_98
 632 +
 633 +    :catch_b9
 634 +    move-exception v11
 635 +
 636 +    goto :goto_94
 637 +
 638 +    :catch_bb
 639 +    move-exception v11
 640 +
 641 +    move-object v2, v3
 642 +
 643 +    goto :goto_94
 644 +
 645 +    :cond_be
 646 +    move-object v2, v3
 647 +
 648 +    goto :goto_94
 649 +.end method
 650 diff -Npru -x '*RIL*' stock-core/smali/java/lang/ProcessManager$ProcessImpl.smali pdroid-core/smali/java/lang/ProcessManager$ProcessImpl.smali
 651 --- stock-core/smali/java/lang/ProcessManager$ProcessImpl.smali 2012-10-18 15:39:23.504588700 -0500
 652 +++ pdroid-core/smali/java/lang/ProcessManager$ProcessImpl.smali        2012-10-18 15:40:08.016809420 -0500
 653 @@ -21,6 +21,8 @@
 654
 655  .field private final exitValueMutex:Ljava/lang/Object;
 656
 657 +.field private fakeProcess:Z
 658 +
 659  .field private final inputStream:Ljava/io/InputStream;
 660
 661  .field private final outputStream:Ljava/io/OutputStream;
 662 @@ -36,6 +38,52 @@
 663
 664      invoke-direct {p0}, Ljava/lang/Process;-><init>()V
 665
 666 +    const/4 v0, 0x0
 667 +
 668 +    iput-boolean v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->fakeProcess:Z
 669 +
 670 +    iput-object v1, p0, Ljava/lang/ProcessManager$ProcessImpl;->exitValue:Ljava/lang/Integer;
 671 +
 672 +    new-instance v0, Ljava/lang/Object;
 673 +
 674 +    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 675 +
 676 +    iput-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->exitValueMutex:Ljava/lang/Object;
 677 +
 678 +    iput p1, p0, Ljava/lang/ProcessManager$ProcessImpl;->pid:I
 679 +
 680 +    new-instance v0, Ljava/lang/ProcessManager$ProcessInputStream;
 681 +
 682 +    invoke-direct {v0, p4, v1}, Ljava/lang/ProcessManager$ProcessInputStream;-><init>(Ljava/io/FileDescriptor;Ljava/lang/ProcessManager$1;)V
 683 +
 684 +    iput-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->errorStream:Ljava/io/InputStream;
 685 +
 686 +    new-instance v0, Ljava/lang/ProcessManager$ProcessInputStream;
 687 +
 688 +    invoke-direct {v0, p2, v1}, Ljava/lang/ProcessManager$ProcessInputStream;-><init>(Ljava/io/FileDescriptor;Ljava/lang/ProcessManager$1;)V
 689 +
 690 +    iput-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->inputStream:Ljava/io/InputStream;
 691 +
 692 +    new-instance v0, Ljava/lang/ProcessManager$ProcessOutputStream;
 693 +
 694 +    invoke-direct {v0, p3, v1}, Ljava/lang/ProcessManager$ProcessOutputStream;-><init>(Ljava/io/FileDescriptor;Ljava/lang/ProcessManager$1;)V
 695 +
 696 +    iput-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->outputStream:Ljava/io/OutputStream;
 697 +
 698 +    return-void
 699 +.end method
 700 +
 701 +.method constructor <init>(ILjava/io/FileDescriptor;Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;Z)V
 702 +    .registers 8
 703 +
 704 +    const/4 v1, 0x0
 705 +
 706 +    invoke-direct {p0}, Ljava/lang/Process;-><init>()V
 707 +
 708 +    const/4 v0, 0x0
 709 +
 710 +    iput-boolean v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->fakeProcess:Z
 711 +
 712      iput-object v1, p0, Ljava/lang/ProcessManager$ProcessImpl;->exitValue:Ljava/lang/Integer;
 713
 714      new-instance v0, Ljava/lang/Object;
 715 @@ -52,12 +100,15 @@
 716
 717      iput-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->errorStream:Ljava/io/InputStream;
 718
 719 +    if-eqz p5, :cond_2a
 720 +
 721      new-instance v0, Ljava/lang/ProcessManager$ProcessInputStream;
 722
 723      invoke-direct {v0, p2, v1}, Ljava/lang/ProcessManager$ProcessInputStream;-><init>(Ljava/io/FileDescriptor;Ljava/lang/ProcessManager$1;)V
 724
 725      iput-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->inputStream:Ljava/io/InputStream;
 726
 727 +    :goto_22
 728      new-instance v0, Ljava/lang/ProcessManager$ProcessOutputStream;
 729
 730      invoke-direct {v0, p3, v1}, Ljava/lang/ProcessManager$ProcessOutputStream;-><init>(Ljava/io/FileDescriptor;Ljava/lang/ProcessManager$1;)V
 731 @@ -65,6 +116,19 @@
 732      iput-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->outputStream:Ljava/io/OutputStream;
 733
 734      return-void
 735 +
 736 +    :cond_2a
 737 +    new-instance v0, Ljava/lang/PrivacyInputStream;
 738 +
 739 +    invoke-direct {v0}, Ljava/lang/PrivacyInputStream;-><init>()V
 740 +
 741 +    iput-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->inputStream:Ljava/io/InputStream;
 742 +
 743 +    const/4 v0, 0x1
 744 +
 745 +    iput-boolean v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->fakeProcess:Z
 746 +
 747 +    goto :goto_22
 748  .end method
 749
 750  .method static synthetic access$300(Ljava/lang/ProcessManager$ProcessImpl;)I
 751 @@ -86,12 +150,17 @@
 752
 753      :try_start_3
 754      iget-object v1, p0, Ljava/lang/ProcessManager$ProcessImpl;->exitValue:Ljava/lang/Integer;
 755 -    :try_end_5
 756 -    .catchall {:try_start_3 .. :try_end_5} :catchall_3b
 757
 758 -    if-nez v1, :cond_10
 759 +    if-eqz v1, :cond_b
 760 +
 761 +    iget-boolean v1, p0, Ljava/lang/ProcessManager$ProcessImpl;->fakeProcess:Z
 762 +    :try_end_9
 763 +    .catchall {:try_start_3 .. :try_end_9} :catchall_3f
 764 +
 765 +    if-eqz v1, :cond_14
 766
 767 -    :try_start_7
 768 +    :cond_b
 769 +    :try_start_b
 770      sget-object v1, Llibcore/io/Libcore;->os:Llibcore/io/Os;
 771
 772      iget v3, p0, Ljava/lang/ProcessManager$ProcessImpl;->pid:I
 773 @@ -99,16 +168,16 @@
 774      sget v4, Llibcore/io/OsConstants;->SIGKILL:I
 775
 776      invoke-interface {v1, v3, v4}, Llibcore/io/Os;->kill(II)V
 777 -    :try_end_10
 778 -    .catchall {:try_start_7 .. :try_end_10} :catchall_3b
 779 -    .catch Llibcore/io/ErrnoException; {:try_start_7 .. :try_end_10} :catch_21
 780 -
 781 -    :cond_10
 782 -    :goto_10
 783 -    :try_start_10
 784 +    :try_end_14
 785 +    .catchall {:try_start_b .. :try_end_14} :catchall_3f
 786 +    .catch Llibcore/io/ErrnoException; {:try_start_b .. :try_end_14} :catch_25
 787 +
 788 +    :cond_14
 789 +    :goto_14
 790 +    :try_start_14
 791      monitor-exit v2
 792 -    :try_end_11
 793 -    .catchall {:try_start_10 .. :try_end_11} :catchall_3b
 794 +    :try_end_15
 795 +    .catchall {:try_start_14 .. :try_end_15} :catchall_3f
 796
 797      iget-object v1, p0, Ljava/lang/ProcessManager$ProcessImpl;->inputStream:Ljava/io/InputStream;
 798
 799 @@ -124,10 +193,10 @@
 800
 801      return-void
 802
 803 -    :catch_21
 804 +    :catch_25
 805      move-exception v0
 806
 807 -    :try_start_22
 808 +    :try_start_26
 809      new-instance v1, Ljava/lang/StringBuilder;
 810
 811      invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 812 @@ -150,14 +219,14 @@
 813
 814      invoke-static {v1, v0}, Ljava/lang/System;->logI(Ljava/lang/String;Ljava/lang/Throwable;)V
 815
 816 -    goto :goto_10
 817 +    goto :goto_14
 818
 819 -    :catchall_3b
 820 +    :catchall_3f
 821      move-exception v1
 822
 823      monitor-exit v2
 824 -    :try_end_3d
 825 -    .catchall {:try_start_22 .. :try_end_3d} :catchall_3b
 826 +    :try_end_41
 827 +    .catchall {:try_start_26 .. :try_end_41} :catchall_3f
 828
 829      throw v1
 830  .end method
 831 @@ -165,14 +234,23 @@
 832  .method public exitValue()I
 833      .registers 5
 834
 835 +    iget-boolean v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->fakeProcess:Z
 836 +
 837 +    if-eqz v0, :cond_8
 838 +
 839 +    const/4 v0, 0x0
 840 +
 841 +    invoke-virtual {p0, v0}, Ljava/lang/ProcessManager$ProcessImpl;->setExitValue(I)V
 842 +
 843 +    :cond_8
 844      iget-object v1, p0, Ljava/lang/ProcessManager$ProcessImpl;->exitValueMutex:Ljava/lang/Object;
 845
 846      monitor-enter v1
 847
 848 -    :try_start_3
 849 +    :try_start_b
 850      iget-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->exitValue:Ljava/lang/Integer;
 851
 852 -    if-nez v0, :cond_25
 853 +    if-nez v0, :cond_2d
 854
 855      new-instance v0, Ljava/lang/IllegalThreadStateException;
 856
 857 @@ -200,17 +278,17 @@
 858
 859      throw v0
 860
 861 -    :catchall_22
 862 +    :catchall_2a
 863      move-exception v0
 864
 865      monitor-exit v1
 866 -    :try_end_24
 867 -    .catchall {:try_start_3 .. :try_end_24} :catchall_22
 868 +    :try_end_2c
 869 +    .catchall {:try_start_b .. :try_end_2c} :catchall_2a
 870
 871      throw v0
 872
 873 -    :cond_25
 874 -    :try_start_25
 875 +    :cond_2d
 876 +    :try_start_2d
 877      iget-object v0, p0, Ljava/lang/ProcessManager$ProcessImpl;->exitValue:Ljava/lang/Integer;
 878
 879      invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 880 @@ -218,8 +296,8 @@
 881      move-result v0
 882
 883      monitor-exit v1
 884 -    :try_end_2c
 885 -    .catchall {:try_start_25 .. :try_end_2c} :catchall_22
 886 +    :try_end_34
 887 +    .catchall {:try_start_2d .. :try_end_34} :catchall_2a
 888
 889      return v0
 890  .end method
 891 diff -Npru -x '*RIL*' stock-core/smali/java/lang/ProcessManager.smali pdroid-core/smali/java/lang/ProcessManager.smali
 892 --- stock-core/smali/java/lang/ProcessManager.smali     2012-10-18 15:39:23.524588800 -0500
 893 +++ pdroid-core/smali/java/lang/ProcessManager.smali    2012-10-18 15:40:08.112809896 -0500
 894 @@ -136,6 +136,155 @@
 895      return-void
 896  .end method
 897
 898 +.method private containsIpTableCommand(Ljava/lang/String;)Z
 899 +    .registers 10
 900 +
 901 +    const/4 v5, 0x0
 902 +
 903 +    :try_start_1
 904 +    sget-object v6, Ljava/lang/System;->out:Ljava/io/PrintStream;
 905 +
 906 +    const-string v7, "now we\'re in containsIpTableCommand"
 907 +
 908 +    invoke-virtual {v6, v7}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 909 +
 910 +    new-instance v3, Ljava/io/FileInputStream;
 911 +
 912 +    invoke-direct {v3, p1}, Ljava/io/FileInputStream;-><init>(Ljava/lang/String;)V
 913 +
 914 +    new-instance v1, Ljava/io/DataInputStream;
 915 +
 916 +    invoke-direct {v1, v3}, Ljava/io/DataInputStream;-><init>(Ljava/io/InputStream;)V
 917 +
 918 +    new-instance v0, Ljava/io/BufferedReader;
 919 +
 920 +    new-instance v6, Ljava/io/InputStreamReader;
 921 +
 922 +    invoke-direct {v6, v1}, Ljava/io/InputStreamReader;-><init>(Ljava/io/InputStream;)V
 923 +
 924 +    invoke-direct {v0, v6}, Ljava/io/BufferedReader;-><init>(Ljava/io/Reader;)V
 925 +
 926 +    :cond_1c
 927 +    invoke-virtual {v0}, Ljava/io/BufferedReader;->readLine()Ljava/lang/String;
 928 +
 929 +    move-result-object v4
 930 +
 931 +    if-eqz v4, :cond_6a
 932 +
 933 +    const-string v6, "iptables"
 934 +
 935 +    invoke-virtual {v4, v6}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 936 +
 937 +    move-result v6
 938 +
 939 +    if-nez v6, :cond_32
 940 +
 941 +    const-string v6, "ip6tables"
 942 +
 943 +    invoke-virtual {v4, v6}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 944 +    :try_end_2f
 945 +    .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_2f} :catch_59
 946 +
 947 +    move-result v6
 948 +
 949 +    if-eqz v6, :cond_1c
 950 +
 951 +    :cond_32
 952 +    :try_start_32
 953 +    invoke-virtual {v1}, Ljava/io/DataInputStream;->close()V
 954 +
 955 +    invoke-virtual {v0}, Ljava/io/BufferedReader;->close()V
 956 +
 957 +    invoke-virtual {v3}, Ljava/io/FileInputStream;->close()V
 958 +    :try_end_3b
 959 +    .catchall {:try_start_32 .. :try_end_3b} :catchall_62
 960 +    .catch Ljava/io/IOException; {:try_start_32 .. :try_end_3b} :catch_4a
 961 +
 962 +    const/4 v3, 0x0
 963 +
 964 +    const/4 v1, 0x0
 965 +
 966 +    const/4 v0, 0x0
 967 +
 968 +    :try_start_3e
 969 +    invoke-static {}, Ljava/lang/System;->gc()V
 970 +
 971 +    :goto_41
 972 +    sget-object v6, Ljava/lang/System;->out:Ljava/io/PrintStream;
 973 +
 974 +    const-string v7, "returning true, file contains iptable command"
 975 +
 976 +    invoke-virtual {v6, v7}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 977 +    :try_end_48
 978 +    .catch Ljava/lang/Exception; {:try_start_3e .. :try_end_48} :catch_59
 979 +
 980 +    const/4 v5, 0x1
 981 +
 982 +    :goto_49
 983 +    return v5
 984 +
 985 +    :catch_4a
 986 +    move-exception v2
 987 +
 988 +    :try_start_4b
 989 +    sget-object v6, Ljava/lang/System;->out:Ljava/io/PrintStream;
 990 +
 991 +    const-string v7, "got exception while closing streams"
 992 +
 993 +    invoke-virtual {v6, v7}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
 994 +    :try_end_52
 995 +    .catchall {:try_start_4b .. :try_end_52} :catchall_62
 996 +
 997 +    const/4 v3, 0x0
 998 +
 999 +    const/4 v1, 0x0
1000 +
1001 +    const/4 v0, 0x0
1002 +
1003 +    :try_start_55
1004 +    invoke-static {}, Ljava/lang/System;->gc()V
1005 +    :try_end_58
1006 +    .catch Ljava/lang/Exception; {:try_start_55 .. :try_end_58} :catch_59
1007 +
1008 +    goto :goto_41
1009 +
1010 +    :catch_59
1011 +    move-exception v2
1012 +
1013 +    sget-object v6, Ljava/lang/System;->out:Ljava/io/PrintStream;
1014 +
1015 +    const-string v7, "returning false,because we got exception while parsing"
1016 +
1017 +    invoke-virtual {v6, v7}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
1018 +
1019 +    goto :goto_49
1020 +
1021 +    :catchall_62
1022 +    move-exception v6
1023 +
1024 +    const/4 v3, 0x0
1025 +
1026 +    const/4 v1, 0x0
1027 +
1028 +    const/4 v0, 0x0
1029 +
1030 +    :try_start_66
1031 +    invoke-static {}, Ljava/lang/System;->gc()V
1032 +
1033 +    throw v6
1034 +
1035 +    :cond_6a
1036 +    sget-object v6, Ljava/lang/System;->out:Ljava/io/PrintStream;
1037 +
1038 +    const-string v7, "returning false, file doesn\'t contains iptable command"
1039 +
1040 +    invoke-virtual {v6, v7}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
1041 +    :try_end_71
1042 +    .catch Ljava/lang/Exception; {:try_start_66 .. :try_end_71} :catch_59
1043 +
1044 +    goto :goto_49
1045 +.end method
1046 +
1047  .method private static native exec([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;Z)I
1048      .annotation system Ldalvik/annotation/Throws;
1049          value = {
1050 @@ -393,109 +542,390 @@
1051
1052  # virtual methods
1053  .method public exec([Ljava/lang/String;[Ljava/lang/String;Ljava/io/File;Z)Ljava/lang/Process;
1054 -    .registers 26
1055 +    .registers 30
1056      .annotation system Ldalvik/annotation/Throws;
1057          value = {
1058              Ljava/io/IOException;
1059          }
1060      .end annotation
1061
1062 -    if-nez p1, :cond_8
1063 +    const/16 v20, 0x1
1064 +
1065 +    if-eqz p1, :cond_36
1066 +
1067 +    const/16 v18, 0x0
1068 +
1069 +    :goto_6
1070 +    move-object/from16 v0, p1
1071 +
1072 +    array-length v10, v0
1073 +
1074 +    move/from16 v0, v18
1075 +
1076 +    if-ge v0, v10, :cond_36
1077 +
1078 +    sget-object v10, Ljava/lang/System;->out:Ljava/io/PrintStream;
1079 +
1080 +    new-instance v11, Ljava/lang/StringBuilder;
1081 +
1082 +    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
1083 +
1084 +    const-string v12, "tainted command part "
1085 +
1086 +    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1087 +
1088 +    move-result-object v11
1089 +
1090 +    move/from16 v0, v18
1091 +
1092 +    invoke-virtual {v11, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
1093 +
1094 +    move-result-object v11
1095 +
1096 +    const-string v12, ": "
1097 +
1098 +    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1099 +
1100 +    move-result-object v11
1101 +
1102 +    aget-object v12, p1, v18
1103 +
1104 +    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1105 +
1106 +    move-result-object v11
1107 +
1108 +    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
1109 +
1110 +    move-result-object v11
1111 +
1112 +    invoke-virtual {v10, v11}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
1113 +
1114 +    add-int/lit8 v18, v18, 0x1
1115 +
1116 +    goto :goto_6
1117 +
1118 +    :cond_36
1119 +    if-eqz p1, :cond_b4
1120 +
1121 +    move-object/from16 v0, p1
1122 +
1123 +    array-length v10, v0
1124 +
1125 +    if-lez v10, :cond_b4
1126 +
1127 +    const/4 v10, 0x0
1128 +
1129 +    aget-object v10, p1, v10
1130 +
1131 +    const-string v11, "su"
1132 +
1133 +    invoke-virtual {v10, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
1134 +
1135 +    move-result v10
1136 +
1137 +    if-nez v10, :cond_69
1138 +
1139 +    const/4 v10, 0x0
1140 +
1141 +    aget-object v10, p1, v10
1142 +
1143 +    const-string v11, "sh"
1144 +
1145 +    invoke-virtual {v10, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
1146 +
1147 +    move-result v10
1148 +
1149 +    if-nez v10, :cond_69
1150
1151 -    new-instance v8, Ljava/lang/NullPointerException;
1152 +    const/4 v10, 0x0
1153
1154 -    invoke-direct {v8}, Ljava/lang/NullPointerException;-><init>()V
1155 +    aget-object v10, p1, v10
1156
1157 -    throw v8
1158 +    const-string v11, "bash"
1159
1160 -    :cond_8
1161 +    invoke-virtual {v10, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
1162 +
1163 +    move-result v10
1164 +
1165 +    if-nez v10, :cond_69
1166 +
1167 +    const/4 v10, 0x0
1168 +
1169 +    aget-object v10, p1, v10
1170 +
1171 +    const-string v11, "rbash"
1172 +
1173 +    invoke-virtual {v10, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
1174 +
1175 +    move-result v10
1176 +
1177 +    if-eqz v10, :cond_b4
1178 +
1179 +    :cond_69
1180 +    const/16 v18, 0x0
1181 +
1182 +    :goto_6b
1183      move-object/from16 v0, p1
1184
1185 -    array-length v8, v0
1186 +    array-length v10, v0
1187 +
1188 +    move/from16 v0, v18
1189 +
1190 +    if-ge v0, v10, :cond_b4
1191 +
1192 +    sget-object v10, Ljava/lang/System;->out:Ljava/io/PrintStream;
1193 +
1194 +    new-instance v11, Ljava/lang/StringBuilder;
1195 +
1196 +    invoke-direct {v11}, Ljava/lang/StringBuilder;-><init>()V
1197 +
1198 +    const-string v12, "Now test tainted command: "
1199 +
1200 +    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1201 +
1202 +    move-result-object v11
1203 +
1204 +    aget-object v12, p1, v18
1205 +
1206 +    invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1207 +
1208 +    move-result-object v11
1209 +
1210 +    invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
1211 +
1212 +    move-result-object v11
1213 +
1214 +    invoke-virtual {v10, v11}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
1215 +
1216 +    aget-object v10, p1, v18
1217 +
1218 +    const-string v11, ".sh"
1219 +
1220 +    invoke-virtual {v10, v11}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
1221 +
1222 +    move-result v10
1223 +
1224 +    if-nez v10, :cond_a0
1225 +
1226 +    aget-object v10, p1, v18
1227 +
1228 +    const-string v11, "/"
1229 +
1230 +    invoke-virtual {v10, v11}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
1231 +
1232 +    move-result v10
1233 +
1234 +    if-eqz v10, :cond_f6
1235 +
1236 +    :cond_a0
1237 +    aget-object v10, p1, v18
1238 +
1239 +    move-object/from16 v0, p0
1240 +
1241 +    invoke-direct {v0, v10}, Ljava/lang/ProcessManager;->containsIpTableCommand(Ljava/lang/String;)Z
1242 +
1243 +    move-result v10
1244 +
1245 +    if-eqz v10, :cond_f6
1246 +
1247 +    const-string v10, "ipTableProtectSetting"
1248 +
1249 +    invoke-static {v10}, Ljava/lang/PrivacyProcessManager;->hasPrivacyPermission(Ljava/lang/String;)Z
1250 +
1251 +    move-result v10
1252 +
1253 +    if-nez v10, :cond_f6
1254 +
1255 +    const/16 v20, 0x0
1256 +
1257 +    :cond_b4
1258 +    if-eqz p1, :cond_e2
1259 +
1260 +    move-object/from16 v0, p1
1261 +
1262 +    array-length v10, v0
1263 +
1264 +    if-lez v10, :cond_e2
1265 +
1266 +    if-eqz v20, :cond_e2
1267 +
1268 +    const/16 v18, 0x0
1269 +
1270 +    :goto_bf
1271 +    move-object/from16 v0, p1
1272 +
1273 +    array-length v10, v0
1274 +
1275 +    move/from16 v0, v18
1276 +
1277 +    if-ge v0, v10, :cond_e2
1278
1279 -    if-nez v8, :cond_13
1280 +    aget-object v10, p1, v18
1281
1282 -    new-instance v8, Ljava/lang/IndexOutOfBoundsException;
1283 +    const-string v11, "iptables"
1284
1285 -    invoke-direct {v8}, Ljava/lang/IndexOutOfBoundsException;-><init>()V
1286 +    invoke-virtual {v10, v11}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
1287
1288 -    throw v8
1289 +    move-result v10
1290
1291 -    :cond_13
1292 +    if-nez v10, :cond_da
1293 +
1294 +    aget-object v10, p1, v18
1295 +
1296 +    const-string v11, "ip6tables"
1297 +
1298 +    invoke-virtual {v10, v11}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
1299 +
1300 +    move-result v10
1301 +
1302 +    if-eqz v10, :cond_fc
1303 +
1304 +    :cond_da
1305 +    const-string v10, "ipTableProtectSetting"
1306 +
1307 +    invoke-static {v10}, Ljava/lang/PrivacyProcessManager;->hasPrivacyPermission(Ljava/lang/String;)Z
1308 +
1309 +    move-result v10
1310 +
1311 +    if-eqz v10, :cond_fa
1312 +
1313 +    :cond_e2
1314 +    if-nez v20, :cond_ee
1315 +
1316 +    const/4 v10, 0x1
1317 +
1318 +    new-array v0, v10, [Ljava/lang/String;
1319 +
1320 +    move-object/from16 p1, v0
1321 +
1322 +    const/4 v10, 0x0
1323 +
1324 +    const-string v11, "su"
1325 +
1326 +    aput-object v11, p1, v10
1327 +
1328 +    :cond_ee
1329 +    if-nez p1, :cond_ff
1330 +
1331 +    new-instance v10, Ljava/lang/NullPointerException;
1332 +
1333 +    invoke-direct {v10}, Ljava/lang/NullPointerException;-><init>()V
1334 +
1335 +    throw v10
1336 +
1337 +    :cond_f6
1338 +    add-int/lit8 v18, v18, 0x1
1339 +
1340 +    goto/16 :goto_6b
1341 +
1342 +    :cond_fa
1343 +    const/16 v20, 0x0
1344 +
1345 +    :cond_fc
1346 +    add-int/lit8 v18, v18, 0x1
1347 +
1348 +    goto :goto_bf
1349 +
1350 +    :cond_ff
1351 +    move-object/from16 v0, p1
1352 +
1353 +    array-length v10, v0
1354 +
1355 +    if-nez v10, :cond_10a
1356 +
1357 +    new-instance v10, Ljava/lang/IndexOutOfBoundsException;
1358 +
1359 +    invoke-direct {v10}, Ljava/lang/IndexOutOfBoundsException;-><init>()V
1360 +
1361 +    throw v10
1362 +
1363 +    :cond_10a
1364      invoke-virtual/range {p1 .. p1}, [Ljava/lang/String;->clone()Ljava/lang/Object;
1365
1366      move-result-object v2
1367
1368      check-cast v2, [Ljava/lang/String;
1369
1370 -    if-eqz p2, :cond_31
1371 +    if-eqz p2, :cond_12f
1372
1373      invoke-virtual/range {p2 .. p2}, [Ljava/lang/String;->clone()Ljava/lang/Object;
1374
1375 -    move-result-object v8
1376 +    move-result-object v10
1377
1378 -    check-cast v8, [Ljava/lang/String;
1379 +    check-cast v10, [Ljava/lang/String;
1380
1381 -    move-object v3, v8
1382 +    move-object v3, v10
1383
1384 -    :goto_22
1385 -    move-object v10, v2
1386 +    :goto_119
1387 +    move-object v15, v2
1388
1389 -    array-length v14, v10
1390 +    array-length v0, v15
1391
1392 -    const/4 v13, 0x0
1393 +    move/from16 v21, v0
1394 +
1395 +    const/16 v19, 0x0
1396
1397 -    :goto_25
1398 -    if-ge v13, v14, :cond_36
1399 +    :goto_11f
1400 +    move/from16 v0, v19
1401
1402 -    aget-object v9, v10, v13
1403 +    move/from16 v1, v21
1404
1405 -    if-nez v9, :cond_33
1406 +    if-ge v0, v1, :cond_134
1407
1408 -    new-instance v8, Ljava/lang/NullPointerException;
1409 +    aget-object v14, v15, v19
1410
1411 -    invoke-direct {v8}, Ljava/lang/NullPointerException;-><init>()V
1412 +    if-nez v14, :cond_131
1413
1414 -    throw v8
1415 +    new-instance v10, Ljava/lang/NullPointerException;
1416
1417 -    :cond_31
1418 +    invoke-direct {v10}, Ljava/lang/NullPointerException;-><init>()V
1419 +
1420 +    throw v10
1421 +
1422 +    :cond_12f
1423      const/4 v3, 0x0
1424
1425 -    goto :goto_22
1426 +    goto :goto_119
1427
1428 -    :cond_33
1429 -    add-int/lit8 v13, v13, 0x1
1430 +    :cond_131
1431 +    add-int/lit8 v19, v19, 0x1
1432
1433 -    goto :goto_25
1434 +    goto :goto_11f
1435
1436 -    :cond_36
1437 -    if-eqz v3, :cond_4a
1438 +    :cond_134
1439 +    if-eqz v3, :cond_14f
1440
1441 -    move-object v10, v3
1442 +    move-object v15, v3
1443
1444 -    array-length v14, v10
1445 +    array-length v0, v15
1446
1447 -    const/4 v13, 0x0
1448 +    move/from16 v21, v0
1449 +
1450 +    const/16 v19, 0x0
1451 +
1452 +    :goto_13c
1453 +    move/from16 v0, v19
1454 +
1455 +    move/from16 v1, v21
1456
1457 -    :goto_3b
1458 -    if-ge v13, v14, :cond_4a
1459 +    if-ge v0, v1, :cond_14f
1460
1461 -    aget-object v12, v10, v13
1462 +    aget-object v17, v15, v19
1463
1464 -    if-nez v12, :cond_47
1465 +    if-nez v17, :cond_14c
1466
1467 -    new-instance v8, Ljava/lang/NullPointerException;
1468 +    new-instance v10, Ljava/lang/NullPointerException;
1469
1470 -    invoke-direct {v8}, Ljava/lang/NullPointerException;-><init>()V
1471 +    invoke-direct {v10}, Ljava/lang/NullPointerException;-><init>()V
1472
1473 -    throw v8
1474 +    throw v10
1475
1476 -    :cond_47
1477 -    add-int/lit8 v13, v13, 0x1
1478 +    :cond_14c
1479 +    add-int/lit8 v19, v19, 0x1
1480
1481 -    goto :goto_3b
1482 +    goto :goto_13c
1483
1484 -    :cond_4a
1485 +    :cond_14f
1486      new-instance v5, Ljava/io/FileDescriptor;
1487
1488      invoke-direct {v5}, Ljava/io/FileDescriptor;-><init>()V
1489 @@ -508,161 +938,168 @@
1490
1491      invoke-direct {v7}, Ljava/io/FileDescriptor;-><init>()V
1492
1493 -    if-nez p3, :cond_95
1494 +    if-nez p3, :cond_196
1495
1496      const/4 v4, 0x0
1497
1498 -    :goto_5c
1499 +    :goto_161
1500      move-object/from16 v0, p0
1501
1502      iget-object v0, v0, Ljava/lang/ProcessManager;->processReferences:Ljava/util/Map;
1503
1504 -    move-object/from16 v19, v0
1505 +    move-object/from16 v24, v0
1506
1507 -    monitor-enter v19
1508 +    monitor-enter v24
1509
1510      move/from16 v8, p4
1511
1512 -    :try_start_65
1513 +    :try_start_16a
1514      invoke-static/range {v2 .. v8}, Ljava/lang/ProcessManager;->exec([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;Z)I
1515 -    :try_end_68
1516 -    .catchall {:try_start_65 .. :try_end_68} :catchall_e3
1517 -    .catch Ljava/io/IOException; {:try_start_65 .. :try_end_68} :catch_9a
1518 +    :try_end_16d
1519 +    .catchall {:try_start_16a .. :try_end_16d} :catchall_1dc
1520 +    .catch Ljava/io/IOException; {:try_start_16a .. :try_end_16d} :catch_19b
1521
1522 -    move-result v15
1523 +    move-result v9
1524
1525 -    :try_start_69
1526 -    new-instance v16, Ljava/lang/ProcessManager$ProcessImpl;
1527 +    if-eqz v20, :cond_1df
1528
1529 -    move-object/from16 v0, v16
1530 +    :try_start_170
1531 +    new-instance v8, Ljava/lang/ProcessManager$ProcessImpl;
1532
1533 -    invoke-direct {v0, v15, v5, v6, v7}, Ljava/lang/ProcessManager$ProcessImpl;-><init>(ILjava/io/FileDescriptor;Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;)V
1534 +    invoke-direct {v8, v9, v5, v6, v7}, Ljava/lang/ProcessManager$ProcessImpl;-><init>(ILjava/io/FileDescriptor;Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;)V
1535
1536 -    new-instance v17, Ljava/lang/ProcessManager$ProcessReference;
1537 +    :goto_175
1538 +    new-instance v22, Ljava/lang/ProcessManager$ProcessReference;
1539
1540      move-object/from16 v0, p0
1541
1542 -    iget-object v8, v0, Ljava/lang/ProcessManager;->referenceQueue:Ljava/lang/ProcessManager$ProcessReferenceQueue;
1543 +    iget-object v10, v0, Ljava/lang/ProcessManager;->referenceQueue:Ljava/lang/ProcessManager$ProcessReferenceQueue;
1544
1545 -    move-object/from16 v0, v17
1546 +    move-object/from16 v0, v22
1547
1548 -    move-object/from16 v1, v16
1549 -
1550 -    invoke-direct {v0, v1, v8}, Ljava/lang/ProcessManager$ProcessReference;-><init>(Ljava/lang/ProcessManager$ProcessImpl;Ljava/lang/ProcessManager$ProcessReferenceQueue;)V
1551 +    invoke-direct {v0, v8, v10}, Ljava/lang/ProcessManager$ProcessReference;-><init>(Ljava/lang/ProcessManager$ProcessImpl;Ljava/lang/ProcessManager$ProcessReferenceQueue;)V
1552
1553      move-object/from16 v0, p0
1554
1555 -    iget-object v8, v0, Ljava/lang/ProcessManager;->processReferences:Ljava/util/Map;
1556 +    iget-object v10, v0, Ljava/lang/ProcessManager;->processReferences:Ljava/util/Map;
1557
1558 -    invoke-static {v15}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
1559 +    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
1560
1561 -    move-result-object v20
1562 +    move-result-object v11
1563
1564 -    move-object/from16 v0, v20
1565 +    move-object/from16 v0, v22
1566
1567 -    move-object/from16 v1, v17
1568 -
1569 -    invoke-interface {v8, v0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
1570 +    invoke-interface {v10, v11, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
1571
1572      move-object/from16 v0, p0
1573
1574 -    iget-object v8, v0, Ljava/lang/ProcessManager;->processReferences:Ljava/util/Map;
1575 +    iget-object v10, v0, Ljava/lang/ProcessManager;->processReferences:Ljava/util/Map;
1576
1577 -    invoke-virtual {v8}, Ljava/lang/Object;->notifyAll()V
1578 +    invoke-virtual {v10}, Ljava/lang/Object;->notifyAll()V
1579
1580 -    monitor-exit v19
1581 -    :try_end_94
1582 -    .catchall {:try_start_69 .. :try_end_94} :catchall_e3
1583 +    monitor-exit v24
1584 +    :try_end_195
1585 +    .catchall {:try_start_170 .. :try_end_195} :catchall_1dc
1586
1587 -    return-object v16
1588 +    return-object v8
1589
1590 -    :cond_95
1591 +    :cond_196
1592      invoke-virtual/range {p3 .. p3}, Ljava/io/File;->getPath()Ljava/lang/String;
1593
1594      move-result-object v4
1595
1596 -    goto :goto_5c
1597 -
1598 -    :catch_9a
1599 -    move-exception v11
1600 +    goto :goto_161
1601
1602 -    :try_start_9b
1603 -    new-instance v18, Ljava/io/IOException;
1604 +    :catch_19b
1605 +    move-exception v16
1606
1607 -    new-instance v8, Ljava/lang/StringBuilder;
1608 +    :try_start_19c
1609 +    new-instance v23, Ljava/io/IOException;
1610
1611 -    invoke-direct {v8}, Ljava/lang/StringBuilder;-><init>()V
1612 +    new-instance v10, Ljava/lang/StringBuilder;
1613
1614 -    const-string v20, "Error running exec(). Command: "
1615 +    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
1616
1617 -    move-object/from16 v0, v20
1618 +    const-string v11, "Error running exec(). Command: "
1619
1620 -    invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1621 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1622
1623 -    move-result-object v8
1624 +    move-result-object v10
1625
1626      invoke-static {v2}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
1627
1628 -    move-result-object v20
1629 +    move-result-object v11
1630
1631 -    move-object/from16 v0, v20
1632 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1633
1634 -    invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1635 +    move-result-object v10
1636
1637 -    move-result-object v8
1638 +    const-string v11, " Working Directory: "
1639
1640 -    const-string v20, " Working Directory: "
1641 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1642
1643 -    move-object/from16 v0, v20
1644 +    move-result-object v10
1645
1646 -    invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1647 +    move-object/from16 v0, p3
1648
1649 -    move-result-object v8
1650 +    invoke-virtual {v10, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
1651
1652 -    move-object/from16 v0, p3
1653 +    move-result-object v10
1654 +
1655 +    const-string v11, " Environment: "
1656
1657 -    invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
1658 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1659
1660 -    move-result-object v8
1661 +    move-result-object v10
1662
1663 -    const-string v20, " Environment: "
1664 +    invoke-static {v3}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
1665
1666 -    move-object/from16 v0, v20
1667 +    move-result-object v11
1668
1669 -    invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1670 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1671
1672 -    move-result-object v8
1673 +    move-result-object v10
1674
1675 -    invoke-static {v3}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
1676 +    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
1677
1678 -    move-result-object v20
1679 +    move-result-object v10
1680
1681 -    move-object/from16 v0, v20
1682 +    move-object/from16 v0, v23
1683
1684 -    invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1685 +    invoke-direct {v0, v10}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
1686
1687 -    move-result-object v8
1688 +    move-object/from16 v0, v23
1689 +
1690 +    move-object/from16 v1, v16
1691
1692 -    invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
1693 +    invoke-virtual {v0, v1}, Ljava/io/IOException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
1694
1695 -    move-result-object v8
1696 +    throw v23
1697
1698 -    move-object/from16 v0, v18
1699 +    :catchall_1dc
1700 +    move-exception v10
1701
1702 -    invoke-direct {v0, v8}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
1703 +    monitor-exit v24
1704 +    :try_end_1de
1705 +    .catchall {:try_start_19c .. :try_end_1de} :catchall_1dc
1706
1707 -    move-object/from16 v0, v18
1708 +    throw v10
1709 +
1710 +    :cond_1df
1711 +    :try_start_1df
1712 +    new-instance v8, Ljava/lang/ProcessManager$ProcessImpl;
1713 +
1714 +    const/4 v13, 0x0
1715
1716 -    invoke-virtual {v0, v11}, Ljava/io/IOException;->initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;
1717 +    move-object v10, v5
1718
1719 -    throw v18
1720 +    move-object v11, v6
1721
1722 -    :catchall_e3
1723 -    move-exception v8
1724 +    move-object v12, v7
1725
1726 -    monitor-exit v19
1727 -    :try_end_e5
1728 -    .catchall {:try_start_9b .. :try_end_e5} :catchall_e3
1729 +    invoke-direct/range {v8 .. v13}, Ljava/lang/ProcessManager$ProcessImpl;-><init>(ILjava/io/FileDescriptor;Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;Z)V
1730 +    :try_end_1e8
1731 +    .catchall {:try_start_1df .. :try_end_1e8} :catchall_1dc
1732
1733 -    throw v8
1734 +    goto :goto_175
1735  .end method