OSDN Git Service
Jeff Sharkey [Tue, 26 Mar 2013 17:29:01 +0000 (10:29 -0700)]
It helps to catch the right exception.
Bug:
7238149
Change-Id: I7b60ec44d1d1d5ece8a871cb089f811b611f4a4a
Geremy Condra [Tue, 26 Mar 2013 05:10:37 +0000 (05:10 +0000)]
Merge "BackupManagerService files need new security labeling."
Geremy Condra [Mon, 25 Mar 2013 21:17:46 +0000 (21:17 +0000)]
Merge "Proper security labeling of multi-user data directories."
Geremy Condra [Mon, 25 Mar 2013 21:07:37 +0000 (21:07 +0000)]
Merge "Add seinfo parsing to PackageManagerService."
rpcraig [Wed, 28 Nov 2012 13:37:06 +0000 (08:37 -0500)]
Proper security labeling of multi-user data directories.
This patch covers 2 cases. When an app is installed
and the resulting data directory is created for all
existing users. And when a new user is created and
all existing app data directories are created for
the new user.
Change-Id: Iacaba6d9d18d5337e65713960d14efe32006b330
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Robert Craig [Mon, 25 Mar 2013 10:33:03 +0000 (06:33 -0400)]
Add seinfo parsing to PackageManagerService.
This patch set allows the PMS to parse the
mac_permissions.xml file which contains the
seinfo values. Each package that is installed
on the device will be assigned an seinfo value
based on policy. This seinfo value will help label
the app process and data directory. Modifications
include adjustments to ApplicationInfo.java
to store the seinfo tag per package as well as
adjustments to installd to communicate the seinfo
tag to libselinux.
Change-Id: I61ad1ea12fb6a9a6d0b108ec163bc4bf4c954b58
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Kenny Root [Thu, 21 Mar 2013 21:56:53 +0000 (21:56 +0000)]
Merge "KeyStore: change migrate to duplicate"
Kenny Root [Thu, 21 Mar 2013 21:21:50 +0000 (14:21 -0700)]
KeyStore: change migrate to duplicate
After discussion, it was determined that duplicate would be less
disruptive and it still fit in the current HAL model.
Change-Id: I2f9cae48d38ec7146511e876450fa39fc92cda55
Wink Saville [Thu, 21 Mar 2013 04:49:28 +0000 (04:49 +0000)]
Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
Kenny Root [Wed, 20 Mar 2013 22:26:03 +0000 (22:26 +0000)]
Merge "Update SELinux JNI to use helpers"
Kenny Root [Fri, 19 Oct 2012 21:15:26 +0000 (14:15 -0700)]
Update SELinux JNI to use helpers
Change-Id: Ifc707eafd1ecbba64c93fa2250c4334d0ce40005
Kenny Root [Wed, 20 Mar 2013 22:00:10 +0000 (22:00 +0000)]
Merge changes I65f7a915,I32098dc0
* changes:
KeyStore: add "migrate" command
KeyStore: add API to uid versions
Kenny Root [Wed, 20 Mar 2013 18:36:50 +0000 (11:36 -0700)]
KeyStore: add "migrate" command
To support the WiFi service, we need to support migration from the
system UID to the wifi UID. This adds a command to achieve the
migration.
Bug:
8122243
Change-Id: I65f7a91504c1d2a2aac22b9c3051adffd28d66c1
Kenny Root [Thu, 14 Feb 2013 01:02:57 +0000 (17:02 -0800)]
KeyStore: add API to uid versions
In previous commits, we added the ability to specify which UID we want to
target on certain operations. This commit adds the ability to reach those
binder calls from the KeyStore class.
Also fix a problem where saw() was not reading all the values returned via
the Binder call. This changes the semantics to return a null instead of
failing silently when it's not possible to search.
Change-Id: I32098dc0eb42e09ace89f6b7455766842a72e9f4
John Michelau [Mon, 18 Mar 2013 23:28:23 +0000 (18:28 -0500)]
Fix Watchdog HeartbeatHandler to run on correct thread
The HeartbeatHandler for the System Server Watchdog has been running
on the wrong thread due to a race condition in initialization. It's
designed to run on ServerThread, so that it can catch lockups in the
main looper of the System Server. It has been running on
ActivityManagerThread instead, so it does not detect lockups on the
ServerThread as it should.
ActivityManagerService is calling Watchdog.getInstance() before
ServerThread calls Watchdog.getInstance().init(), so the handler is
being bound to the ActivityManagerThread instead of the ServerThread.
Explicitly bind HeartbeatHandler to ServerThread, so that the Watchdog
catches lockups on this critical thread.
Change-Id: Iccb184ac3adb817feb86ed4ee0e50e443bf74636
Elliott Hughes [Tue, 19 Mar 2013 18:45:54 +0000 (18:45 +0000)]
Merge "Remove dead code from DateUtils."
Elliott Hughes [Tue, 19 Mar 2013 18:36:12 +0000 (11:36 -0700)]
Remove dead code from DateUtils.
This stuff is @hide, @deprecated, unused, and was never in any API level.
Change-Id: I87d132d77d7296a2de8527e05c2def362cab1c37
Elliott Hughes [Tue, 19 Mar 2013 16:50:38 +0000 (16:50 +0000)]
Merge "Fix times in debugging output to use H rather than k."
Elliott Hughes [Tue, 19 Mar 2013 01:11:02 +0000 (01:11 +0000)]
Merge "Fix build."
Elliott Hughes [Tue, 19 Mar 2013 01:10:24 +0000 (18:10 -0700)]
Fix build.
Change-Id: Icb7fb60f00251ab01c8f9844572bb349e45c6c41
Elliott Hughes [Tue, 19 Mar 2013 00:47:22 +0000 (17:47 -0700)]
Fix times in debugging output to use H rather than k.
Bug:
8359981
Change-Id: I4fccf3ed7e469b77f6e755dacbcd025005390505
Elliott Hughes [Tue, 19 Mar 2013 00:28:41 +0000 (00:28 +0000)]
Merge "Clean up (some of) our many clocks to use H instead of k."
Elliott Hughes [Tue, 19 Mar 2013 00:21:33 +0000 (17:21 -0700)]
Clean up (some of) our many clocks to use H instead of k.
Bug:
8359981
Change-Id: I3c0c38c2bf5adc4b5bdc11c3d10cf41dd8fb6462
Elliott Hughes [Mon, 18 Mar 2013 22:07:22 +0000 (22:07 +0000)]
Merge "Deliberately break DateFormat.format's formatting of 'k' for compatibility."
Elliott Hughes [Mon, 18 Mar 2013 21:59:59 +0000 (14:59 -0700)]
Deliberately break DateFormat.format's formatting of 'k' for compatibility.
Bug:
8359981
Change-Id: I44ed816c644f94783c77952d544c5444b966868b
Craig Mautner [Mon, 18 Mar 2013 15:56:48 +0000 (15:56 +0000)]
Merge "Correct the target app token for input method window"
Carrie Xu [Tue, 30 Oct 2012 09:28:39 +0000 (17:28 +0800)]
Correct the target app token for input method window
The root cause is:
There is a defect in window manager service: When a new
activity that can be ime target is added into window manager
but the Z order of input method window don't need to be
changed, then the target app token of input method window
would not be updated to new one. This defect may cause that
the layer of input method window is calculated incorrectly.
The solution:
Correct the target app token for input method window.
Change-Id: I008311e3c9b1cf5fc320b614d8675c183c506d50
Robert Greenwalt [Sat, 16 Mar 2013 00:18:52 +0000 (00:18 +0000)]
Merge "update APN version for MVNO"
Nick Kralevich [Fri, 15 Mar 2013 20:55:53 +0000 (20:55 +0000)]
Merge "app_process: don't pollute the environment"
Nick Kralevich [Fri, 15 Mar 2013 20:12:28 +0000 (13:12 -0700)]
app_process: don't pollute the environment
Give a hoot — don't pollute!
Change-Id: I30d6c05cecab483f0e9d8063907f7bc0ef2bb104
Nick Kralevich [Fri, 15 Mar 2013 19:08:50 +0000 (19:08 +0000)]
Merge "Never call app_main more than once"
Nick Kralevich [Fri, 15 Mar 2013 18:38:29 +0000 (11:38 -0700)]
Never call app_main more than once
Different kernels seem to handle ADDR_COMPAT_LAYOUT differently,
sometimes passing it to its children, sometimes not. If it's not
passed to its child successfully, we can end up in a restart loop.
Instead of testing for the presence of ADDR_COMPAT_LAYOUT, use an
environment variable instead, which is handled more predictably.
Bug:
8392487
Change-Id: Ia531dd2abb4e1cd46f3430d844e644f53581f530
Nick Kralevich [Thu, 14 Mar 2013 23:46:20 +0000 (23:46 +0000)]
Merge "Don't use ADDR_COMPAT_LAYOUT on the emulator"
Nick Kralevich [Thu, 14 Mar 2013 23:31:34 +0000 (16:31 -0700)]
Don't use ADDR_COMPAT_LAYOUT on the emulator
For the emulator, we want people to see memory as it
actually is, not how we're hacking around buggy apps. Don't
set ADDR_COMPAT_LAYOUT on the emulator.
For reasons that I don't understand, personality(ADDR_COMPAT_LAYOUT)
does not persist across an exec on the emulator. app_main gets
into a tight loop restarting itself because of this. This change
also works around that bug.
Change-Id: Ia73a7d2d623c25cf39d248145d97307945d554da
Nick Kralevich [Thu, 14 Mar 2013 22:28:01 +0000 (22:28 +0000)]
Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
Nick Kralevich [Thu, 14 Mar 2013 20:23:52 +0000 (13:23 -0700)]
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
Bug:
8358800
Change-Id: Id81aa26d74dfd16a49f0ee5926ea2cdb3c2106d8
John Reck [Tue, 12 Mar 2013 20:24:13 +0000 (20:24 +0000)]
Merge "Fix NPE when pasting non-text from Clipboard"
Kenny Root [Tue, 12 Mar 2013 20:05:09 +0000 (20:05 +0000)]
Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
Daniel Sandler [Tue, 12 Mar 2013 19:51:32 +0000 (19:51 +0000)]
Merge ""[+>" more icon was never shown in PhoneStatusBar"
Mats H Carlsson [Wed, 10 Oct 2012 11:37:38 +0000 (13:37 +0200)]
"[+>" more icon was never shown in PhoneStatusBar
"[+>" more icon was never show in status bar because
the member variable for this icon was not initialized
from resources. This fix enables "[+>" icon to appear
in status bar when the number of indications in status
bar becomes large.
Bug:
8368569
Change-Id: Ieb3412eed831052d69c0cf63c9b4230c38171e4a
Alex Klyubin [Tue, 12 Mar 2013 17:30:59 +0000 (10:30 -0700)]
Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
This is to accept both the "transparent" and "opaque" ECC private
keys. "Transparent" keys provide structured access to their key
material -- these are instances of ECPrivateKey. "Opaque" private
keys are not required to provide structured (or even any) access to
their key material -- these are instances of PrivateKey.
Change-Id: Ib22e18b45b638b429f994ed965416c753226c4ee
Nils Holmström [Tue, 8 Jan 2013 14:42:01 +0000 (15:42 +0100)]
Fix NPE when pasting non-text from Clipboard
When copying a link from a bookmark and then pasting it into
a textfield a NullPointerException will occur.
A ClipData.Item is not guaranteed to always contain a text string
and therefore getText() can be set to null.
Using method coerceToText() instead of getText() makes sure that
a text string is always returned.
Change-Id: I81343c0371835a3a7a52045dcd1760e69e59a967
Elliott Hughes [Mon, 11 Mar 2013 22:03:18 +0000 (22:03 +0000)]
Merge "Fix DateFormat k and h, and implement K and H for the first time."
Elliott Hughes [Mon, 11 Mar 2013 21:49:44 +0000 (14:49 -0700)]
Fix DateFormat k and h, and implement K and H for the first time.
Bug:
8359981
Change-Id: I52ef937a77e9e28f2719c2ee6f59e4b74514f0b2
Elliott Hughes [Mon, 11 Mar 2013 20:11:20 +0000 (20:11 +0000)]
Merge "use Calendar in DateUtils format method"
Sungmin Choi [Thu, 28 Feb 2013 11:17:15 +0000 (20:17 +0900)]
use Calendar in DateUtils format method
The DatePickerDialog is using DateUtils to format the dialog's title
and the DateUtils class does not work with dates outside to the
specified range.
For example, if user selects 2038-03-07, DatePickerDialog shows
1902-01-30 on Title.
The reason for the DateUtils class not being able to format dates
outside the range of 1902 and 2036 is because internally it is using
the Time class which does not support such dates.
To fix it, use Calendar class in DataUilts format method.
Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1902 or after 2037
5. update wrong date on Title
Bug: https://code.google.com/p/android/issues/detail?id=13050
Change-Id: I003266765751b5c340426af84daef271f39f771e
Elliott Hughes [Mon, 11 Mar 2013 16:59:49 +0000 (16:59 +0000)]
Merge "update preloaded-classes"
Sungmin Choi [Sat, 9 Mar 2013 06:19:47 +0000 (15:19 +0900)]
update preloaded-classes
Remove some preloaded-classes and fix typo for deleting log messages
as the followings during booting.
W/Zygote ( 163): Class not found for preloading: android.bluetooth.
BluetoothAudioGateway
W/Zygote ( 163): Class not found for preloading: android.bluetooth.
HeadsetBase
W/Zygote ( 163): Class not found for preloading: undroid.content.Ab
stractThreadedSyncAdapter$SyncThread
Change-Id: Id02e0cccaeb150f48e12d67b2d691df828842e4c
Elliott Hughes [Fri, 8 Mar 2013 23:50:02 +0000 (23:50 +0000)]
Merge "Improve DateFormat.format."
Elliott Hughes [Fri, 8 Mar 2013 23:06:14 +0000 (15:06 -0800)]
Improve DateFormat.format.
Add support for the 'c' format character, required in many non-English locales.
Reimplement 'c' and 'E', and 'L' and 'M', so they correctly interpret 5-count
pattern characters.
Replace the old incorrect class documentation with a pointer to the
well-maintained libcore equivalent and the Unicode UTS to which these two
implementations are supposed to conform.
Deprecate the useless constants for pattern characters. No one sane is going
to write MONTH + MONTH + MONTH + MONTH instead of "MMMM".
Correct the documentation for getLongDateFormat and getMediumDateFormat.
Also fix DateUtils.getStandaloneMonthString for LENGTH_SHORTEST.
Tests are in https://android-review.googlesource.com/53291.
Change-Id: I4dda8b18070f05ccdc11c1f0a9381a9d233db4e8
Elliott Hughes [Fri, 8 Mar 2013 21:18:34 +0000 (21:18 +0000)]
Merge "Improve the Resource.getQuantityString/getQuantityText documentation."
Elliott Hughes [Fri, 8 Mar 2013 19:26:57 +0000 (11:26 -0800)]
Improve the Resource.getQuantityString/getQuantityText documentation.
Natural languages differ so much and in such odd ways that you can't
use getQuantityString as an "if" statement. It's really just for grammaticality.
This is explained well in
http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
but we need to make more of an effort to motivate people to read that, and to
at least get the most important point across if they don't read it.
Change-Id: I549b9f3563462c45f2dea34c558185e0714127cd
Elliott Hughes [Fri, 8 Mar 2013 18:39:47 +0000 (18:39 +0000)]
Merge "Use getRelativeDayString in getRelativeTimeSpanString."
Elliott Hughes [Fri, 8 Mar 2013 00:46:55 +0000 (16:46 -0800)]
Use getRelativeDayString in getRelativeTimeSpanString.
The bug we're fixing here is that languages that don't
distinguish the "one" case grammatically (such as Japanese)
would say the equivalent of "In 1 day" rather than "Tomorrow"
because of the misuse of getQuantityString.
This has the side-effect of switching us over to the CLDR
strings for relative day names, which have consistent capitalization;
the Android donottranslate-cldr.xml strings varied even within
a language, so although this is a change, it seems like a step
in the right direction.
In a future change, we should actually push all relative
day formatting down into icu4c.
Bug:
7098707
Change-Id: Ia2f9af3d18c441d6093dd5da7956a3d0130e5b06
Elliott Hughes [Thu, 7 Mar 2013 23:24:40 +0000 (23:24 +0000)]
Merge "Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest."
Elliott Hughes [Thu, 7 Mar 2013 22:30:17 +0000 (14:30 -0800)]
Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.
Change-Id: Icbdb4e9133a9ae1c1b37f822367e1ac86e9e36cb
Irfan Sheriff [Wed, 6 Mar 2013 15:58:41 +0000 (15:58 +0000)]
Merge "frameworks/base: stop find before issuing wps pbc."
Deepthi Gowri [Fri, 22 Feb 2013 18:32:00 +0000 (00:02 +0530)]
frameworks/base: stop find before issuing wps pbc.
Stop p2p find before issuing a PBC to avoid GO switching to other
channel leading connection failure.
Change-Id: I88906f944de1c85b143f96cb7b35724af19cd151
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
Victoria Lease [Tue, 5 Mar 2013 23:25:15 +0000 (23:25 +0000)]
Merge "FIX Null Pointer Exception on dialog cancel"
Victoria Lease [Tue, 5 Mar 2013 23:20:45 +0000 (23:20 +0000)]
Merge "Audio continue to played even if paused manually"
Elliott Hughes [Tue, 5 Mar 2013 22:30:58 +0000 (22:30 +0000)]
Merge "jni: remove obsolete flag from makefile"
Bruce Beare [Thu, 24 May 2012 18:20:04 +0000 (11:20 -0700)]
jni: remove obsolete flag from makefile
Change-Id: Ia7e67694a736745333e9d36396b8cb6194fd26ec
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Roger Chen [Mon, 21 Jan 2013 08:04:58 +0000 (16:04 +0800)]
Audio continue to played even if paused manually
Currently, audio will resume playing after a phone call
or notification even if the user had manually paused playback.
This patch addresses that by introducing a new player state
to distinguish the user pausing playback and the browser
losing audio focus for some other reason. Audio will only
resume if the browser temporarily lost audio focus and
not when the user has manually paused playback.
Change-Id: I9e8beaedb0fcc5afe920068297ed9c387eab2ac8
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Marco Nelissen [Tue, 5 Mar 2013 00:06:33 +0000 (00:06 +0000)]
Merge "Performance increase in thumbnail handling"
Brian Carlstrom [Mon, 4 Mar 2013 17:50:14 +0000 (17:50 +0000)]
Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
Brian Carlstrom [Thu, 28 Feb 2013 01:58:09 +0000 (17:58 -0800)]
Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
Change-Id: Ieba5705f4faa7cea619cf509db3ef081fda570d5
Nick Kralevich [Fri, 1 Mar 2013 16:40:13 +0000 (16:40 +0000)]
Merge "installd: use correct header file."
Nick Kralevich [Fri, 1 Mar 2013 16:39:37 +0000 (16:39 +0000)]
Merge "ZygoteInit: use correct header files."
Nick Kralevich [Fri, 1 Mar 2013 00:49:43 +0000 (16:49 -0800)]
ZygoteInit: use correct header files.
Don't define capget / capset when we already have definitions
of it in our header files.
Change-Id: Ia2d7e408879bd09019f99aef52acb63a7a243d48
Nick Kralevich [Fri, 1 Mar 2013 00:43:23 +0000 (16:43 -0800)]
installd: use correct header file.
Change-Id: I035524b857a04f8400e96468310d88abf247e582
Dianne Hackborn [Wed, 27 Feb 2013 19:57:08 +0000 (19:57 +0000)]
Merge "Fix starting window memory leak"
Ian Rogers [Wed, 27 Feb 2013 19:47:15 +0000 (19:47 +0000)]
Merge "Track stack memory in MemoryInfo."
Ian Rogers [Wed, 27 Feb 2013 18:57:13 +0000 (10:57 -0800)]
Track stack memory in MemoryInfo.
In /proc/pid/maps the main stack is identified as "[stack]". In Linux 3.4
thread stacks are identified as "[stack:<tid>]" where <tid> is the thread ID of
the thread using that stack. Add support in MemInfo's otherStats to track
memory being used by the stack.
Add sanity check on the length of the otherStats array.
Add detail messages to two null pointer exceptions.
Bug:
8265251
Change-Id: I2b228b147da9bdc5c7a4d825dfc628fcc7923927
Ian Rogers [Wed, 27 Feb 2013 16:45:39 +0000 (16:45 +0000)]
Merge "Deprecate and document memory allocation counting."
Romain Guy [Wed, 27 Feb 2013 06:07:30 +0000 (06:07 +0000)]
Merge "Check and fail early if requested wallpaper size exceeds maximum texture size."
Ian Rogers [Sat, 23 Feb 2013 03:59:23 +0000 (19:59 -0800)]
Deprecate and document memory allocation counting.
Bug:
8241521
Change-Id: I174c4024600c5b78e74030ecc99e784a98295f09
Elliott Hughes [Tue, 26 Feb 2013 17:37:58 +0000 (17:37 +0000)]
Merge "Fix incorrect FloatMath documentation."
Kenny Root [Tue, 26 Feb 2013 17:35:13 +0000 (17:35 +0000)]
Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help""
Elliott Hughes [Tue, 26 Feb 2013 17:28:17 +0000 (09:28 -0800)]
Fix incorrect FloatMath documentation.
Change-Id: I30bbe500e634b73f3456ccc797106ad261fd0ce7
Martin Olsson [Tue, 26 Feb 2013 16:54:39 +0000 (17:54 +0100)]
Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
Change-Id: I8f869c9d2243ae8ff414399b7d6835c7ca74d500
Signed-off-by: Martin Olsson <martin@minimum.se>
Elliott Hughes [Mon, 25 Feb 2013 22:50:51 +0000 (22:50 +0000)]
Merge "Remove obsolete traceview file format documentation."
Ian Rogers [Mon, 25 Feb 2013 17:13:23 +0000 (17:13 +0000)]
Merge "Recognize odex files in memory accounting."
Amit Kumar [Sun, 24 Feb 2013 13:22:45 +0000 (13:22 +0000)]
FIX Null Pointer Exception on dialog cancel
Null Pointer Exception occurs because mWebViewCore instance
is made to null while calling destroyJava(). When
1.webview hosting activity goest to background, without calling webview onPause().
2. If app is launched again (having launchmode:singletask ) and another activity (not webview hosting) comes on top top.
3. It destorys the previous activity holding webview which internally tries to cancel the dialog, but webviewcore instance is null.
Null pointer exception is raised.
Change-Id: Idbcd30d0b0d4a35819444bbaa5c73cced8bb35a3
Signed-off-by: Amit Kumar <amitkecian@gmail.com>
Elliott Hughes [Sat, 23 Feb 2013 05:21:03 +0000 (21:21 -0800)]
Remove obsolete traceview file format documentation.
Bug: http://code.google.com/p/android/issues/detail?id=51286
Change-Id: I9f2093c81b194526e79ea098ae073b60c63e9442
Ian Rogers [Sat, 23 Feb 2013 04:35:06 +0000 (20:35 -0800)]
Recognize odex files in memory accounting.
Give odex files the same heap category as dex files.
Change-Id: I82539e20ac20a2b80c63c0cfceb266d9c59e22b7
Adam Powell [Fri, 22 Feb 2013 21:29:44 +0000 (21:29 +0000)]
Merge "Fix ListView is not scrolled properly with arrows"
Ian Rogers [Fri, 22 Feb 2013 18:02:40 +0000 (18:02 +0000)]
Merge "Account malloc mmaped pages as native heap."
Ian Rogers [Fri, 22 Feb 2013 17:40:58 +0000 (09:40 -0800)]
Account malloc mmaped pages as native heap.
Currently when malloc uses a page rather than brk the heap gets accounted as
ashmem memory. Previously the memory would be accounted as unknown but since
[1] it gets accounted as ashmem. This change makes the accounting see this
memory as being native, ie the same kind of memory we associate with brk.
[1] https://android-review.googlesource.com/#/c/49583/3
Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
Kenny Root [Fri, 22 Feb 2013 00:05:36 +0000 (00:05 +0000)]
Merge "StreamingZipInflater: fix mmap'd end of read"
Wink Saville [Wed, 20 Feb 2013 23:04:31 +0000 (23:04 +0000)]
Merge "Allow three digit phone numbers"
Victoria Lease [Tue, 19 Feb 2013 17:40:08 +0000 (17:40 +0000)]
Merge "Applying ChannelScrolling to remove calculateDragAngle"
kiwon [Thu, 7 Feb 2013 11:02:39 +0000 (20:02 +0900)]
Applying ChannelScrolling to remove calculateDragAngle
To avoid angle calculation changed the logic to use virtual areas.
When try to drag or pan, check where the current touch point locates
and determine how to drag a page.
Change-Id: Id9bd08a69c4ac93ff385c8088e6c16bed5dc5f88
Signed-off-by: kiwon <kiwon98.lee@samsung.com>
Irfan Sheriff [Fri, 15 Feb 2013 23:42:28 +0000 (23:42 +0000)]
Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
* changes:
Fix broken test.
Track keys per config and allow cert push from apps
eix enterprise config storage bugs
Fix connectivitymanagertest
Fix build
Refactor enterprise config
Wink Saville [Wed, 13 Feb 2013 01:07:21 +0000 (17:07 -0800)]
Fix broken test.
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
Irfan Sheriff [Tue, 5 Feb 2013 17:44:12 +0000 (09:44 -0800)]
Track keys per config and allow cert push from apps
Allow configuring keys for a configuration and update/delete
from wificonfigstore.
Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
Irfan Sheriff [Thu, 17 Jan 2013 16:58:14 +0000 (08:58 -0800)]
eix enterprise config storage bugs
Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.
Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.
Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
Irfan Sheriff [Tue, 15 Jan 2013 18:35:02 +0000 (10:35 -0800)]
Fix connectivitymanagertest
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
Irfan Sheriff [Tue, 15 Jan 2013 18:02:31 +0000 (10:02 -0800)]
Fix build
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
Irfan Sheriff [Fri, 11 Jan 2013 22:03:55 +0000 (14:03 -0800)]
Refactor enterprise config
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
Kenny Root [Fri, 15 Feb 2013 17:37:11 +0000 (09:37 -0800)]
StreamingZipInflater: fix mmap'd end of read
When reaching the end of a mmap'd segment, it was erroneously trying to
read more data. This is because we were reading data one character at a
time, so we never reached the Z_STREAM_END result without going through
the loop once more.
Bug: https://code.google.com/p/android/issues/detail?id=39041
Change-Id: I6c53b8187384a42217c32112d6a0c2857f471109