GitLab

* commit '1e86994c':
  MtpData bmp format file can't recognize when copy bmp into DUT

* commit '31820a35':
  Add --output-text-symbols option to aapt.

* commit 'd7252571':
  Add --error-on-failed-insert option to aapt.

* commit '297ad257':
  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

* commit 'f4afc401':
  framework: fix bug for uninitialized variable

* commit 'cceed1df':
  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

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

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

* commit '5c09d605':
  Fix CacheBitmap crash issue when using H/W UI rendering

* commit '2415841c':
  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>

* commit 'ba3cf72a':
  Telephony: Clarify IccCardConstants.State enum

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>

* commit 'bfe1ab82':
  Fix aapt to get expat header files from the approved location.

Change-Id: Ic7c796e048cfe98ee355c18b3708fee5ea716e2e

* commit 'bf3e62b8':
  Make SimpleSessionDescription locale safe

* commit 'bb60bc26':
  Musicplayer application can not display DRM files of internal storage.

* commit '380a8e3d':
  Am: Clean mLaunchingProviders of all providers started by the client

* commit '1ca2fee9':
  Make default value of auto-sync in SyncStorageEngine configurable

* commit '42a58ecd':
  Revert "Watchdog: Improvement of debuggability"

Change-Id: I57c6704dbefbcca5d1c6b28e72f0fb80bdbea7fc

This reverts commit 9211b13c.

* commit 'b307ceb4':
  SearchWidget: passing APP_DATA to voice intent