147261 Commits

Author SHA1 Message Date
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
Chris Wren
d2fafdda57 Merge "Optimize large preview from the screenshot notification." into lmp-dev 2014-07-31 19:45:19 +00:00
Chris Wren
f63185e7bd Optimize large preview from the screenshot notification.
Crop out a notification_panel_width by notification_max_height
section of the screenshot for the preview.

This will only save about 25% of the bytes on a phone-like device over
the existing square crop, but on a tablet-like device the savings will be
more significant: above 75%.

Bug: 16631778
Change-Id: I05d4d402e44f7700f17b8b97018f6c00c3b0196d
2014-08-01 09:56:51 +00:00
Fergus Henderson
732af43eb1 Merge "Simplify generics, and make Builder concrete." into lmp-dev 2014-07-31 19:45:19 +00:00
Niels Egberts
2a236a6466 Simplify generics, and make Builder concrete.
Change-Id: I3e14966527c254d2c15dddefc2ef60cdde30421f
2014-08-01 11:46:16 +01:00
John Spurlock
c9b5cd3cae Merge "New wifi + radio icons." into lmp-dev 2014-07-31 19:45:19 +00:00
John Spurlock
b3eb89190c New wifi + radio icons.
- Replace old pngs with new vectors.
 - New problem indication, remove provisional color filters.
 - Remove spacing hacks in SignalClusterView.
 - Wire up QS tile icons to demo mode.

Bug:15988601
Change-Id: Ib785288eebfb09896a499d562eb56debbd89a456
2014-07-31 17:13:10 -04:00
ztenghui
1c4d8b2173 Correct the tag's name in the exceptions
Change-Id: I9d1499fbcf8adb6bf0c5c0b7a10a8b480a708c09
2014-07-31 19:42:31 +00:00
Chris Craik
77b5cad3ef Add outline alpha
bug:16140822
bug:16566746

This allows background drawables to alter the opacity of a shadow
being cast with their own alpha values.

Change-Id: I49698cc7c1bf4b2b55ffe2f82899543ca62bc61c
2014-07-31 12:29:57 -07:00
Joe Fernandez
ecea0c7186 am 5973c2c5: am 441e7aa2: am eb4bc851: am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '5973c2c56e378ee4a0e7177ff797f72c4680de3c':
  docs: Adding TIF one-pager to TV docs in L-Preview
2014-07-31 18:50:44 +00:00
Joe Fernandez
8d7c55bd10 am 441e7aa2: am eb4bc851: am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '441e7aa23478b8de386efc69d43f889979bc6eee':
  docs: Adding TIF one-pager to TV docs in L-Preview
2014-07-31 18:43:21 +00:00
Joe Fernandez
441e7aa234 am eb4bc851: am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit 'eb4bc851aade1090c0a4e1f1e6f7ecd136b4a47a':
  docs: Adding TIF one-pager to TV docs in L-Preview
2014-07-31 18:40:05 +00:00
Joe Fernandez
eb4bc851aa am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs
* commit '69ed58aced0e884d7758d84067134b04fbcee9c0':
  docs: Adding TIF one-pager to TV docs in L-Preview
2014-07-31 18:35:02 +00:00
Wonsik Kim
d34d449250 am cb92d507: Fix NPE when fused geofence hardware is not available.
* commit 'cb92d507167fcce059c4ae91dc46b496f49b4fa3':
  Fix NPE when fused geofence hardware is not available.
2014-07-31 18:27:44 +00:00
Wonsik Kim
c2b74b73a1 Fix NPE when fused geofence hardware is not available.
b/16690237

Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4
2014-07-31 18:24:23 +00:00
Eunae Kim
76880870ba am 218a0666: Fix a bug that the RecentTask list of other’s may show up to non-primary users.
* commit '218a0666a5235bc76f2950684bbfcb500e89972c':
  Fix a bug that the RecentTask list of other’s may show up to non-primary users.
2014-07-31 17:33:41 +00:00
Eunae Kim
ad3aa32fee Fix a bug that the RecentTask list of other’s may show up to non-primary users.
Cherry-pick from aosp to lmp-dev.

When switching to a newly created user, the user may face this bug
when he opens the RecentTask screen.

A possible bug scenario is described as follows:
A user id of a removed user may be recycled when created a new user.
However, mRecentTasks is not correctly controlled so that old
information may still remain and be possibly mapped to wrong user.
This patch prevents this bug by explicitly removing old information
in mRecentTasks when removing existing user.

Change-Id: I1874dbd604598a5d740ae1e034981e21214c15c6
Signed-off-by: Eunae Kim <eunae.kim@lge.com>

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java
2014-07-31 10:27:28 -07:00
riddle_hsu
635e039a62 am d66d006f: [ActivityManager] Prevent coredump file may not complete for testing.
* commit 'd66d006f9f64a0c9e70827b27e21210192f9b552':
  [ActivityManager] Prevent coredump file may not complete for testing.
2014-07-31 17:26:08 +00:00