OSDN Git Service
Jeff Brown [Wed, 12 Mar 2014 19:16:42 +0000 (19:16 +0000)]
Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
Jeff Brown [Wed, 12 Mar 2014 06:02:35 +0000 (23:02 -0700)]
Fix power manager display wake lock bugs.
Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.
1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.
2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on. This could happen when the display was
rapidly turned on-off-on-off.
Bug:
13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
Jeff Brown [Wed, 12 Mar 2014 03:56:26 +0000 (20:56 -0700)]
Add a temporary hack to report screen on while dozing.
The window manager and view hierarchy currently disable all drawing
when PowerManager.isScreenOn() returns false so no drawing occurs
while dozing. This will be fixed in a future patch to take the
display blanking state into account correctly.
This patch is a workaround to unblock development in the meantime.
Bug:
13133142
Change-Id: I2dc0b422c77285e657d73adca2606aa68264d987
Jeff Brown [Wed, 12 Mar 2014 03:42:20 +0000 (03:42 +0000)]
Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-modular-dev
Jeff Brown [Tue, 11 Mar 2014 04:24:37 +0000 (21:24 -0700)]
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
Justin Koh [Wed, 12 Mar 2014 00:44:22 +0000 (00:44 +0000)]
Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev
Justin Koh [Thu, 6 Mar 2014 03:34:58 +0000 (19:34 -0800)]
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
Michael Wright [Fri, 18 Oct 2013 22:26:48 +0000 (15:26 -0700)]
Utilize new Android LED constants. DO NOT MERGE
Also, have EventHub manage game controllers' player LEDs
Change-Id: Ic7dba19ad236a3c7d1aff5d3f938bd239b98d51d
Jose Lima [Tue, 11 Mar 2014 18:08:53 +0000 (18:08 +0000)]
Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
Robert Greenwalt [Tue, 11 Mar 2014 17:44:20 +0000 (17:44 +0000)]
am
e8af5e10: am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
e8af5e10e04697acb26b47e5d60b99e5c61a020c':
DO NOT MERGE Debounce wifi country code Info
Zhihai Xu [Tue, 11 Mar 2014 17:43:56 +0000 (17:43 +0000)]
am
c48c9626: am
82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '
c48c9626bd2eb91aab33a034baf139aa2b92671d':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Vinit Deshapnde [Tue, 11 Mar 2014 17:43:50 +0000 (17:43 +0000)]
am
5f683ca8: am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
5f683ca80611c3e98c91f631ee05dccf3e7e0227':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
John Spurlock [Tue, 11 Mar 2014 17:43:46 +0000 (17:43 +0000)]
am
0a3cb2ce: am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
Fix doc typos in Vibrator.java
Scott Main [Tue, 11 Mar 2014 17:43:42 +0000 (17:43 +0000)]
am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
790c5a4c06e0ceee8fbdbed575e93ef257124569':
fix some typos for GoogleApiClient doc
Scott Main [Tue, 11 Mar 2014 17:43:38 +0000 (17:43 +0000)]
am
7b0c111b: am
69e49a81: Merge "fix typos" into klp-docs
* commit '
7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
fix typos
Jose Lima [Tue, 11 Mar 2014 17:41:39 +0000 (10:41 -0700)]
Added LEANBACK_LAUNCHER Intent category
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
Adam Powell [Fri, 7 Mar 2014 01:55:16 +0000 (17:55 -0800)]
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
Robert Greenwalt [Mon, 10 Mar 2014 20:06:23 +0000 (20:06 +0000)]
am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
6d9ed0c35327adfba50004fe9270ee6471459fb0':
DO NOT MERGE Debounce wifi country code Info
Robert Greenwalt [Mon, 10 Mar 2014 20:04:09 +0000 (20:04 +0000)]
Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
Benoit Goby [Mon, 10 Mar 2014 18:59:05 +0000 (18:59 +0000)]
Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
Zhihai Xu [Mon, 10 Mar 2014 18:49:47 +0000 (18:49 +0000)]
am
82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '
82ec1442487d66935cb0c30f6da3545d8c33af6e':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Zhihai Xu [Mon, 10 Mar 2014 18:46:56 +0000 (18:46 +0000)]
Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
Zhihai Xu [Tue, 7 Jan 2014 19:36:01 +0000 (19:36 +0000)]
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
This reverts commit
371427b53c70d1a71012de404c29187fe303a22a.
bug:
12099469
Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
Vinit Deshapnde [Mon, 10 Mar 2014 17:54:01 +0000 (17:54 +0000)]
am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
5243a760452dc06ec2fd0c50e1c23c0d8c3d16e7':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
Vinit Deshapnde [Mon, 10 Mar 2014 17:51:18 +0000 (17:51 +0000)]
Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
John Spurlock [Mon, 10 Mar 2014 16:24:31 +0000 (16:24 +0000)]
am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
b2bd63f00631b68df3595a4369ec4802e6443bc7':
Fix doc typos in Vibrator.java
Scott Main [Mon, 10 Mar 2014 16:24:29 +0000 (16:24 +0000)]
am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
29de50633348fb6329ed38980abce0010253a941':
fix some typos for GoogleApiClient doc
Scott Main [Mon, 10 Mar 2014 16:24:26 +0000 (16:24 +0000)]
am
69e49a81: Merge "fix typos" into klp-docs
* commit '
69e49a819a5fd3a9d0ede1ba18f204e5e2050da6':
fix typos
John Spurlock [Mon, 10 Mar 2014 16:22:22 +0000 (16:22 +0000)]
Merge "Fix doc typos in Vibrator.java" into klp-docs
Scott Main [Mon, 10 Mar 2014 16:21:10 +0000 (16:21 +0000)]
Merge "fix some typos for GoogleApiClient doc" into klp-docs
Scott Main [Mon, 10 Mar 2014 16:20:45 +0000 (16:20 +0000)]
Merge "fix typos" into klp-docs
John Spurlock [Mon, 10 Mar 2014 15:29:35 +0000 (11:29 -0400)]
Fix doc typos in Vibrator.java
Change-Id: Ie95cd7fa16042897e6acf94badec98bc19bde57a
Wei Wang [Sat, 8 Mar 2014 02:11:17 +0000 (02:11 +0000)]
am
0ea81eed: (-s ours) am
1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '
0ea81eed882d288c9473e377639b0b88280fd044':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Wei Wang [Sat, 8 Mar 2014 02:05:57 +0000 (02:05 +0000)]
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.
Wei Wang [Sat, 8 Mar 2014 02:01:01 +0000 (02:01 +0000)]
Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
Adam Powell [Sat, 8 Mar 2014 01:55:41 +0000 (01:55 +0000)]
am
96192157: am
f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
* commit '
96192157b88d3630827a9ffd55693866734b4da3':
Fix a bug where OnTouchListeners in action views could be removed
Marco Nelissen [Sat, 8 Mar 2014 01:55:36 +0000 (01:55 +0000)]
am
f41efb44: am
57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '
f41efb446a40f0904f3788c2a773f2a700b1342a':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Craig Mautner [Sat, 8 Mar 2014 01:55:33 +0000 (01:55 +0000)]
am
9bf7f893: (-s ours) am
93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '
9bf7f893e0833fca9b240c11b98d6d7dc1892081':
Show the keyguard if unsecure window on top. DO NOT MERGE.
Tim Kilbourn [Sat, 8 Mar 2014 00:55:47 +0000 (00:55 +0000)]
Merge "Dump leanback info in aapt dump badging." into klp-modular-dev
Robert Greenwalt [Sat, 8 Mar 2014 00:51:41 +0000 (16:51 -0800)]
DO NOT MERGE Debounce wifi country code Info
We're getting signals from the radio and it sometimes drops out for
a while. This change will delay applying an empty country code
for 15sec but apply non-empty country codes immediately. It uses a
sequence number so we only apply the most recent change, even if
it's delayed.
Also secures the wifi call to set the country code as we can't
allow apps to set it willy-nilly.
bug:
11062898
Change-Id: I610039a833e26d4c5c8b7b9ac1b7546f3c83446a
Tim Kilbourn [Fri, 7 Mar 2014 23:12:50 +0000 (15:12 -0800)]
Dump leanback info in aapt dump badging.
Leanback launcher activities are reported, including the banner.
Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
Benoit Goby [Thu, 20 Feb 2014 02:55:28 +0000 (18:55 -0800)]
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
Ying Wang [Fri, 7 Mar 2014 23:55:14 +0000 (15:55 -0800)]
Exclude the host aapt and aidl from PDK build.
Bug:
13028632
Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
Adam Powell [Fri, 7 Mar 2014 23:38:30 +0000 (23:38 +0000)]
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
Marco Nelissen [Fri, 7 Mar 2014 23:38:27 +0000 (23:38 +0000)]
am
57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
* commit '
57a45f22ea7b0509fb918fa39e797a6061f75438':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Craig Mautner [Fri, 7 Mar 2014 23:38:20 +0000 (23:38 +0000)]
am
93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
* commit '
93df07a1b72488b64354098cd00dff1d36b76b12':
Show the keyguard if unsecure window on top. DO NOT MERGE.
Adam Powell [Fri, 7 Mar 2014 23:28:19 +0000 (23:28 +0000)]
Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 22:49:33 +0000 (22:49 +0000)]
Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev
Craig Mautner [Fri, 7 Mar 2014 22:30:25 +0000 (22:30 +0000)]
Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev
Jeff Brown [Fri, 7 Mar 2014 22:15:08 +0000 (22:15 +0000)]
Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
Elliott Hughes [Wed, 13 Nov 2013 23:10:40 +0000 (15:10 -0800)]
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/
12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
Jeff Brown [Fri, 7 Mar 2014 21:58:47 +0000 (13:58 -0800)]
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
Marco Nelissen [Fri, 7 Mar 2014 21:18:52 +0000 (21:18 +0000)]
am
ac875878: am
9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '
ac87587875f1dfade5e06a82ccc009d0f0170569':
Make MtpDatabase use libexif instead of libjhead
Vineeta Srivastava [Fri, 7 Mar 2014 21:18:47 +0000 (21:18 +0000)]
am
f066adde: am
dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit '
f066adde7a3722deba0226715af695537511271e':
telephony: Add same named operator configuration for some operators
Marco Nelissen [Fri, 7 Mar 2014 21:12:21 +0000 (21:12 +0000)]
am
9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '
9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7':
Make MtpDatabase use libexif instead of libjhead
Vineeta Srivastava [Fri, 7 Mar 2014 21:12:17 +0000 (21:12 +0000)]
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
Marco Nelissen [Fri, 7 Mar 2014 20:23:29 +0000 (20:23 +0000)]
Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
Vineeta Srivastava [Fri, 7 Mar 2014 20:09:00 +0000 (20:09 +0000)]
Merge "telephony: Add same named operator configuration for some operators" into klp-dev
Sungmin Choi [Fri, 13 Dec 2013 05:50:40 +0000 (14:50 +0900)]
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
Vineeta Srivastava [Fri, 7 Mar 2014 18:45:11 +0000 (18:45 +0000)]
am
3d924f1e: (-s ours) am
ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit '
3d924f1e8d4664d47a1e5e3045ec450a36bb7009':
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Vineeta Srivastava [Fri, 7 Mar 2014 18:40:53 +0000 (18:40 +0000)]
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]
Mike J. Chen [Fri, 7 Mar 2014 18:40:23 +0000 (18:40 +0000)]
Merge "Add handshake broadcast support" into klp-modular-dev
Vineeta Srivastava [Fri, 7 Mar 2014 18:37:42 +0000 (18:37 +0000)]
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
Sungmin Choi [Mon, 16 Dec 2013 07:14:44 +0000 (16:14 +0900)]
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
Marco Nelissen [Fri, 10 Jan 2014 18:39:27 +0000 (10:39 -0800)]
Make MtpDatabase use libexif instead of libjhead
b/
12203995
Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
Leon Scroggins III [Fri, 7 Mar 2014 18:18:35 +0000 (18:18 +0000)]
am
74ca3fd3: (-s ours) am
bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
* commit '
74ca3fd34dac9674f61313594e2863ffecd79c7a':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Dianne Hackborn [Fri, 7 Mar 2014 18:18:31 +0000 (18:18 +0000)]
am
8e904d56: (-s ours) am
785d764b: Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
* commit '
8e904d565e8a54f755814e9ae062743b8b012731':
More on issue #
12031685 (DO NOT MERGE)
Leon Scroggins III [Fri, 7 Mar 2014 18:15:23 +0000 (18:15 +0000)]
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
Dianne Hackborn [Fri, 7 Mar 2014 18:15:19 +0000 (18:15 +0000)]
am
785d764b: Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
* commit '
785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
More on issue #
12031685 (DO NOT MERGE)
Leon Scroggins III [Fri, 7 Mar 2014 18:13:29 +0000 (18:13 +0000)]
Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 18:12:30 +0000 (18:12 +0000)]
Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
Andy McFadden [Fri, 7 Mar 2014 17:46:42 +0000 (17:46 +0000)]
am
cda61e95: am
faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '
cda61e95f6b600378ab64f43beb42dbbfa2f6a1a':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Andy McFadden [Fri, 7 Mar 2014 17:43:40 +0000 (17:43 +0000)]
am
faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '
faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Andy McFadden [Fri, 7 Mar 2014 17:40:39 +0000 (17:40 +0000)]
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
Craig Mautner [Mon, 3 Mar 2014 21:26:03 +0000 (13:26 -0800)]
Show the keyguard if unsecure window on top. DO NOT MERGE.
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.
Fixes bug
13225149.
Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
Leon Scroggins III [Tue, 14 Jan 2014 20:14:57 +0000 (15:14 -0500)]
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:
13191516
Original CLs below:
In nativeDecodeFileDescriptor, use fdopen.
Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.
BUG:
11669944
BUG:
11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41
-------------------------------------------------------------------------
Decode file descriptor from the correct offset.
Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
The old behavior would have continued to modify the
file descriptor's offset each time a new decode was
required. The copy ensures that the file descriptor
remains unchanged.
3. Buffer the file stream.
Prior to this change, if the image was not a PNG,
the stream would be rewound to the beginning of the
file, even if the file descriptor was passed in with
an offset. Thanks to the buffer, the stream is only
rewound to the original offset.
Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia
BUG:
12807677
BUG:
12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
Chris Wren [Fri, 7 Mar 2014 15:15:08 +0000 (15:15 +0000)]
am
111e981d: am
70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '
111e981dc7f7d62647d6aa5e6c44cfd13af53608':
use relative positioning for notification actions
Chris Wren [Fri, 7 Mar 2014 15:10:47 +0000 (15:10 +0000)]
am
70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '
70d5ed269268c1da6169b49b555d7295ac5d6763':
use relative positioning for notification actions
Chris Wren [Fri, 7 Mar 2014 15:08:29 +0000 (15:08 +0000)]
Merge "use relative positioning for notification actions" into klp-dev
Jeff Brown [Fri, 7 Mar 2014 04:40:10 +0000 (04:40 +0000)]
Merge "Add config_supportAutoRotation." into klp-modular-dev
Jeff Brown [Fri, 7 Mar 2014 04:39:05 +0000 (04:39 +0000)]
Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev
Jeff Brown [Fri, 7 Mar 2014 03:13:04 +0000 (19:13 -0800)]
Add config_supportAutoRotation.
On some products, it may not make sense to use the accelerometer
to perform auto-rotation. In that case, the product's config.xml
framework resource overlay should set config_supportAutoRotation
to false.
Setting this to false also disables auto-rotation settings.
Bug:
13211999
Change-Id: If9d7d72f2a2c576b14a4ff0afb61ea52c42c3357
Jeff Brown [Fri, 7 Mar 2014 02:16:34 +0000 (18:16 -0800)]
Reorder config.xml constants related to auto-rotation.
Make it a little easier to find all of the relevant resources
in one place. No functional changes.
Bug:
13211999
Change-Id: Ibfe48f48eae282fa09c95138983dab5e979a866c
Adam Powell [Fri, 10 Jan 2014 18:16:27 +0000 (10:16 -0800)]
Fix a bug where OnTouchListeners in action views could be removed
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.
Bug
12470259
Change-Id: I8c4c6110065605225a20cb7ed872255282085661
Dianne Hackborn [Fri, 7 Mar 2014 01:39:11 +0000 (17:39 -0800)]
More on issue #
12031685 (DO NOT MERGE)
Integrate from master:
Fix issue #
13065185: Frequent runtime restarts on launching...
..."Hill Climb Racing" app
A service is in use when it is in the restarting state.
Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
Marco Nelissen [Fri, 7 Mar 2014 01:31:22 +0000 (01:31 +0000)]
am
233e7e9f: am
98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit '
233e7e9f64be5e85196dd959824bce9a69b2fd99':
ExifInterface: fix class load failure
Dianne Hackborn [Fri, 7 Mar 2014 01:31:17 +0000 (01:31 +0000)]
am
278fa87c: am
430652c1: Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
* commit '
278fa87cc9a5e08d410c5b1e6c75afcffc22a988':
Fix issue #
13199860: PRE_BOOT_COMPLETED intent is...
Marco Nelissen [Fri, 7 Mar 2014 01:26:10 +0000 (01:26 +0000)]
am
98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit '
98a6bcf433fc23c343343b04c57c5a68d0177ac7':
ExifInterface: fix class load failure
Dianne Hackborn [Fri, 7 Mar 2014 01:26:05 +0000 (01:26 +0000)]
am
430652c1: Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
* commit '
430652c1e18c54dc6ae9debedb6394f2f1905903':
Fix issue #
13199860: PRE_BOOT_COMPLETED intent is...
Craig Mautner [Fri, 7 Mar 2014 01:25:50 +0000 (01:25 +0000)]
Merge "Show the keyguard if unsecure window on top" into klp-modular-dev
Marco Nelissen [Fri, 7 Mar 2014 01:16:49 +0000 (01:16 +0000)]
Merge "ExifInterface: fix class load failure" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 01:04:50 +0000 (01:04 +0000)]
Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
Will Haldean Brown [Fri, 7 Mar 2014 00:56:05 +0000 (00:56 +0000)]
Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev
Zhijun He [Fri, 20 Dec 2013 21:28:00 +0000 (13:28 -0800)]
ExifInterface: fix class load failure
libexif_jni was renamed as libjhead_jni
b/
12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
Svetoslav [Fri, 7 Mar 2014 00:47:17 +0000 (00:47 +0000)]
am
d2a244f9: am
8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit '
d2a244f9767ee678d3971c9ad43a07100db4e8c9':
ProgressBar is important for accessibility by default.
Marco Nelissen [Fri, 7 Mar 2014 00:47:02 +0000 (00:47 +0000)]
am
4f36104f: am
e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '
4f36104f06755dc2c95b3d7c8bac5312d7572199':
libexif is now libjhead
Jay Shrauner [Fri, 7 Mar 2014 00:39:49 +0000 (00:39 +0000)]
am
1276295b: (-s ours) am
a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
* commit '
1276295b6b157b583480fbdf2be72b9bc0fb1c54':
Prevent SpellChecker from setting invalid range - DO NOT MERGE
Svetoslav [Fri, 7 Mar 2014 00:39:05 +0000 (00:39 +0000)]
am
8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit '
8cb232cb796718ad91e56672a2c8fdbf88633001':
ProgressBar is important for accessibility by default.
Marco Nelissen [Fri, 7 Mar 2014 00:38:48 +0000 (00:38 +0000)]
am
e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '
e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
libexif is now libjhead
Svetoslav [Fri, 7 Mar 2014 00:37:14 +0000 (00:37 +0000)]
Merge "ProgressBar is important for accessibility by default." into klp-dev