OSDN Git Service

Handle '&' in DexoptUtils#encodeClassLoader
authorShubham Ajmera <shubhamajmera@google.com>
Tue, 5 Sep 2017 17:20:41 +0000 (10:20 -0700)
committerAndreas Gampe <agampe@google.com>
Fri, 3 Nov 2017 02:31:09 +0000 (19:31 -0700)
commit145993eb25cceb9a463dad0c6a4ddc55d05f401d
tree7d3bf8e935150ba9661eedaad94c3ed070cd316f
parenta7c51a3d7fa6e8cdbe0ba22f871b0b98fd8f9677
Handle '&' in DexoptUtils#encodeClassLoader

For system apps, we pass '&' for CLC.
The method was treating this as a path as a result we were getting
wrong encoding for CLC.
This was causing dexopt failures for A/B OTA.

Removed the secondary dex file dexopt till we fixed it.

(cherry picked from commit 727aaa36b6914be3f340c97c991c93314d25c617)

Bug: 65067046
Test: runtest.py -x \
  frameworks/base/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
(cherry-picked from commit 557c054935c0864b42ce49541d12d32ae6a797bc)
Merged-In: I9aa440750c811676c86d8c6d0d451077d0edf5a0
Change-Id: I9aa440750c811676c86d8c6d0d451077d0edf5a0
services/core/java/com/android/server/pm/OtaDexoptService.java
services/core/java/com/android/server/pm/dex/DexoptUtils.java
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java