80407 Commits

Author SHA1 Message Date
Xavier Ducrohet
5de9603529 am 31820a35: Merge "Add --output-text-symbols option to aapt."
* commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
  Add --output-text-symbols option to aapt.
2012-09-17 12:03:19 -07:00
Xavier Ducrohet
cc9747ed45 am d7252571: Merge "Add --error-on-failed-insert option to aapt."
* commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b':
  Add --error-on-failed-insert option to aapt.
2012-09-17 12:03:12 -07:00
Xavier Ducrohet
31820a35b2 Merge "Add --output-text-symbols option to aapt." 2012-09-17 10:59:22 -07:00
Xavier Ducrohet
d72525718e Merge "Add --error-on-failed-insert option to aapt." 2012-09-17 10:57:58 -07:00
Elliott Hughes
f5437ee86a am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit '297ad257464d2ea65cabd45ddb19f6da34b39157':
  Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:34:41 -07:00
Elliott Hughes
297ad25746 Merge "Deprecate those parts of DateUtils the documentation says not to use." 2012-09-14 16:12:36 -07:00
Elliott Hughes
d3c01012d8 Deprecate those parts of DateUtils the documentation says not to use.
Applications using these fields and methods are just asking for i18n bugs.

Also @deprecate two int[]s that were never meant to be public.

Change-Id: I29b3a1c0c663fe344d2567df6ed3bb537270b3b7
2012-09-14 16:06:50 -07:00
Raph Levien
eceb317116 am f4afc401: Merge "framework: fix bug for uninitialized variable"
* commit 'f4afc40101c00800c4dc53f165b93f741327416d':
  framework: fix bug for uninitialized variable
2012-09-14 12:15:03 -07:00
Raph Levien
f4afc40101 Merge "framework: fix bug for uninitialized variable" 2012-09-14 11:52:11 -07:00
Elliott Hughes
4c686dad83 am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599':
  Include <sys/socket.h> instead of <linux/socket.h>.
2012-09-12 11:04:45 -07:00
Elliott Hughes
cceed1dfe1 Merge "Include <sys/socket.h> instead of <linux/socket.h>." 2012-09-12 10:13:28 -07:00
Elliott Hughes
778c859bfd Include <sys/socket.h> instead of <linux/socket.h>.
In newer kernels, <linux/socket.h> no longer contains some of the stuff you're
using.

Change-Id: I92c6847d73c20fb49d0db15c1cc15aa07fb5d44d
2012-09-11 18:50:25 -07:00
Xavier Ducrohet
f5de650ff1 Add --output-text-symbols option to aapt.
Library projects in the SDK are built using --non-constant-id
to generate a temporary R.java class.
When the library is packaged with the application to generate an
apk, the R class is recreated with the proper IDs due to all the
resources coming from the app and all the libraries.

However for large apps with many libraries (each with their own
R class in their package), this means a lot of unnecessary IDs:
all R classes contains all the IDs including for resources from
by projects they don't have access through the dependency graph.

For really large apps (X,000 resources), with lots of libraries
(10+), this can generate tens of thousands of resources, which
can trigger dalvik's limit of 65K fields and methods per dex
files.

This changes lets aapt generate not only the R class but a simple
text file containing the list of all those IDs so that it is
easier to parse back. The SDK build system will not ask aapt
to generate the R class of the libraries (through the
--extra-packages option), instead it will then read this
file to know what IDs are needed for each library and generate
a much smaller R class for each library (using the same text
file output from compiling all the resources to get the final
integer value).

Change-Id: I4db959fec372cf3ead9950e4b2b82fa1ae7eed2d
2012-09-11 18:19:00 -07:00
Xavier Ducrohet
7714a2429b Add --error-on-failed-insert option to aapt.
The new SDK build system give the ability to insert
versionCode/Name and min/targetSdkVersion in the manifest
but aapt won't replace those if they already exist.

The main problem is that aapt doesn't actually fail when
it doesn't replace them, making the output not what the
developer wanted.

This patch set adds an option to aapt to make it return
an error if the insert failed because the attribute
already existed.

Change-Id: I8938ec1238da407a8562c974e9598db39001ffd9
2012-09-11 18:17:22 -07:00
Jean-Baptiste Queru
70a5967e0b am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
* commit '5c09d605678d64e05579bb668b615764a714f1f7':
  Fix CacheBitmap crash issue when using H/W UI rendering
2012-09-11 17:57:19 -07:00
Jean-Baptiste Queru
5c09d60567 Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 2012-09-11 17:48:09 -07:00
Robert Greenwalt
65208857d3 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:04:50 -07:00
Robert Greenwalt
2415841c37 Merge "EthernetDataTracker: indicate link up based on flags" 2012-09-11 15:02:24 -07:00
Vishal Mahaveer
b6b72f5411 EthernetDataTracker: indicate link up based on flags
Indicate link up state based on flags/interface up, and not on IP address.
This is for ethernet interfaces that already exists.

Change-Id: Ib342d519c483bbb2dfa08cfac2c0c1a288cee7c0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-09-11 16:41:16 -05:00
Wink Saville
0c99f7e36d am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
* commit 'ba3cf72a08368ab40556b07b4518536bb59eb2f6':
  Telephony: Clarify IccCardConstants.State enum
2012-09-11 13:17:17 -07:00
Wink Saville
ba3cf72a08 Merge "Telephony: Clarify IccCardConstants.State enum" 2012-09-11 12:24:15 -07:00
Jun Tian
ee309635d2 Fix CacheBitmap crash issue when using H/W UI rendering
Avoid to access invalid index in CacheBitmap. That will cause the android SDK image cannot be booted up
with H/W GL enabling. This patch is required by both ARM and x86 SDK system image.

Change-Id: I705b7f06915a2338a2f94509486344bfd92b4bfb
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Jackie Wu <jackie.wu@intel.com>
Signed-off-by: Liang Chen <liang.l.chen@intel.com>
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
2012-09-11 10:36:28 +08:00
Elliott Hughes
3150feef0b am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
* commit 'bfe1ab825731d365fef169deab646d7ceeafc998':
  Fix aapt to get expat header files from the approved location.
2012-09-09 16:09:15 -07:00
Elliott Hughes
bfe1ab8257 Merge "Fix aapt to get expat header files from the approved location." 2012-09-09 15:16:45 -07:00
Elliott Hughes
ee15e15475 Fix aapt to get expat header files from the approved location.
Change-Id: Ic7c796e048cfe98ee355c18b3708fee5ea716e2e
2012-09-09 14:45:32 -07:00
Jean-Baptiste Queru
3f3ce8adc7 am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"
* commit 'bf3e62b8913fc2fb88d6bb454a6491424cbd40c5':
  Make SimpleSessionDescription locale safe
2012-09-06 11:47:29 -07:00
Jean-Baptiste Queru
bf3e62b891 Merge "Make SimpleSessionDescription locale safe" 2012-09-06 11:22:29 -07:00
Jean-Baptiste Queru
4aa83ec3ee am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."
* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
  Musicplayer application can not display DRM files of internal storage.
2012-09-06 09:12:17 -07:00
Jean-Baptiste Queru
bb60bc2602 Merge "Musicplayer application can not display DRM files of internal storage." 2012-09-06 07:21:00 -07:00
Jean-Baptiste Queru
5409955555 am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"
* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
  Am: Clean mLaunchingProviders of all providers started by the client
2012-09-05 12:10:48 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
2012-09-05 12:10:44 -07:00
Jean-Baptiste Queru
380a8e3d12 Merge "Am: Clean mLaunchingProviders of all providers started by the client" 2012-09-05 11:40:30 -07:00
Jean-Baptiste Queru
1ca2fee954 Merge "Make default value of auto-sync in SyncStorageEngine configurable" 2012-09-05 11:03:13 -07:00
Jean-Baptiste Queru
9eb3bd88f1 am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""
* commit '42a58ecd27783d347242206bcffd4052cf1d5164':
  Revert "Watchdog: Improvement of debuggability"
2012-09-05 11:01:25 -07:00
Jean-Baptiste Queru
42a58ecd27 Merge "Revert "Watchdog: Improvement of debuggability"" 2012-09-05 10:55:43 -07:00
Alex Yakavenka
022668bf33 Telephony: Clarify IccCardConstants.State enum
Change-Id: I57c6704dbefbcca5d1c6b28e72f0fb80bdbea7fc
2012-09-05 10:10:06 -07:00
Jean-Baptiste Queru
784827b27c Revert "Watchdog: Improvement of debuggability"
This reverts commit 9211b13c3268035b0da0c51ed2d6d5a578d45ff3.
2012-09-04 13:35:12 -07:00
Jean-Baptiste Queru
d3b74b9124 am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
* commit 'b307ceb43fa96e8d54851c20278a4344469c9269':
  SearchWidget: passing APP_DATA to voice intent
2012-09-04 11:38:28 -07:00
Jean-Baptiste Queru
b307ceb43f Merge "SearchWidget: passing APP_DATA to voice intent" 2012-09-04 10:49:48 -07:00
Vairavan Srinivasan
4ee364982e Am: Clean mLaunchingProviders of all providers started by the client
Launching providers is removed from mLaunchingProviders when the client
process dies and works as long as the client process had requested just
one provider and not otherwise. Fix is to make sure mLaunchingProviders
is updated to remove all providers launched by the client process.

Change-Id: Ib4b8b44b6a102762a6558f65fb2e6dbf11d725ea
2012-09-03 17:09:58 -07:00
Yameng Huang
2b5d0ea5e9 Make default value of auto-sync in SyncStorageEngine configurable
This will make the default value of the automatic synchronization
in the SyncStorageEngine configurable with overlays for use by
vendors who want or have legal requirements to have the synchronization
off by default.

Change-Id: Iabdb355c4a1169fe8e254e91c43e162c5913d5e0
2012-09-03 12:49:31 +02:00
Jorge Ruesga
1bcfe84179 SearchWidget: passing APP_DATA to voice intent
SearchView uses SearchManager.APP_DATA to pass data between the origin activity
and the search activity. This works for text searches (keyboard), but it's not
implemented by voice recognition searches. The method createVoiceAppSearchIntent
initializes a empty bundle that is filled with the QUERY parameter.
This patch adds the SearchManager.APP_DATA parameter if is present, let the
search activity access to the data passed by the origin activity

Patch 2: Fix code style

Change-Id: I52dce34e1efd07a30ad74d52bfc60fbae1c4310b
2012-09-03 01:26:59 +02:00
Jan Bjernler
20c38ea9fd Musicplayer application can not display DRM files of internal storage.
Make DRM-protected files transferred over MTP be detected.
Previously it was inserted into the database as MEDIA_TYPE_NONE,
the result of this was that the file was not detected properly.
With this fix the file is scanned from the beginning.

Change-Id: Idf17d39e3d529394cd4a03d71fb250e69b395533
2012-08-31 11:51:38 +02:00
Zhou Chang
46e942d500 framework: fix bug for uninitialized variable
Some application display error due to uninitialized varibale.
This patch fix the bug

Change-Id: I660169e325ffae60d95c7774aaaeaebf693adf3d
Author: Chang Zhou <chang.zhou@intel.com>
Signed-off-by: Chang Zhou <chang.zhou@intel.com>
Signed-off-by: Chong Xing <chong.xing@intel.com>
Signed-off-by: Hongyu Zhang <hongyu.zhang@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 45356
2012-08-31 10:53:04 +08:00
Wink Saville
f5311768e3 am 0dab1a19: Merge "Fix code problem in writePidDns"
* commit '0dab1a198e19c9993897b031d425a61a3bfec562':
  Fix code problem in writePidDns
2012-08-30 18:11:30 -07:00
Wink Saville
0dab1a198e Merge "Fix code problem in writePidDns" 2012-08-30 17:36:06 -07:00
Dianne Hackborn
862c383530 am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
* commit '4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44':
  Added check of ActivityInfo launch mode when starting activity.
2012-08-30 15:59:40 -07:00
Dianne Hackborn
4b60a8d1b8 Merge "Added check of ActivityInfo launch mode when starting activity." 2012-08-30 15:19:03 -07:00
Jean-Baptiste Queru
147ef94485 am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
* commit '60d1e1a09e4603e24652e930597ab204855eaa77':
  Watchdog: Improvement of debuggability
2012-08-30 13:49:58 -07:00
Jean-Baptiste Queru
60d1e1a09e Merge "Watchdog: Improvement of debuggability" 2012-08-30 13:32:10 -07:00