46183 Commits

Author SHA1 Message Date
Jeff Brown
ec463b96e1 resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp
Change-Id: I0fa4486ed300a35de3af8748e01300b01f03ec01
2014-03-11 21:01:49 -07:00
Jeff Brown
cc9894c825 Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-modular-dev 2014-03-12 03:42:20 +00:00
Jeff Brown
089886058a Retain display when creating specialized contexts. (DO NOT MERGE)
Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
2014-03-11 19:30:22 -07:00
Justin Koh
c48701a134 am 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev
* commit '641d8aff87cbb9ed5e84ce849e0da3d3962b5eb3':
  Fix possible invalid pointer index in swipe dismiss.
2014-03-12 00:47:20 +00:00
Justin Koh
df4ee5c8ac Fix possible invalid pointer index in swipe dismiss.
Fix possible invalid pointer index in swipe dismiss: exit out if the pointer
index is -1. Also allow user to cancel this if in swipe mode.

Change-Id: I0f623ced0287679be8dd5c93ab6c67504b82fe9b
2014-03-11 16:27:25 -07:00
Jose Lima
dd0db799ee am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit '5f0c0498a1382ef955cccca95920ec878fe2a64c':
  Added LEANBACK_LAUNCHER Intent category
2014-03-11 19:19:11 +00:00
John Spurlock
b41c951fb1 am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit 'cb5f813bb642e72777643dcd2bcbd92cc2039388':
  Fix doc typos in Vibrator.java
2014-03-11 19:18:59 +00:00
Jose Lima
5f0c0498a1 Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 2014-03-11 18:08:53 +00:00
John Spurlock
cb5f813bb6 am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
  Fix doc typos in Vibrator.java
2014-03-11 17:43:46 +00:00
Jose Lima
38b75b6126 Added LEANBACK_LAUNCHER Intent category
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
2014-03-11 10:43:31 -07:00
Narayan Kamath
a870652789 am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit 'b071a07da89a8736fa4fd757f9a6c6e990d0e858':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
2014-03-11 15:17:45 +00:00
Narayan Kamath
b3802a8e23 Remove java.io.tmpdir assignment in AndroidRuntime (again).
This was brought back by a bad merge conflict resolution
in change 0efbd9a463c848118c7685f4bfc8765a82caa761.

Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
2014-03-11 15:02:10 +00:00
Narayan Kamath
b485d8e1e4 am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."
* commit '194e77aafe32cacc00f69b25bec6eeea67eb0205':
  Remove stray logging statement.
2014-03-11 12:06:00 +00:00
Narayan Kamath
0f3fd6c66e Merge "Remove stray logging statement." 2014-03-11 12:00:55 +00:00
Narayan Kamath
c3955e7e5a Remove stray logging statement.
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
2014-03-11 11:08:41 +00:00
Jeff Brown
f54d62dc80 am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar"
* commit 'fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
  Round off when calculate next step in Seekbar
2014-03-11 00:15:38 +00:00
Jeff Brown
1400652309 am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation"
* commit '33282d66155e8d68acea512989ec61cb15fae1ce':
  Fixed typo errors in documentation
2014-03-11 00:11:14 +00:00
Jeff Brown
f2e837e579 am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit 'e7f7af964baa3c5d36abd163e33ad139310049d2':
  take account of RotationVector's new extra parameter
2014-03-11 00:11:05 +00:00
Jeff Brown
6d71e165ba Merge "Round off when calculate next step in Seekbar" 2014-03-11 00:06:40 +00:00
Jeff Brown
a41ddccdc6 Merge "Fixed typo errors in documentation" 2014-03-11 00:06:25 +00:00
Jeff Brown
35c8ebab0a Merge "take account of RotationVector's new extra parameter" 2014-03-11 00:04:49 +00:00
Adam Powell
c8b43bc002 am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix
* commit 'fd6b99750bfab7f930ee375a79009874a3196165':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
2014-03-10 23:31:04 +00:00
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
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
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
Brian Carlstrom
98ba7bd5d1 Only pass -Xprofile-* options to ART
Bug: 13391896
Change-Id: I5d6a3b900c9b20f02e1d4ccb73f712e9260c7dfd
2014-03-10 10:22:10 -07: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
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
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
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
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
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
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
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
Sungmin Choi
5d37e0d1b4 telephony: Add same named operator configuration for some operators
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
2014-03-07 11:29:18 -08:00
Mike J. Chen
784224d2f9 am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev
* commit 'b8a7dd639eb680e7bcd410f7d3bd16c7ba6872ad':
  Add handshake broadcast support
2014-03-07 18:44:22 +00:00
Vineeta Srivastava
3d924f1e8d am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit 'ef86ff58178e876f1dfbedd65166cc806f006ba8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
2014-03-07 18:40:53 +00:00
Mike J. Chen
b8a7dd639e Merge "Add handshake broadcast support" into klp-modular-dev 2014-03-07 18:40:23 +00:00
Vineeta Srivastava
ef86ff5817 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 2014-03-07 18:37:42 +00:00
Sungmin Choi
22ec0dc353 Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
2014-03-07 18:37:26 +00:00
Leon Scroggins III
74ca3fd34d am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev
* commit 'bc57651fb510d7b1a2811235f96e711b6be12a12':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
2014-03-07 18:15:23 +00:00
Dianne Hackborn
8e904d565e am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev
* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)
2014-03-07 18:15:19 +00:00
Leon Scroggins III
bc57651fb5 Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 2014-03-07 18:13:29 +00:00