48311 Commits

Author SHA1 Message Date
Adam Powell
fd6b99750b Prevent overflow from MeasureSpec.adjust; measure cache fix
Extract the size from the MeasureSpec value before adding the
delta. The opposite order could result in a negative delta causing
overflow into size from the EXACTLY mode, creating a very large size
value in the resulting MeasureSpec.

Don't reapply optical bounds insets after pulling a value from the
measurement cache. (The insets will have already been applied before
insertion into the cache.)

Change-Id: Ib0154f4d6c3a7c31e7fee24fd7d5d10cc5dc71a1
2014-03-10 14:09:18 -07:00
John Spurlock
925b85eae8 Fix doc typos in AppOpsManager.java
Change-Id: I3c930a2afce48c57570681a95595149df5158053
2014-03-10 16:52:11 -04:00
Baligh Uddin
faf781ba38 Import translations. DO NOT MERGE
Change-Id: I84c201baa48bcc71b1d1cad3442818b004655a70
Auto-generated-cl: translation import
2014-03-10 13:05:19 -07:00
Baligh Uddin
fafc1ce9f8 Import translations. DO NOT MERGE
Change-Id: Iee9ef4f534076df84a28d70663293dc42b26cb99
Auto-generated-cl: translation import
2014-03-10 12:36:47 -07:00
Benoit Goby
6835033af4 am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
* commit 'c6f0b54d695b49966a13bb196800a985ac6ce212':
  Add CAP_BLOCK_SUSPEND to system server
2014-03-10 19:02:54 +00:00
Brian Carlstrom
02c7f9582b am 7b7d111b: am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"
* commit '7b7d111ba21c7c5ad161207a75f72948c427b1b0':
  Only pass -Xprofile-* options to ART
2014-03-10 17:57:35 +00:00
Jose Lima
b9f62bf2b8 Change comment for platform version in master
Change-Id: Iebee3f110a6183c43fd338d89ec46f7ae99f7611
2014-03-10 10:55:22 -07:00
Brian Carlstrom
9e73672362 am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"
* commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
  Only pass -Xprofile-* options to ART
2014-03-10 17:51:05 +00:00
Adam Powell
190909f2c1 Fix a bug in submenu presenter priority handling
Now that overflow menus and the PhoneWindow-level ListMenuPresenter
can coexist, make sure that ListMenuPresenter handles submenus spawned
by itself. Introduce an internal API for menus to prefer a specific
presenter when performing item actions.

Bug 11979407

Change-Id: Id0b8fcbb8b310cbb3a63a1e5ea7a89de5d53f86f
2014-03-10 10:30:59 -07:00
Brian Carlstrom
98ba7bd5d1 Only pass -Xprofile-* options to ART
Bug: 13391896
Change-Id: I5d6a3b900c9b20f02e1d4ccb73f712e9260c7dfd
2014-03-10 10:22:10 -07:00
John Reck
1748441181 Merge "DisplayList lifecycle changes" 2014-03-10 17:17:29 +00:00
John Reck
be34f2f3b3 DisplayList lifecycle changes
Bug: 13360343
 Change DisplayList to be more forgiving with weaker lifecycle
 requirements. Is more self-managed with a strong reference
 to the renderer it needs

 Also fix naming mismatch

Change-Id: I5c89453a72a52954f6f959f0846199705dbb6476
2014-03-10 10:12:32 -07:00
Paul Lawrence
2bc6857532 Merge "Clean up a few minor issues" 2014-03-10 16:41:22 +00:00
John Spurlock
0a3cb2ce1b am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit 'b2bd63f00631b68df3595a4369ec4802e6443bc7':
  Fix doc typos in Vibrator.java
2014-03-10 16:24:31 +00:00
John Spurlock
0f49c28e7a Fix doc typos in Vibrator.java
Change-Id: Ie95cd7fa16042897e6acf94badec98bc19bde57a
2014-03-10 11:29:35 -04:00
John Spurlock
fc558d56c2 Fix compiler warning in Activity.java.
Otherwise appears in frameworks/base build output.

Change-Id: Id4ee4f01ba8026b2629f4c3b30c7152d9bdcfc64
2014-03-10 09:56:00 -04:00
Jaewan Kim
5df87942b9 EthernetDataTracker: Return proper interface name
Change-Id: Ib01333894cc4dfbe223ef26e6eb815812d32092d
2014-03-10 21:29:16 +09:00
Narayan Kamath
b5c4e7fd38 resolved conflicts for merge of 92860a74 to master
Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
2014-03-10 10:57:05 +00:00
Narayan Kamath
8272c84cb5 am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."
* commit 'bbf826659e8e5d0be683b2459207c495303d53b6':
  LP64: Make 9 patches architecture agnostic.
2014-03-10 10:47:45 +00:00
Narayan Kamath
6381dd4ff2 LP64: Make 9 patches architecture agnostic.
The Res_png_9patch struct had several pointer members
whose size differed between 32 and 64 bit platforms.

These members have been replaced by uint32_t offsets
to serialized data. The serialized form for 9patches
places a Res_png_9patch object at the beginning of
serialized data, followed by int32_t arrays of xDivs,
yDivs and colors.

Note that these offsets are not strictly required,
since they can be computed from the values of numXDivs,
numYDivs & numColors, however they are called in tight
loops so having them computed once is a beneficial.

This change also removed the unused patch_equals function
from aapt's Image.cpp.

Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
2014-03-10 10:00:02 +00:00
Jessica Hummel
df897d08ce Merge "Extend DeviceAdminReceiver to receive provisioning complete broadcast." 2014-03-10 09:29:25 +00:00
Jean Chalard
30c86ad475 Merge "Improve doc for EditorInfo#initialSel{Start,End}" 2014-03-10 04:03:32 +00:00
Dave Allison
2d3ddc2ba9 am 199670c4: am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."
* commit '199670c46a9950bd2e06af43ea082427b542060a':
  ART profiler usage.
2014-03-08 07:26:41 +00:00
Jeff Brown
2901e0442a am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '9e3de5f70d77f7152b25fec6c27b73d037c1376d':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-08 05:43:12 +00:00
Wei Wang
0ea81eed88 am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '1327e59f36ceea5a1ee7dc66b311206345353de5':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
2014-03-08 02:05:57 +00:00
Wei Wang
1327e59f36 Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 2014-03-08 02:01:02 +00:00
Dave Allison
324aa693b8 am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."
* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
  ART profiler usage.
2014-03-08 01:56:29 +00:00
Amith Yamasani
734983fff3 Allow related users to show activities on primary user
Make ActivityManager and WindowManager understand related users.

Task stack will now contain interleaved tasks for related users,
but still group regular users separately from groups of related users.

InputMethodManagerService permits related users to invoke IME and receive
key events.

Change-Id: I3bd87b32aec69c3f8d470c8b29b144f4e849c808
2014-03-07 17:41:24 -08:00
Chris Craik
400b623209 Merge "Update Z documentation to avoid hidden API" 2014-03-08 01:12:44 +00:00
Chris Craik
29cc47a5f1 Update Z documentation to avoid hidden API
Change-Id: I723930b951327a06dfbf2aeb8417409e6ce02c2e
2014-03-07 17:11:26 -08:00
Fabrice Di Meglio
ebb9f3a1a3 Cleanup ContextThemeWrapper
- remove reference to base Context as we can get it thru
getBaseContext() call

Change-Id: I2687c15db12624243fadba44d624e2e4bdae240d
2014-03-07 17:04:52 -08:00
Alan Viverette
4fc5199760 Merge "Update fast scroller item count after layoutChildren()" 2014-03-08 01:00:31 +00:00
Alan Viverette
bca20aaf0e DO NOT MERGE Quick fix for updating the FastScroller long list property
BUG: 12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79
2014-03-07 16:50:24 -08:00
Alan Viverette
732ca4642f Update fast scroller item count after layoutChildren()
BUG: 12553181
Change-Id: I4ea1b45d08c153b0146868bf57884d6b8dde6245
2014-03-07 16:49:32 -08:00
Benoit Goby
a26d08e612 Add CAP_BLOCK_SUSPEND to system server
With linux 3.5 and above, CAP_BLOCK_SUSPEND is needed to take a
suspend blocker.

CAP_BLOCK_SUSPEND has aleady been added in master.

Change-Id: Ibd4b1f8498c3c4a7b69ea9fc68311546a8f0ecda
2014-03-08 00:17:43 +00:00
Xia Wang
6bed599aa7 Merge "Fix state transition verification." 2014-03-08 00:15:53 +00:00
Dianne Hackborn
13305da38b Merge "Start recording wakeup reasons in battery history." 2014-03-08 00:10:15 +00:00
Jeff Brown
6f9f8e7aad am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '01b5e765e59c14cdfb62f1a8684e9116a46874d2':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-07 23:39:12 +00:00
Adam Powell
96192157b8 am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit 'f175b19aaac7ffe5553013d996a073693cac929d':
  Fix a bug where OnTouchListeners in action views could be removed
2014-03-07 23:38:30 +00:00
Adam Powell
f175b19aaa Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 2014-03-07 23:28:19 +00:00
Alan Viverette
df262cd922 DO NOT MERGE Check item type before re-binding transient state views
BUG: 12701797
Change-Id: I180613cc342d24b63f80fd699937c7543c38fc20
2014-03-07 15:20:13 -08:00
Dianne Hackborn
c51cf03cf2 Start recording wakeup reasons in battery history.
Depends on a modification to libsuspend so that we can get
a callback each time the device wakes up, to read the current
wakeup reasons from the kernel.  These are then stuffed in
to a new field in the battery history.

Also add new dump options --history-start and --charged
to better control what is dumped.

Finally the alarm manager uses a "*walarm*" tag for history
item wake locks that are coming from a wakeup alarm.

Change-Id: I457571973d5b2b5fdc4e4b63ab16275db20d7edd
2014-03-07 15:18:45 -08:00
Alan Viverette
e8d2846fb9 DO NOT MERGE Ensure transient state views are temporarily detached
BUG: 12024471
Change-Id: I02659d65d664b3fd8991a0527bd23801db6f1a9d
2014-03-07 14:08:02 -08:00
Jeff Brown
6212a49a94 Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.

Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.

Bug: 12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
2014-03-07 14:02:55 -08:00
Chris Craik
2d70802fec Merge "Hide isolatedZVolume API" 2014-03-07 21:51:56 +00:00
Vineeta Srivastava
f066adde7a am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit 'dbeb0c12950e92a59671f8da7952ddf3486789b4':
  telephony: Add same named operator configuration for some operators
2014-03-07 21:12:17 +00:00
Chris Craik
b3a8b2c823 Hide isolatedZVolume API
Change-Id: Ia3a70aaac3d7027285a7510d6fed9ca3548a0bf1
2014-03-07 13:10:30 -08:00
Mike J. Chen
8169bc78a1 am 5adbea2e: am 784224d2: am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev
* commit '5adbea2e2da3a0af1357de05a04534c65a7c9f76':
  Add handshake broadcast support
2014-03-07 20:33:46 +00:00
Dave Allison
0efbd9a463 ART profiler usage.
This is a change to add args to some of the profiler related
functions, including installd commands.

Also read properties and set command line options for the runtime
profiling parameters.

Changed calls to isDexOptNeeded() to isDexOptNeededInternal().  This
needs additional arguments passed for profiles.

Bug: 12877748
Change-Id: I1a426c9309d760bac0cf92daa298defee62287c1

Conflicts:
	core/jni/AndroidRuntime.cpp
2014-03-07 12:32:44 -08:00
Vineeta Srivastava
dbeb0c1295 Merge "telephony: Add same named operator configuration for some operators" into klp-dev 2014-03-07 20:09:00 +00:00