94923 Commits

Author SHA1 Message Date
Elliott Hughes
0c25ecfd43 Merge "Use getRelativeDayString in getRelativeTimeSpanString." 2013-03-08 18:39:47 +00:00
Elliott Hughes
5acc6e5214 Use getRelativeDayString in getRelativeTimeSpanString.
The bug we're fixing here is that languages that don't
distinguish the "one" case grammatically (such as Japanese)
would say the equivalent of "In 1 day" rather than "Tomorrow"
because of the misuse of getQuantityString.

This has the side-effect of switching us over to the CLDR
strings for relative day names, which have consistent capitalization;
the Android donottranslate-cldr.xml strings varied even within
a language, so although this is a change, it seems like a step
in the right direction.

In a future change, we should actually push all relative
day formatting down into icu4c.

Bug: 7098707
Change-Id: Ia2f9af3d18c441d6093dd5da7956a3d0130e5b06
2013-03-07 16:46:55 -08:00
Elliott Hughes
d0d1be2d27 Merge "Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest." 2013-03-07 23:24:40 +00:00
Elliott Hughes
025148cc4d Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.
Change-Id: Icbdb4e9133a9ae1c1b37f822367e1ac86e9e36cb
2013-03-07 14:30:17 -08:00
Irfan Sheriff
011b8efce1 Merge "frameworks/base: stop find before issuing wps pbc." 2013-03-06 15:58:42 +00:00
Deepthi Gowri
575bb45e9d frameworks/base: stop find before issuing wps pbc.
Stop p2p find before issuing a PBC to avoid GO switching to other
channel leading connection failure.

Change-Id: I88906f944de1c85b143f96cb7b35724af19cd151
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2013-03-06 08:24:03 +05:30
Victoria Lease
7d4e52baee Merge "FIX Null Pointer Exception on dialog cancel" 2013-03-05 23:25:16 +00:00
Victoria Lease
f45efd276c Merge "Audio continue to played even if paused manually" 2013-03-05 23:20:45 +00:00
Elliott Hughes
690d3435a4 Merge "jni: remove obsolete flag from makefile" 2013-03-05 22:30:58 +00:00
Bruce Beare
d625127db9 jni: remove obsolete flag from makefile
Change-Id: Ia7e67694a736745333e9d36396b8cb6194fd26ec
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2013-03-05 14:29:46 -08:00
Roger Chen
002ecd2122 Audio continue to played even if paused manually
Currently, audio will resume playing after a phone call
or notification even if the user had manually paused playback.

This patch addresses that by introducing a new player state
to distinguish the user pausing playback and the browser
losing audio focus for some other reason. Audio will only
 resume if the browser temporarily lost audio focus and
not when the user has manually paused playback.

Change-Id: I9e8beaedb0fcc5afe920068297ed9c387eab2ac8
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-03-05 13:05:34 +00:00
Marco Nelissen
b6a2978a51 Merge "Performance increase in thumbnail handling" 2013-03-05 00:06:33 +00:00
Brian Carlstrom
b0cbf8607f Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 2013-03-04 17:50:14 +00:00
Brian Carlstrom
6bae82a2ae Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
Change-Id: Ieba5705f4faa7cea619cf509db3ef081fda570d5
2013-03-01 09:13:26 -08:00
Nick Kralevich
f5276c16ad Merge "installd: use correct header file." 2013-03-01 16:40:14 +00:00
Nick Kralevich
937cfa77c4 Merge "ZygoteInit: use correct header files." 2013-03-01 16:39:37 +00:00
Nick Kralevich
b3c4a0bb5c ZygoteInit: use correct header files.
Don't define capget / capset when we already have definitions
of it in our header files.

Change-Id: Ia2d7e408879bd09019f99aef52acb63a7a243d48
2013-02-28 16:56:16 -08:00
Nick Kralevich
848b4c9a97 installd: use correct header file.
Change-Id: I035524b857a04f8400e96468310d88abf247e582
2013-02-28 16:43:23 -08:00
Dianne Hackborn
7b69e40176 Merge "Fix starting window memory leak" 2013-02-27 19:57:08 +00:00
Ian Rogers
de3c20bcb5 Merge "Track stack memory in MemoryInfo." 2013-02-27 19:47:15 +00:00
Ian Rogers
7c9f30bfb3 Track stack memory in MemoryInfo.
In /proc/pid/maps the main stack is identified as "[stack]". In Linux 3.4
thread stacks are identified as "[stack:<tid>]" where <tid> is the thread ID of
the thread using that stack. Add support in MemInfo's otherStats to track
memory being used by the stack.

Add sanity check on the length of the otherStats array.
Add detail messages to two null pointer exceptions.

Bug: 8265251

Change-Id: I2b228b147da9bdc5c7a4d825dfc628fcc7923927
2013-02-27 11:34:42 -08:00
Ian Rogers
545464df28 Merge "Deprecate and document memory allocation counting." 2013-02-27 16:45:39 +00:00
Romain Guy
09353f7478 Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." 2013-02-27 06:07:31 +00:00
Ian Rogers
fe067a4cc5 Deprecate and document memory allocation counting.
Bug: 8241521
Change-Id: I174c4024600c5b78e74030ecc99e784a98295f09
2013-02-26 13:30:08 -08:00
Elliott Hughes
3f5778c858 Merge "Fix incorrect FloatMath documentation." 2013-02-26 17:37:58 +00:00
Kenny Root
755205ade4 Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"" 2013-02-26 17:35:13 +00:00
Elliott Hughes
f732a2f83f Fix incorrect FloatMath documentation.
Change-Id: I30bbe500e634b73f3456ccc797106ad261fd0ce7
2013-02-26 09:28:17 -08:00
Martin Olsson
64d0b3f918 Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
Change-Id: I8f869c9d2243ae8ff414399b7d6835c7ca74d500
Signed-off-by: Martin Olsson <martin@minimum.se>
2013-02-26 17:54:39 +01:00
Elliott Hughes
8d4d4cf283 Merge "Remove obsolete traceview file format documentation." 2013-02-25 22:50:51 +00:00
Ian Rogers
e88c0d9ec3 Merge "Recognize odex files in memory accounting." 2013-02-25 17:13:24 +00:00
Amit Kumar
fe6c30e44e FIX Null Pointer Exception on dialog cancel
Null Pointer Exception occurs because mWebViewCore instance
is made to null while calling destroyJava(). When 
1.webview hosting activity goest to background, without calling webview onPause().
2. If app is launched again (having launchmode:singletask ) and another activity (not  webview hosting) comes on top top.
3. It destorys the previous activity holding webview which internally tries to cancel the dialog, but webviewcore instance is null. 
Null pointer exception is raised.

Change-Id: Idbcd30d0b0d4a35819444bbaa5c73cced8bb35a3
Signed-off-by: Amit Kumar <amitkecian@gmail.com>
2013-02-24 09:20:26 +00:00
Elliott Hughes
dbc3c407ae Remove obsolete traceview file format documentation.
Bug: http://code.google.com/p/android/issues/detail?id=51286
Change-Id: I9f2093c81b194526e79ea098ae073b60c63e9442
2013-02-22 21:21:03 -08:00
Ian Rogers
9f8589c31f Recognize odex files in memory accounting.
Give odex files the same heap category as dex files.

Change-Id: I82539e20ac20a2b80c63c0cfceb266d9c59e22b7
2013-02-22 20:35:56 -08:00
Adam Powell
d61ff77ee1 Merge "Fix ListView is not scrolled properly with arrows" 2013-02-22 21:29:44 +00:00
Ian Rogers
08a92a335f Merge "Account malloc mmaped pages as native heap." 2013-02-22 18:02:40 +00:00
Ian Rogers
afc10e174d Account malloc mmaped pages as native heap.
Currently when malloc uses a page rather than brk the heap gets accounted as
ashmem memory. Previously the memory would be accounted as unknown but since
[1] it gets accounted as ashmem. This change makes the accounting see this
memory as being native, ie the same kind of memory we associate with brk.

[1] https://android-review.googlesource.com/#/c/49583/3

Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
2013-02-22 09:40:58 -08:00
Kenny Root
49999acb04 Merge "StreamingZipInflater: fix mmap'd end of read" 2013-02-22 00:05:36 +00:00
Wink Saville
b5a1ce2f5d Merge "Allow three digit phone numbers" 2013-02-20 23:04:32 +00:00
Victoria Lease
c36303a66d Merge "Applying ChannelScrolling to remove calculateDragAngle" 2013-02-19 17:40:09 +00:00
kiwon
72034953bf Applying ChannelScrolling to remove calculateDragAngle
To avoid angle calculation changed the logic to use virtual areas.
When try to drag or pan, check where the current touch point locates
and determine how to drag a page.

Change-Id: Id9bd08a69c4ac93ff385c8088e6c16bed5dc5f88
Signed-off-by: kiwon <kiwon98.lee@samsung.com>
2013-02-18 14:30:58 +09:00
Irfan Sheriff
c6ea41efc9 Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
* changes:
  Fix broken test.
  Track keys per config and allow cert push from apps
  eix enterprise config storage bugs
  Fix connectivitymanagertest
  Fix build
  Refactor enterprise config
2013-02-15 23:42:28 +00:00
Wink Saville
1c2acdc6e8 Fix broken test.
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
2013-02-15 15:20:37 -08:00
Irfan Sheriff
b815edf3ab Track keys per config and allow cert push from apps
Allow configuring keys for a configuration and update/delete
from wificonfigstore.

Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
2013-02-15 15:19:35 -08:00
Irfan Sheriff
b07526fb1c eix enterprise config storage bugs
Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.

Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.

Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
2013-02-15 14:58:15 -08:00
Irfan Sheriff
46e0931080 Fix connectivitymanagertest
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
2013-02-15 14:55:15 -08:00
Irfan Sheriff
2f6778c038 Fix build
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
2013-02-15 14:52:33 -08:00
Irfan Sheriff
c72c5625c6 Refactor enterprise config
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
2013-02-15 14:51:19 -08:00
Kenny Root
c6e35cb47a StreamingZipInflater: fix mmap'd end of read
When reaching the end of a mmap'd segment, it was erroneously trying to
read more data. This is because we were reading data one character at a
time, so we never reached the Z_STREAM_END result without going through
the loop once more.

Bug: https://code.google.com/p/android/issues/detail?id=39041
Change-Id: I6c53b8187384a42217c32112d6a0c2857f471109
2013-02-15 11:05:48 -08:00
Bin Zhu
a37fc575a4 Allow three digit phone numbers
The comment for the PHONE pattern says:

"<digit><digit|sdd>+<digit>"

But the actual pattern requires that the string contains
more than that. A phone number should be allowed to be
three digits.

Change-Id: I86d2f3d634cd0c1654dad9814906f151055dc23a
2013-02-15 11:54:41 +01:00
Kenny Root
9657ba0edc Merge "KeyStore: stop using state()" 2013-02-14 20:18:09 +00:00