147228 Commits

Author SHA1 Message Date
Jinsuk Kim
7c3a95633d Fix bugs in active source command handling in HdmiControl
- Make sure input change listener is invoked
- The command from new device at the active path should
  start routing control

Change-Id: Ic0ca52d42cc1738f9effced322b00f3bd1957f60
2014-08-01 03:43:54 +00:00
Shishir Agrawal
fdb568c026 am 035a52f3: Merge "IccOpenLogicalChannelResponse: Single character fix." into lmp-dev
* commit '035a52f36ee400cbc99270efca9e0e991ad1de97':
  IccOpenLogicalChannelResponse: Single character fix.
2014-08-01 02:13:36 +00:00
Sungsoo Lim
6837252541 am 05df1176: Merge "Revert "Service data and manufacturer data can be repeated fields."" into lmp-dev
* commit '05df1176a1364eb63768a9582e98f5c4dbb25dc3':
  Revert "Service data and manufacturer data can be repeated fields."
2014-08-01 02:13:32 +00:00
Yorke Lee
b942035837 Merge "Update documentation for ContactCounts" into lmp-dev 2014-08-01 02:00:00 +00:00
Yorke Lee
a4aa9dc614 Update documentation for ContactCounts
Change-Id: I71262dbe83ffd258954075103ceb4ef5ae70156e
2014-08-04 13:47:50 -07:00
Geoff Mendal
9d2bb94daa Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-01 02:00:00 +00:00
Geoff Mendal
3a4dca02e3 Import translations. DO NOT MERGE
Change-Id: Ic5265e48a3781f1f08d3857bcbb920191993d89c
Auto-generated-cl: translation import
2014-08-04 09:39:20 -07:00
Roozbeh Pournader
cc5889dcad Merge "Fix GSUB ccmp rule to use non-spacing marks." into lmp-dev 2014-08-01 02:00:00 +00:00
Roozbeh Pournader
ffa7985489 Fix GSUB ccmp rule to use non-spacing marks.
The fonts are updated to upstream version 2.001047.

The previous version had buggy ccmp rules that were mistakenly replacing
sequences such as A` <U+0041, U+0060> with À <U+00C0>.  The new fonts
replace those with corrected rules that use combining accents instead, such
as U+0300 COMBINING GRAVE ACCENT instead of U+0060 GRAVE.

Also, a GSUB rule that mistakenly replaced aʾ <U+0061, U+02BE> with
ẚ <U+1E9A> is removed, and U+2117 SOUND RECORDING COPYRIGHT that was missing
from the Thin and Thin Italic fonts is added to them.

Bug: 16727859
Bug: 16719701
Change-Id: Ibd0a63ea3f51992c0e56fb255e68352915cc6c3a
2014-08-01 13:25:27 -07:00
Eric Laurent
9aa499ac42 Merge "unhide AudioFormat getters" into lmp-dev 2014-08-01 02:00:00 +00:00
Mike Lockwood
e619d86723 Merge "Add accessorytest Linux host tool for testing USB accessory audio and HID support." into lmp-dev 2014-08-01 01:46:21 +00:00
Mike Lockwood
6b524d9b45 Add accessorytest Linux host tool for testing USB accessory audio and HID support.
The tool supports testing USB audio by default.
It reads audio from the ALSA device for the android phone in accessory mode
and outputs it to the ALSA device for the PC's speaker.
The default values work on my PC, but can be changed via command line options.

When the -a option is specified, accessorytest also acts as the host side of the
AccessoryChat test, so audio can be tested side by side with the accessory bulk endpoint support.

When the -h option is specified, accessorytest will look for HID devices on the PC and proxy them
to the phone over the accessory protocol. This requires running accessorytest as root.

Change-Id: I1ea06d7201cd845b95a92a42594464783a90189b
2014-08-04 15:29:18 -07:00
Chris Craik
5c09e8ad5e Merge "Remove scaling bucket hack" into lmp-dev 2014-08-01 01:46:21 +00:00
Chris Craik
a736cd9d35 Remove scaling bucket hack
bug:16626221

Fixes glyph cache pressure and double scaling artifacts.

Change-Id: I06cde720db646531b45943283cb4ecb48af8ff5b
2014-08-04 13:18:38 -07:00
Craig Mautner
7e8ff5d177 Merge "Call method while holding lock." into lmp-dev 2014-08-01 01:46:21 +00:00
Craig Mautner
cc9537ce55 Call method while holding lock.
The method removeRecentTasksForUser() was being called without the
ActivityManagerService lock held. This change calles it while the
lock is held and renames it to indicate that it should be called
while holding the lock.

Fixes bug 16775111.

Change-Id: I002f9f96d407de458934da8bc728acd54f0c398c
2014-08-04 09:46:31 -07:00
Wink Saville
bfa96fb382 Merge "Fix double DBG check." into lmp-dev 2014-08-01 01:46:21 +00:00
Wink Saville
063b8d665e Fix double DBG check.
Change-Id: I45e175df698240b80374f98043b50a014fd9779a
2014-08-01 13:14:50 -07:00
Shishir Agrawal
f96d229603 Merge "IccOpenLogicalChannelResponse: Single character fix." into lmp-dev 2014-08-01 01:46:21 +00:00
Shishir Agrawal
1521e5ad31 IccOpenLogicalChannelResponse: Single character fix.
Change-Id: I345e9a6b4cefc1d96111a7cf62dc402fd48b35c0
2014-07-31 19:08:15 -07:00
Jinsuk Kim
518e3c77c5 am d1f48b1e: Merge "System API HdmiControlService.getActiveSource" into lmp-dev
* commit 'd1f48b1e6c3e3f04f7ff359f9ba83c1a084c38ed':
  System API HdmiControlService.getActiveSource
2014-08-01 01:20:03 +00:00
Eric Laurent
0498269c00 unhide AudioFormat getters
Bug: 12378680.
Change-Id: Ibe49c6386b12159e705f49f323cae27b6e2d749a
2014-07-31 17:12:53 -07:00
Wei Wang
d34ff0ef5f am 1d5fcf03: Merge "Service data and manufacturer data can be repeated fields." into lmp-dev
* commit '1d5fcf0301e786f242a1f17e0478d4b4c599e7a6':
  Service data and manufacturer data can be repeated fields.
2014-07-31 23:50:48 +00:00
John Spurlock
99d901a837 am 8d5fabe9: Merge "New wifi + radio icons." into lmp-dev
* commit '8d5fabe98a982f2523e58af818cb743e1d7ffc26':
  New wifi + radio icons.
2014-07-31 23:31:41 +00:00
Sandeep Siddhartha
6222ecbf3c am b8ffb28e: Merge "Tighten the checks around a detector being invalidated" into lmp-dev
* commit 'b8ffb28eec7267533d8a48a517d202ff4747db2d':
  Tighten the checks around a detector being invalidated
2014-07-31 23:03:53 +00:00
Chris Craik
2c35b46ebc am 264ace0b: Merge "Add outline alpha" into lmp-dev
* commit '264ace0be65505e0dc56928cb9eff5411814646e':
  Add outline alpha
2014-07-31 22:33:55 +00:00
Jeff Sharkey
9623f88892 am 2e7a3cb7: Merge "Persist install sessions, more lifecycle." into lmp-dev
* commit '2e7a3cb74bf276c8f37d5b47b1e134d7447d1668':
  Persist install sessions, more lifecycle.
2014-07-31 22:29:53 +00:00
Amith Yamasani
3d415c3240 am ba789da8: Merge "Setup correct initial guest restrictions" into lmp-dev
* commit 'ba789da811819e316410ee66e0c095f68dfcd40f':
  Setup correct initial guest restrictions
2014-07-31 22:08:36 +00:00
George Mount
15a64cd5cd am 044a7d67: Add differentiating transitions for returning/reentering.
* commit '044a7d67a141792ff30ca8226f9788a064281503':
  Add differentiating transitions for returning/reentering.
2014-07-31 22:04:31 +00:00
George Mount
68f96d8db5 Add differentiating transitions for returning/reentering.
Bug 16550363

Change-Id: I85f9a8bcbc92ce048d06b36579bb05893534f7f8
2014-07-31 21:58:06 +00:00
Christopher Tate
6ebcebb6ab am 4bc621b8: Attempt install-time restore even for no-agent apps
* commit '4bc621b83e1b52f1c92ba8d91dd8278a2f30dddc':
  Attempt install-time restore even for no-agent apps
2014-07-31 21:45:45 +00:00
Chris Craik
8e554924c5 Merge "Add outline alpha" into lmp-dev 2014-07-31 21:44:36 +00:00
Christopher Tate
73140e4df9 Attempt install-time restore even for no-agent apps
Packages without their own backup agents can still have restorable
data to be delivered.  Correct the logic for attempting a restore
at install time so that it no longer requires an app-defined backup
agent.

Bug 16688665

Change-Id: I7dcf7ef85ad6b5b393a2c97ce62f1b2eec9d3520
2014-07-31 21:41:12 +00:00
ztenghui
6481dc59a9 am 8373ce69: Fix the create() for the attrs position
* commit '8373ce698088c0788cc2994fe43e6dcb3ac6a118':
  Fix the create() for the attrs position
2014-07-31 20:19:49 +00:00
ztenghui
874bcd82c2 Fix the create() for the attrs position
Change-Id: Ieb93053f28502cabbf655c4a27c4864845da212e
2014-07-31 20:16:18 +00:00
Vinit Deshpande
97fb1dccd7 am daec2eb8: Merge "Rename HotspotListener to BssidListener" into lmp-dev
* commit 'daec2eb80d804aa229d66cfb3cd3672df89502a5':
  Rename HotspotListener to BssidListener
2014-07-31 19:54:14 +00:00
ztenghui
bfcbb3c36b am 6fb451ae: Correct the tag\'s name in the exceptions
* commit '6fb451ae17ead6dd26dcf2662e0ab73c4184c3ce':
  Correct the tag's name in the exceptions
2014-07-31 19:46:06 +00:00
Torne (Richard Coles)
c4bbf3848c Merge "Fix WebViewUpdateService timeout code." into lmp-dev 2014-07-31 19:45:19 +00:00
Torne (Richard Coles)
6a0d43f09d Fix WebViewUpdateService timeout code.
The loop was initialising the boolean incorrectly causing the first
iteration to wait even when the condition was already true and have to
hit the timeout before loading continues.

Change-Id: I6a347cff2e4560b38c8aec3297e456b6f784a97e
2014-08-01 18:40:20 +01:00
Ben Murdoch
798e7f5cce Merge changes I2f40be36,I4af9fd7e,Ib0b4245f,I55acad96,Id276b71e, ... into lmp-dev
* changes:
  Cherry pick Cleanup debug messages in WebViewFactory and WebViewUpdateService DO NOT MERGE
  Cherry pick Move startIsolatedProcess implementation in ActivityManagerService DO NOT MERGE
  CHerry pick Find WebView package name from a config resource. DO NOT MERGE
  Cherry pick Remove dependency on WebView native library path. DO NOT MERGE
  Cherry pick Make WebViewUpdateService a SystemService. DO NOT MERGE
  Cherry pick Refactor ActivityManagerService and make WebViewFactory more pedantic. DO NOT MERGE
  Cherry pick Refactor native library path logic in WebViewFactory DO NOT MERGE
  Cherry pick Append WebView assets to AssetManager when loading the WebView. DO NOT MERGE
  Cherry pick Introduce startIsolatedProcess private API in ActivityManager DO NOT MERGE
  Cherry pick Load the WebView Java code from an APK. DO NOT MERGE
2014-07-31 19:45:19 +00:00
Primiano Tucci
e76e81a227 Cherry pick Cleanup debug messages in WebViewFactory and WebViewUpdateService DO NOT MERGE
This is just a cleanup CL which fixes:
- Some erroneous debug messages about the relro creator process.
- The condition checked in WebViewUpdateService, to prevent the
  WebView to be used from the SystemServer (it now looks at the
  process id, previously it was erroneously looking at the uid).
- Adds a 5s. timeout to the waitForRelroCreationCompleted.

Original BUG:16403706

Original Change-Id: I43a953949050d7df5fe334cfa7257315ee6db071

Bug: 16723226
Change-Id: I2f40be3622b8e6c68b2b52cae7f4d3a95e148cbf
2014-08-01 14:25:26 +01:00
Primiano Tucci
994e219da8 Cherry pick Move startIsolatedProcess implementation in ActivityManagerService DO NOT MERGE
This CL addresses the comments in CL 512432, moving the implementation
of startIsolatedProcess in the outer ActivityManagerService class and
making the entry point in the ActivityManagerInternal sublcass just
a proxy method.
This change also addresses a potential NPE, due to startProcessLocked
returning null in some failure cases.

Original BUG:16403706
Original Change-Id: I21eff88c23221653f552cfc171647a839e42a802

Bug: 16723226
Change-Id: I4af9fd7eea10b11e06a5c37d8160c220376b3ed1
2014-08-01 14:25:18 +01:00
Torne (Richard Coles)
5651fc2fee CHerry pick Find WebView package name from a config resource. DO NOT MERGE
Use a config resource to determine the package name for the WebView
implementation to allow it to be changed by a resource overlay.

Original Bug: 16329371
Original Change-Id: I5977691c0223347e0382d584c3d3ee4428660180

Bug: 16723226
Change-Id: Ib0b4245f26cbf93f364aa0f30b231786931f9f16
2014-08-01 14:25:08 +01:00
Ben Murdoch
5ced502fba Cherry pick Remove dependency on WebView native library path. DO NOT MERGE
This CL removes the final use of the hardcoded WebView
library path from WebViewFactory. We now use a system
property to set the amount of address space to reserve
in the zygote rather than stat'ing the file.

See also I07ad5a774623c1899eb50474d999a2b1447783f0

Original Change-Id: Id3c1e3cc2e2a06c1021ad0260a37abcd07d78fd6

Bug: 16723226
Change-Id: I55acad96b6d9ee69f14b84d772abf7740ea96b94
2014-08-01 14:24:58 +01:00
Torne (Richard Coles)
4dbeb359b2 Cherry pick Make WebViewUpdateService a SystemService. DO NOT MERGE
Migrate WebViewUpdateService to the newer SystemService approach instead
of ServiceManager.addService.

Original Bug: 16403706
Original Change-Id: I21aa67a41c22c3c20ba9e82eb87e5d610fe130e8

Bug: 16723226
Change-Id: Id276b71ee547e683f0756bcee0f4978ce342c2af
2014-08-01 14:24:47 +01:00
Primiano Tucci
161536b597 Cherry pick Refactor ActivityManagerService and make WebViewFactory more pedantic. DO NOT MERGE
This CL adds more robustness to the logic in WebViewFactory, checking
whether the isolated process did start at all and catching exceptions
in its java side.
Also, this addresses the refactor comments received in CL 509840.

Original BUG:16403706
Original Change-Id: Iaaea6d36142ece6d974c2438259edf421fce9f2e

Bug: 16723226
Change-Id: Id308f2ffde9b67a3eb4719c7b81b4f46421f0c2e
2014-08-01 14:24:38 +01:00
Primiano Tucci
1b7977b608 Cherry pick Refactor native library path logic in WebViewFactory DO NOT MERGE
This CL changes the relro creation and loading logic.
Instead of using a hardcoded path, now WebViewFactory queries the
package manager to get the lib path, which will be either
/system/priv-app/webview/lib/ or /data/app/... depending on the
presence of an update apk.

Original BUG:16403706
Original Change-Id: Icceb95da98e69032a19ac2ae8fe72ba1439e50ad

Bug: 16723226
Change-Id: Ia3155f72a735d75a566a8cc4c8c892d43b6cd371
2014-08-01 14:24:28 +01:00
Marcin Kosiba
63d3d8a458 Cherry pick Append WebView assets to AssetManager when loading the WebView. DO NOT MERGE
This makes the code loading the WebView Java code from the .apk
also load the WebView assets into the current AssetManager.

Original BUG: 11505352
Original Change-Id: Ib6203f79b98805012ffa20b233037b7da221624c

Bug: 16723226
Change-Id: Ie7b0b22df9727c72debfb9ccfcd84c95bf41e039
2014-08-01 14:24:18 +01:00
Primiano Tucci
810c052d9b Cherry pick Introduce startIsolatedProcess private API in ActivityManager DO NOT MERGE
The new API spawns a isolated process, using a custom uid, entrypoint and
abi. Such API is used by the WebViewFactory to spawn its unpriviledged
but trusted process (hence the fixed uid) which rewrites the rerlo file
on boot / when an update occurs.
Since both the ActivityManager service and the WebViewUpdate service
live in the SystemServer their calls be dispatched locally and no
binder interface needs to be exposed for the new startIsolatedProcess API.

Original BUG:16403706
Original Change-Id: I327b59735c12698595e0dbcc4da5d759c9103b0a

Bug: 16723226
Change-Id: Iecb49888e11eec9d302d9712953fd498db5821af
2014-08-01 14:24:09 +01:00
Torne (Richard Coles)
6c778cebc7 Cherry pick Load the WebView Java code from an APK. DO NOT MERGE
Use the WebView APK to load the Java code via createPackageContext.

Original Bug: 16329371
Original Change-Id: I1292edab639d85c2027dc8ebb52def8c36d41cde

Bug: 16723226
Change-Id: I8e692a5e12706f91a8af0a8b385bac336ce60913
2014-08-01 14:23:55 +01:00