Neil Fuller
95126ae207
am 468b3c5e: am 245eaa25: Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev
...
* commit '468b3c5e8133e6d9d4e48b3d67cac982e24a9c5a':
Fixing android.text.format.Time for non-English locales
2014-08-29 18:50:42 +00:00
Kenny Guy
42fc95cedc
am d74446b2: am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev
...
* commit 'd74446b251aa2258ef6bbff33019a236836630be':
Load ApplicationInfo for correct user.
2014-08-29 18:50:30 +00:00
Yohei Yukawa
4bf61aa61e
am 7046f79e: am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev
...
* commit '7046f79ec9c9b0510af0f541f0e135b8a1ad4f5d':
Reject request when any unknown flag is speficied
2014-08-29 18:50:18 +00:00
Jeff Sharkey
01e7bc6e6c
am bb50b0b4: am f1ddfd1e: Keep tests building.
...
* commit 'bb50b0b4f3f7b738317cf905c7ef6274e89828c7':
Keep tests building.
2014-08-29 18:50:08 +00:00
Jeff Sharkey
670feb4a76
am fc5b41eb: am 78c14368: Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev
...
* commit 'fc5b41eb8ef68686f49ed2b455fa25928e86a3f6':
FileBridge needs to keep strong reference to PFD.
2014-08-29 18:49:57 +00:00
Jungshik Jang
23e972e311
am 78045632: am 92be4d75: Merge "Fix system audio mode failure in boot up" into lmp-dev
...
* commit '78045632a35e4aaaa2b94157ef806319d515f59d':
Fix system audio mode failure in boot up
2014-08-29 18:49:45 +00:00
Sandeep Siddhartha
80e8b901b3
am efe6c903: am cffbcb8a: Merge "Address API review comments" into lmp-dev
...
* commit 'efe6c9032d1a1463aeda62e034c7fe42db5866e9':
Address API review comments
2014-08-29 18:49:40 +00:00
Adam Lesinski
ec187b726b
am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev
...
* commit '1ec1f85d6ebab39f3aad6f426e0fe0aeca2b04bb':
Fix memory leak in ResTable
2014-08-29 18:49:14 +00:00
Terry Heo
2966c8689d
am b2357d5a: am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev
...
* commit 'b2357d5aabf85fa1b36036024e53da7dab416815':
CEC: Implement dump() of HdmiControlService
2014-08-29 18:49:09 +00:00
Adam Powell
3db557537a
am 41d34328: am ae806d87: Merge "Doc improvements for new Toolbar changes, now with attributes." into lmp-dev
...
* commit '41d34328b8b85d67a754687bd4e7570cdd4e8846':
Doc improvements for new Toolbar changes, now with attributes.
2014-08-29 18:48:52 +00:00
Adam Powell
60aa53f71b
am 1ae3bf17: am cbed634a: Merge "Don\'t add title margins during to Toolbar layout if titles don\'t fit" into lmp-dev
...
* commit '1ae3bf177d3ad86071ed7183511ef05ee57c6dcf':
Don't add title margins during to Toolbar layout if titles don't fit
2014-08-29 18:48:44 +00:00
Adam Powell
06086bc31e
am 32e9145c: am 31192ba8: Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev
...
* commit '32e9145c929ba740e3fce91cc495a97a538a9c37':
Add xml attributes to Toolbar for navigation icon
2014-08-29 18:48:38 +00:00
Adam Lesinski
343cabb316
am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev
...
* commit '60f193fbe905f65750503cdaf8616d31c85016d6':
Stamp platform version code into app Apks
2014-08-29 18:48:33 +00:00
Jeff Tinker
2419629be7
am d83b4f16: am b8ccb705: Merge "Fix exception message string formatting in MediaDrm" into lmp-dev
...
* commit 'd83b4f1660de78738a881623d0bb3e45966fc32d':
Fix exception message string formatting in MediaDrm
2014-08-29 18:48:28 +00:00
Svetoslav
9b7c16ef48
am 221ae208: am 6a353ad0: Merge "Print UI polish." into lmp-dev
...
* commit '221ae208fb262d4cd177e292babef3856be52e5d':
Print UI polish.
2014-08-29 18:48:23 +00:00
Neil Fuller
0ecef43e39
am 245eaa25: Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev
...
* commit '245eaa25b3c9349660a6e24cd2d0e46a7b3381b4':
Fixing android.text.format.Time for non-English locales
2014-08-29 13:49:03 +00:00
Neil Fuller
7e19fb0d69
Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev
2014-08-29 13:36:02 +00:00
Neil Fuller
16566656cd
Fixing android.text.format.Time for non-English locales
...
The test fixes for bug 17262063 showed up a real issue for
non-English locales with the Time.format() method:
If the Android string resources that contain the pattern use
non-ASCII characters then a '?' would be output instead of
those characters.
For example, in France the pattern for '%c' includes a 'à'
(a with a grave accent) and Japan includes 日.
The problem was due to converting the pattern to bytes using
the US_ASCII character set, which turns non-ASCII characters
into '?'. The code has been changed to use char throughout
and avoid bytes.
Internal documentation has been improved.
Some calls to modifyAndAppend() have been replaced with a
direct call to outputBuilder.append() because the
modify step is guaranteed to a no-op for the literals given.
The formatter has been changed to use Locale.US because it
is only used for outputting numbers. It has been renamed
to make this more obvious and the locale field has been
removed.
Bug: 17262063
(cherry picked from commit 788cb18f652fca380acefdadce305415bc0602b0)
Change-Id: I96ee158fbeb01827f0bbf022631625416f872fdb
2014-08-29 14:10:35 +01:00
Neil Fuller
a4bf544991
am 23f6a4ab: am 8178edfc: Merge "Fixing android.text.format.Time for non-English locales"
...
* commit '23f6a4ab5df4c7e156947f5324be8ae86f7c74fd':
Fixing android.text.format.Time for non-English locales
2014-08-29 11:40:05 +00:00
Brian Carlstrom
701663e381
am d1dc0394: am 6d3c8255: Merge "Remove obsolete pruneDexCache"
...
* commit 'd1dc039438b33d58ad9973ed6fe6f2a5f593819d':
Remove obsolete pruneDexCache
2014-08-29 11:39:45 +00:00
Brian Carlstrom
bc9eb5d1b3
am c22e56dd: am 7d86375b: Merge "Change /dalvik-cache to be owned by root."
...
* commit 'c22e56dd1209accaff898c02677ff7091fe4b973':
Change /dalvik-cache to be owned by root.
2014-08-29 11:39:21 +00:00
Kenny Guy
4f9cbd2a2b
am 21e106f8: Merge "Load ApplicationInfo for correct user." into lmp-dev
...
* commit '21e106f8c1578767a829bd8895b8d101af3b4f8d':
Load ApplicationInfo for correct user.
2014-08-29 11:10:09 +00:00
Kenny Guy
d5936307fb
Merge "Load ApplicationInfo for correct user." into lmp-dev
2014-08-29 11:01:04 +00:00
Yohei Yukawa
0f93377382
am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev
...
* commit 'bbee6bebdc6d03eb3202c3c4e63e42473be98edc':
Reject request when any unknown flag is speficied
2014-08-29 09:19:14 +00:00
Neil Fuller
23f6a4ab5d
am 8178edfc: Merge "Fixing android.text.format.Time for non-English locales"
...
* commit '8178edfc096e797917257c8cbc715f0a31fe551a':
Fixing android.text.format.Time for non-English locales
2014-08-29 09:16:50 +00:00
Neil Fuller
8178edfc09
Merge "Fixing android.text.format.Time for non-English locales"
2014-08-29 08:27:30 +00:00
Yohei Yukawa
1728879d9c
Merge "Reject request when any unknown flag is speficied" into lmp-dev
2014-08-29 08:22:58 +00:00
Neil Fuller
788cb18f65
Fixing android.text.format.Time for non-English locales
...
The test fixes for bug 17262063 showed up a real issue for
non-English locales with the Time.format() method:
If the Android string resources that contain the pattern use
non-ASCII characters then a '?' would be output instead of
those characters.
For example, in France the pattern for '%c' includes a 'à'
(a with a grave accent) and Japan includes 日.
The problem was due to converting the pattern to bytes using
the US_ASCII character set, which turns non-ASCII characters
into '?'. The code has been changed to use char throughout
and avoid bytes.
Internal documentation has been improved.
Some calls to modifyAndAppend() have been replaced with a
direct call to outputBuilder.append() because the
modify step is guaranteed to a no-op for the literals given.
The formatter has been changed to use Locale.US because it
is only used for outputting numbers. It has been renamed
to make this more obvious and the locale field has been
removed.
Bug: 17262063
Change-Id: I32b92f7f7e3e6931d3514d87f1d9a38f136d4021
2014-08-29 09:08:47 +01:00
Yohei Yukawa
72d35fa829
Reject request when any unknown flag is speficied
...
Currently EditableInputConnection#requestUpdateCursorAnchorInfo
never returns false unless InputMethodManager is somehow
unavailable.
This is problematic, especifially when we add a new flag to
EditableInputConnection#requestUpdateCursorAnchorInfo in a
future release.
With this CL, #requestUpdateCursorAnchorInfo does nothing and
immediately returns false when one ore more unknown bits are
specified.
BUG: 17324806
Change-Id: I5601714b481e8efa0ad3337c0d093cfcf55eade3
2014-08-29 00:57:19 -07:00
Jeff Sharkey
232802e0e5
am f1ddfd1e: Keep tests building.
...
* commit 'f1ddfd1ea8773c409a3541f279f1d3c87e010f9c':
Keep tests building.
2014-08-29 07:36:48 +00:00
Jeff Sharkey
73a8217803
Keep tests building.
...
Bug: 17183379
Change-Id: I7f52af3201975e8c626a6c6d7f508fd8d006b204
2014-08-29 00:10:14 -07:00
Jeff Sharkey
4b21cb68d7
am 78c14368: Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev
...
* commit '78c14368eaceaa625a7bad91b6a2718670d1309e':
FileBridge needs to keep strong reference to PFD.
2014-08-29 07:00:54 +00:00
Jeff Sharkey
c62f2e1bb7
Merge "FileBridge needs to keep strong reference to PFD." into lmp-dev
2014-08-29 06:52:55 +00:00
Jungshik Jang
c018183029
am 92be4d75: Merge "Fix system audio mode failure in boot up" into lmp-dev
...
* commit '92be4d754ef75cf4376323e05ea7dab1d93f90d9':
Fix system audio mode failure in boot up
2014-08-29 06:35:43 +00:00
Sandeep Siddhartha
3e3a7a4c08
am cffbcb8a: Merge "Address API review comments" into lmp-dev
...
* commit 'cffbcb8aa117177b24c1395e728c0afc53d64882':
Address API review comments
2014-08-29 06:29:12 +00:00
Jungshik Jang
f8a823b05a
Merge "Fix system audio mode failure in boot up" into lmp-dev
2014-08-29 06:28:14 +00:00
Sandeep Siddhartha
503a102143
Merge "Address API review comments" into lmp-dev
2014-08-29 06:22:08 +00:00
Adam Lesinski
88fff68115
am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev
...
* commit '995c771f7aef835972a5044f267a2d201449efab':
Fix memory leak in ResTable
2014-08-29 05:40:25 +00:00
Adam Lesinski
a9aa9f0458
Merge "Fix memory leak in ResTable" into lmp-dev
2014-08-29 05:27:49 +00:00
Terry Heo
8a67d3f8e3
am d3f23462: Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev
...
* commit 'd3f234629ac7d693ced141ade1941d726aa453cd':
CEC: Implement dump() of HdmiControlService
2014-08-29 05:22:21 +00:00
Terry Heo
97bf45464c
Merge "CEC: Implement dump() of HdmiControlService" into lmp-dev
2014-08-29 05:12:57 +00:00
Dongwon Kang
1f36333ee2
am 9d5dadc9: am 2e585e88: Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev
...
* commit '9d5dadc9317228156849dae14e0e75ca8d8950f9':
TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
2014-08-29 03:58:58 +00:00
Dianne Hackborn
84c043dace
am 3452f1cf: am 1fee525a: Merge "Debug issue #17310019 : pause when launching settings" into lmp-dev
...
* commit '3452f1cf2d3451fbb5f69c0e0102f808354852b2':
Debug issue #17310019 : pause when launching settings
2014-08-29 03:58:52 +00:00
Svetoslav
04e919ae6c
am 2458c71c: am 8308a3cb: Merge "Fix app widget serices not being unbound." into lmp-dev
...
* commit '2458c71c4774c8a1074f094d9e45bb2a41580219':
Fix app widget serices not being unbound.
2014-08-29 03:58:46 +00:00
Alex Light
cd91f11be5
am edcab233: am a2f18dc1: Remove obsolete pruneDexCache
...
* commit 'edcab2336315f90b225c85d2d6d725ec79679b26':
Remove obsolete pruneDexCache
2014-08-29 03:58:41 +00:00
Alex Light
65793be1bf
am 63a1740d: am 19f3d22f: Change /dalvik-cache to be owned by root.
...
* commit '63a1740d4f3b195f7de67e021f75c253a5c3ca7e':
Change /dalvik-cache to be owned by root.
2014-08-29 03:58:34 +00:00
Dongwon Kang
ada47f476f
am 8f50a388: am 6b9575be: Merge "TIF: cosmetic changes for consistency." into lmp-dev
...
* commit '8f50a3888a62303cbdc683654c686223b8266bf4':
TIF: cosmetic changes for consistency.
2014-08-29 03:58:29 +00:00
RoboErik
1b6dc49e37
am 563efe4c: am 85f23210: Fix test build
...
* commit '563efe4c598b5b0fb92c23343c90e68b3f76c01c':
Fix test build
2014-08-29 03:58:23 +00:00
Jeff Sharkey
2db944fa30
am f9dfbbf3: am f894a0d3: Merge "Teach API lint about package layering!" into lmp-dev
...
* commit 'f9dfbbf3c0e2f12a8c712704e43f3dff66beb151':
Teach API lint about package layering!
2014-08-29 03:58:15 +00:00
Jeff Sharkey
9a1507aa10
FileBridge needs to keep strong reference to PFD.
...
Even though we've grabbed the underlying FD, the PFD could be GC'ed
and when finalized it would end up closing the underlying FD. This
fix ties the PFD object lifecycle to the returned OutputStream.
Bug: 17183379
Change-Id: Ibee8f4cf78fee357181a250d15f2a653294b2877
2014-08-28 20:38:10 -07:00