Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken
* commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934':
Improved error handling when font loading fails.
Although when building system image, "input" script will be given execution
permission, adb sync will push a version without x onto device from build
tree. Refer to frameworks/base/cmds/svc/svc, which has execution bit set.
Change-Id: Ie82df2f0d3150c3df9498399f2c446f07ea89ca5
When these libraries are instrumented with emma instructions, runtime keeps
restarting on native crashes. To acheive a fully emma instrumented build,
we need to disable emma instrumentation on these libraries.
Change-Id: I51cb3bf71e0e348264fe5f21a27085fb2b9e6670
Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken
* commit '7361b7410f2427022cc8917b00553dc26107cded':
Uncomment a test that was marked as STOPSHIP
Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp
* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
Uncomment a test that was marked as STOPSHIP
Merge commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken
* commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf':
fix build
Fix some typos and other cosmetic cleanups in telephony framework.
Initialize the cache path only if the container exists.
This did exist before but was somehow removed.
Fix a known test failure as well.
Change-Id: I63219369b0e7abca4919fbde2a04035a0fea9e35
Merge commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken
* commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
Fix updating and deleting FDN entries with an empty alpha identifier.
Abort FDN delete when number is empty (instead of name)
- Fix AdnRecord.buildAdnString() to generate the correct record when alpha
identifier is empty. This allows the user to update an FDN entry to remove
the alpha identifier. Previously the entire entry would be deleted because
an empty record was generated here when the alpha identifier was empty,
rather than a record containing the phone number with an empty alpha tag.
Also, return null if the number or alpha tag are too long.
- Fix bug in IccProvider.delete() where efType was compared against local
FDN constant rather than IccConstants.EF_FDN. This would always return
false. Comparing with IccConstants.EF_FDN gives the intended behavior.
Change-Id: I0ea75d7e107c7318c9a48ae6e0a15845a718f4c0
Merge commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken
* commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9':
docs: revise webview description and add info for targeting screen densities
Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp
* commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49':
docs: revise webview description and add info for targeting screen densities
Merge commit 'b2fa79e3723b448114181fef983deaae97b44161' into kraken
* commit 'b2fa79e3723b448114181fef983deaae97b44161':
Doc change: add link to source.android.com
