Wipe the user data out in any case.

When the external storage is not mounted, the android system won't
wipe out the user data (i.e. "/data") if wipeData() is called with
the flag WIPE_EXTERNAL_STORAGE.

We think that the user data should be wiped out in any options and
also wipeData(int) method currently supports also for a external
storage. So we will also change the API reference comment.

If we should care about backward compatibility of this method behavior
with the option WIPE_EXTERNAL_STORAGE, then we would add an another
bitmask something like a ALWAYS_RESET.

Change-Id: Id7bf673c722bacc0480d32e46553b9a348513879
Add a new API on DRM Framework for streaming

In case of DRM streaming, decrypt session can start just after
receiving the header, and it doesn't need to wait for the entire
content. However, current API of DRM framework only accepts file
handle or URI. With this new API, DRM session can start
without waiting for the entire content.

Changes are made by SEMC and Sony.

Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
libmedia: Fix build with gcc 4.7

gcc 4.7 doesn't like the redefinition of n in the same
scope:
for(size_t n=...;;) {
  size_t n = 2; // <-- duplicate definition
}

Change-Id: Idfc2e768a0eb85a3dacccd3431b4ad44775432a4
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
libstagefright/matroska: Fix build with gcc 4.7

gcc 4.7 doesn't like the redefinition of i in the
same scope

Change-Id: Idf1b33af7041f0302f2f2562442a3e11ce9607d9
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
aapt: Remove terminal pointer incrementaion

When initialization, 'end' pointer refers terminal
character in a string. But it is incremented in
while loop. It occurs the access to non-secure memory.

Issue detail
  http://code.google.com/p/android/issues/detail?id=24896

Change-Id: I751d1154d797738c87a66374a66933528c045be5
stagefright avcenc: Use intptr_t for casting pointers to integers

This is used for doing integer arithmetic on the pointers, for
checking pointer alignment.

Change-Id: I7a7ff834dc631ac9cce90e46216f64645e1ae6e5
stagefright avcenc: Switch tmp variables to use the right type, to avoid casting

This fixes building on platforms where int is smaller than
pointers, e.g. 64 bit platforms.

Change-Id: I3da0459bac10cbffd1db699bf4782fe926cd391f
FileInputStream is not closed in "UserManager.java : readUserList()"

Change-Id: I50f54c70c8b6bc808fa59ce589b0480780cc811b
Move kxml2 to prebuilts/misc

Change-Id: Ie4b45d2073f26d8313843f9860cf658e288c850b
Lid switch state is incorrect

InputManager#getSwitchState() returns AKEY_STATE_UP(0=OPEN)
and AKEY_STATE_DOWN(1=CLOSE).
mLidOpen is opposite from a real lid status.

Change-Id: I40aa4e0defb95d82b6144ff6b7514f721bf9030f
Support a new ANDROID_AAPT_IGNORE env var.

AAPT has a fixed built-in list of files and directories
to ignore when parsing resource files. Over the years we
always had developers requiring specific patterns.
If the env var ANDROID_AAPT_IGNORE is set, it is parsed
to find which file/directory patterns to ignore.
Otherwise a default is used that matches the current behavior.

Added a command-line option for it:
  aapt di --ignore-assets "foo*:*.blah"

SDK Bug: 5343 24067

Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
Merge "Move kxml2 to prebuilts/misc"
Merge "Support a new ANDROID_AAPT_IGNORE env var."
Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"
Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"
String on Toast notification does not aligned to center

If length of the string being showed on Toast is short (less than 8 chars),
it is aligned to left rather than to center.
Added attribute android:layout_gravity="center_horizontal" on the TextView where Toast's message are shown to fix issue.

Change-Id: I77669fd8a11d1ec8f6b082348eb818671ce158bb
Signed-off-by: Taeho Kim <jyte82@gmail.com>
Merge "String on Toast notification does not aligned to center"
Merge "Add a new API on DRM Framework for streaming"
Merge "libmedia: Fix build with gcc 4.7"
Merge "libstagefright/matroska: Fix build with gcc 4.7"