Fergus Henderson
6c641d3c67
am 3cf3a0b3: Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev
...
* commit '3cf3a0b30cd3d3be806eeb04861731d7ed6e6f23':
Fix for TTS.setLanguage throwing MissingResourceException
2013-05-08 10:47:56 -07:00
Fergus Henderson
3cf3a0b30c
Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev
2013-05-08 17:42:00 +00:00
Przemyslaw Szczepaniak
d0b927948e
Fix for TTS.setLanguage throwing MissingResourceException
...
Change I766f106b9165932de17de84bdd422d0fc0ae27f1 made getISO3*
methods throw MissingResourceException if locale was invalid.
This causes regression on last android release, where invalid
locale was silently ignored.
+ fix for .isLanguageAvailable
Bug: 8709594
Change-Id: Ieada6b90dc53cfdf0a4e2b4ca69854b811d0fec2
2013-05-08 15:56:12 +01:00
Jamie Gennis
211eae98fc
am d28653df: Merge "Add the trace tag for Dalvik." into jb-mr2-dev
...
* commit 'd28653df6580b76559374580764aa2e86d6c2f48':
Add the trace tag for Dalvik.
2013-05-07 18:23:20 -07:00
Jamie Gennis
d28653df65
Merge "Add the trace tag for Dalvik." into jb-mr2-dev
2013-05-08 01:21:33 +00:00
Alan Viverette
fa4c935edc
am 239a0c0e: Ensure ViewRootImpl.setAccessibilityFocus() doesn\'t crash when reentrant.
...
* commit '239a0c0e6a6fc36025fdb1c662e1c7acaec144bb':
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
2013-05-07 17:43:18 -07:00
Alan Viverette
239a0c0e6a
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
...
Internal state must be cleared before calling any methods on the focus
host, since the method may be called again from the host and attempt to
recycle the same AccessibilityNodeInfo twice.
BUG: 8856860
Change-Id: I0410989fd6f3ce3ce29de8edebdfbf3847188843
2013-05-07 17:17:35 -07:00
Jamie Gennis
0cc84cefdd
Add the trace tag for Dalvik.
...
Bug: 8856374
Change-Id: Id0fbdb8f7a487c5831edcd2c6c64a7da63aec03d
2013-05-07 15:23:06 -07:00
Robert Greenwalt
27c8b559b6
am e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev
...
* commit 'e2322bdd7865552aa31f93bbf4e60d4d9a7d0973':
Don't back up the scan-always setting.
2013-05-07 13:48:49 -07:00
Robert Greenwalt
e2322bdd78
Merge "Don't back up the scan-always setting." into jb-mr2-dev
2013-05-07 20:45:03 +00:00
Robert Greenwalt
ffff923c74
Don't back up the scan-always setting.
...
We ask the user during device setup to configure this setting -
if we then restore from backup we clobber what they just selected.
Instead, just let them chose during setup and don't back it up.
bug:8825150
Change-Id: I3f2b2291c86a4008bb8ea2468164d9c6c673cbb0
2013-05-07 12:33:15 -07:00
Zhentao Sun
e0dda90bde
am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
...
* commit 'aa64548d9f7ee0d3378bc62657e0b86d486038d6':
Fixed unreleased wake lock isues and NPE.
2013-05-07 11:44:46 -07:00
Zhentao Sun
aa64548d9f
Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
2013-05-07 18:43:24 +00:00
Romain Guy
c4818d860b
am 4c95c537: Merge "Optimize list view scrolls Bug #8108706 " into jb-mr2-dev
...
* commit '4c95c5377a75a3d6c5f3ed8b09a56071d51fadb1':
Optimize list view scrolls Bug #8108706
2013-05-06 19:09:25 -07:00
Romain Guy
4c95c5377a
Merge "Optimize list view scrolls Bug #8108706 " into jb-mr2-dev
2013-05-07 02:05:38 +00:00
Romain Guy
5549cb590d
Optimize list view scrolls
...
Bug #8108706
Change-Id: I8679b584132e82b7bb3301a38800de4ddfc57be6
2013-05-06 18:42:08 -07:00
Scott Main
0ba3d91f2d
am 05759d15: Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126" into jb-mr2-dev
...
* commit '05759d1531f4e36b51f386fa884454eeda88ecb8':
add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126
2013-05-06 17:06:40 -07:00
Scott Main
05759d1531
Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126" into jb-mr2-dev
2013-05-06 23:56:41 +00:00
Dianne Hackborn
a98b0ff812
am d43a71da: Merge "Help for the debugging help for issue #8734824." into jb-mr2-dev
...
* commit 'd43a71dad80dfca65b0758f4333360516f6ad300':
Help for the debugging help for issue #8734824 .
2013-05-06 16:48:16 -07:00
Dianne Hackborn
8bd64df2ad
Help for the debugging help for issue #8734824 .
...
Add a new "hang" am command that lets you hang the system
process. Useful for testing.
Change-Id: Ice0fc52b49d80e5189f016108b03f9fd549b58a7
2013-05-06 16:07:26 -07:00
Elliott Hughes
4cd60897c7
am 601afaef: Merge "Someone\'s IDE chose the wrong Date."
...
* commit '601afaef5220aef928a9235e50376c462538a942':
Someone's IDE chose the wrong Date.
2013-05-06 14:04:34 -07:00
Dianne Hackborn
485d7a31a8
am 5b88a2fd: Debugging help for issue #8734824 : WATCHDOG KILLING SYSTEM PROCESS
...
* commit '5b88a2fd7b77880f6e09ae4a1de509bebe28bc3a':
Debugging help for issue #8734824 : WATCHDOG KILLING SYSTEM PROCESS
2013-05-06 13:47:04 -07:00
Zhentao Sun
cfa496f7cd
Fixed unreleased wake lock isues and NPE.
...
Fixed b/8834502. Wake lock might not be released when the callback is null.
NPE is thrown when the callback is null in some cases too.
Change-Id: I27d3af810669e446cfb57aba8715c80cba3e15e7
2013-05-06 11:22:44 -07:00
Dianne Hackborn
5b88a2fd7b
Debugging help for issue #8734824 : WATCHDOG KILLING SYSTEM PROCESS
...
IActivityController has a new callback which the Watchdog calls
when it detects that the system process is hung. This may be
use full monkey. All hail the monkey!
Also add a new private feature to Binder to be able to turn off
all incoming dump() calls to a process. The watchdog uses this
when it reports it is hung, so that if someone, say, wants to
collect a bug report at this point they won't get stuck waiting
for things that are all busted.
Change-Id: Ib514d97451cf3b93f29e194c1954e29f948c13b1
2013-05-06 11:16:18 -07:00
Robert Greenwalt
8c04cd041d
am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev
...
* commit '341666c40d222145f7dfd44bdbed48590c4dc5da':
Fix sync problem in NsdManager
2013-05-06 11:12:02 -07:00
Dave Burke
38996cdcf1
am 236cc476: Temporarily revert field name change (DO NOT MERGE)
...
* commit '236cc476e6792a11502ba4f40c7ab4586f40d282':
Temporarily revert field name change (DO NOT MERGE)
2013-05-06 11:11:51 -07:00
Fabrice Di Meglio
a8549041cc
am 8c2e3a41: Merge "Optimize RTL properties resolution" into jb-mr2-dev
...
* commit '8c2e3a412aaee8359a48265a101ca27e7b67301c':
Optimize RTL properties resolution
2013-05-06 11:11:03 -07:00
Svetoslav
b0675df8fd
am faa47b52: Merge "Idle maintenance scheduling broken." into jb-mr2-dev
...
* commit 'faa47b526fc35be01b1bc46a78679adde87f6701':
Idle maintenance scheduling broken.
2013-05-06 11:10:57 -07:00
Elliott Hughes
c00df6d52e
Someone's IDE chose the wrong Date.
...
Part 1 of the mystery of the java.sql.Date in preloaded-classes solved.
Change-Id: I33fffec1f86e34167a76afc839d9f4ce31fa31f7
2013-05-06 10:53:28 -07:00
Robert Greenwalt
341666c40d
Merge "Fix sync problem in NsdManager" into jb-mr2-dev
2013-05-06 16:37:44 +00:00
Adam Powell
f581b533cf
am 2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
...
* commit '2b662e8ef96c645e38a3debc29afa7454664f6cb':
Fix a NPE in MenuItemImpl when setting null ActionProvider
2013-05-06 08:44:33 -07:00
Dave Burke
236cc476e6
Temporarily revert field name change (DO NOT MERGE)
...
VisualOn is using hidden fields, causing HBO and Xfinity to crash.
Bug: 8549617
Bug: 8331866
Change-Id: I35a9fe66dea8d56f4fcff9b492679226a17f4acc
2013-05-06 00:21:30 -07:00
Fabrice Di Meglio
8c2e3a412a
Merge "Optimize RTL properties resolution" into jb-mr2-dev
2013-05-04 00:48:12 +00:00
Fabrice Di Meglio
09ecb255a6
Optimize RTL properties resolution
...
- dont bother children about resolving RTL properties if the ViewGroup parent
has not done anything
Change-Id: Iedf8a337097e04e1ab0054d59fc347e06b347ea7
2013-05-03 17:33:31 -07:00
Svetoslav
faa47b526f
Merge "Idle maintenance scheduling broken." into jb-mr2-dev
2013-05-03 23:33:09 +00:00
Svetoslav
6a08a12b8e
Idle maintenance scheduling broken.
...
1. The scheduling was relying on receiving battery level broadcasts
which however are not sent if the device is asleep. The maintenance
window was not bound and we could miss a frame if the user did
not interact the device longer than the min time between two
maintenance windows.
2. Hide the idle maintenance intents since this will be rewritten
to user services.
bug:8688454
Change-Id: I17b421b09823cb46ec218cabda19e02432d94f8c
2013-05-03 14:03:06 -07:00
Adam Powell
2b662e8ef9
Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
2013-05-03 18:58:35 +00:00
Satoshi Kataoka
ee0a5fafa7
am 245a3e1c: Merge "Change the initial disabled state of disabled IMEs" into jb-mr2-dev
...
* commit '245a3e1c1ed265a13d07000ef6e786ec321b85c4':
Change the initial disabled state of disabled IMEs
2013-05-03 11:19:01 -07:00
Jeff Brown
f87d4ea77a
am 17cf4e4d: Merge "Really make Surface thread-safe." into jb-mr2-dev
...
* commit '17cf4e4d4a576009efbfce93bd64b687601b71c7':
Really make Surface thread-safe.
2013-05-03 11:18:58 -07:00
Adam Powell
dcc55855bc
Fix a NPE in MenuItemImpl when setting null ActionProvider
...
Change-Id: I00be010b2197d0f41d0e45b3814474d3ad0c3295
2013-05-03 11:03:10 -07:00
Satoshi Kataoka
245a3e1c1e
Merge "Change the initial disabled state of disabled IMEs" into jb-mr2-dev
2013-05-03 02:34:39 +00:00
Jeff Brown
17cf4e4d4a
Merge "Really make Surface thread-safe." into jb-mr2-dev
2013-05-03 02:11:03 +00:00
Robert Greenwalt
af2eefb701
Fix sync problem in NsdManager
...
The NsdManager init was thinking it was done before the AsyncChannel
was fully setup and if the setup were slow and the app fast, the app
could make calls to the NsdManager that it wasn't ready for.
bug:8545006
Change-Id: I2cb2a7c0a1c7f3d2b81ac0f66d37346e6d2d720d
2013-05-02 15:45:32 -07:00
Satoshi Kataoka
ed1cdb24ba
Change the initial disabled state of disabled IMEs
...
Bug: 8365223
This change is a supplement for I77f01c70610d82ce9070d4a
The disabled state of disabled pre-installed imes should be changed
to ENABLED_STATE_DISABLED_UNTIL_USED on boot or user switch.
Change-Id: If8ff1b2b95c36d33148def2ab87bd006aa520cc0
2013-05-02 17:53:17 +09:00
Amith Yamasani
f5a553a427
am 55a08c5a: Merge "Allow requiredForAllUsers to work on updates to system apps" into jb-mr2-dev
...
* commit '55a08c5ab91014eb42ecdc9e7039c7bae1f00058':
Allow requiredForAllUsers to work on updates to system apps
2013-05-01 21:27:14 -07:00
Amith Yamasani
55a08c5ab9
Merge "Allow requiredForAllUsers to work on updates to system apps" into jb-mr2-dev
2013-05-02 04:26:01 +00:00
Jeff Brown
f2930d783a
am c3112608: Merge "Don\'t dump sql bindargs unless verbose mode is requested." into jb-mr2-dev
...
* commit 'c31126088fea61a9b5ba6cdb1fd2791e86800a8a':
Don't dump sql bindargs unless verbose mode is requested.
2013-05-01 17:54:34 -07:00
Jeff Brown
c31126088f
Merge "Don't dump sql bindargs unless verbose mode is requested." into jb-mr2-dev
2013-05-02 00:52:26 +00:00
Amith Yamasani
0d8750d771
Allow requiredForAllUsers to work on updates to system apps
...
Bug: 8736380
Also set the default type as the constructor docs imply in RestrictionEntry.
Change-Id: I446504fad8822804d68f09b45ef62f6d79c4b8df
2013-05-01 15:31:49 -07:00
Jeff Brown
cefeb29d53
Don't dump sql bindargs unless verbose mode is requested.
...
Bug: 8780126
Change-Id: I88e238f9d684cc76731207e75370cbb2e0e476c5
2013-05-01 15:28:37 -07:00