diff options
| author | Christopher Ferris <cferris@google.com> | 2015-01-30 00:21:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-30 00:21:12 +0000 |
| commit | 3c1fd311ff84e7d79861e56f500f36ccf43a08ef (patch) | |
| tree | 13632bc9bd7d7830bad19de69beb92e1bb8533c3 /core/java/com | |
| parent | 043adafffdbc8702d739636d349647bff5044c08 (diff) | |
| parent | 0654196fb08fb8c0dfed65ece00f0a4596ed70c2 (diff) | |
| download | frameworks_base-3c1fd311ff84e7d79861e56f500f36ccf43a08ef.zip frameworks_base-3c1fd311ff84e7d79861e56f500f36ccf43a08ef.tar.gz frameworks_base-3c1fd311ff84e7d79861e56f500f36ccf43a08ef.tar.bz2 | |
am 0654196f: am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating."
* commit '0654196fb08fb8c0dfed65ece00f0a4596ed70c2':
Fix wrap property creation when truncating.
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteConnection.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index aba4bd0..0eb52cb 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -800,7 +800,12 @@ class ZygoteConnection { if (args.niceName != null) { String property = "wrap." + args.niceName; if (property.length() > 31) { - property = property.substring(0, 31); + // Avoid creating an illegal property name when truncating. + if (property.charAt(30) != '.') { + property = property.substring(0, 31); + } else { + property = property.substring(0, 30); + } } args.invokeWith = SystemProperties.get(property); if (args.invokeWith != null && args.invokeWith.length() == 0) { |