OSDN Git Service
Ihab Awad [Mon, 1 Dec 2014 21:35:28 +0000 (21:35 +0000)]
Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
Craig Mautner [Mon, 1 Dec 2014 20:56:07 +0000 (20:56 +0000)]
Merge "Force additional layout pass after drawing" into lmp-mr1-dev
Ihab Awad [Mon, 1 Dec 2014 20:19:57 +0000 (12:19 -0800)]
Fix to a compatibility patch that was missed in ag/587241
Change-Id: I2339085a9a2cc0d6a3f4b5e07130b5178a62c729
Wale Ogunwale [Mon, 1 Dec 2014 20:26:05 +0000 (20:26 +0000)]
Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
Shishir Agrawal [Mon, 1 Dec 2014 20:17:24 +0000 (20:17 +0000)]
Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
Chris Craik [Mon, 1 Dec 2014 20:08:27 +0000 (20:08 +0000)]
Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
Shishir Agrawal [Mon, 1 Dec 2014 19:48:53 +0000 (11:48 -0800)]
TelephonyManager.setLine1NumberForDisplay should return a boolean.
The call can fail and should return the success status of the call.
Bug:
18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
Geoff Mendal [Mon, 1 Dec 2014 19:44:10 +0000 (19:44 +0000)]
am
ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
ff26f10fab3e79d535001b8e1c9155d7844375c4':
Import translations. DO NOT MERGE
Joe Fernandez [Mon, 1 Dec 2014 19:44:04 +0000 (19:44 +0000)]
am
88e04fcb: am
e9a816c5: am
1f5acf84: docs: December 2014 Dashboard update
* commit '
88e04fcbc679ae85043d5db4f7f17bbb7fc3f2d3':
docs: December 2014 Dashboard update
smain@google.com [Mon, 1 Dec 2014 19:43:58 +0000 (19:43 +0000)]
am
446bab79: am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
446bab79564e50c497e6ce5cf75a30ddd94855fe':
change Trulia context image
Jeremy Joslin [Mon, 1 Dec 2014 19:36:01 +0000 (19:36 +0000)]
Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
Alan Viverette [Mon, 1 Dec 2014 19:12:47 +0000 (19:12 +0000)]
Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 19:11:02 +0000 (19:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 1 Dec 2014 19:09:20 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I48e6cd1b92557727fbd8ee2d803f0121538831d9
Auto-generated-cl: translation import
Joe Fernandez [Mon, 1 Dec 2014 18:58:36 +0000 (18:58 +0000)]
am
e9a816c5: am
1f5acf84: docs: December 2014 Dashboard update
* commit '
e9a816c5934e4c12a865fdab4994ea286c01009d':
docs: December 2014 Dashboard update
Jeff Sharkey [Mon, 1 Dec 2014 18:57:02 +0000 (18:57 +0000)]
Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
Jeff Sharkey [Mon, 1 Dec 2014 18:56:55 +0000 (18:56 +0000)]
Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev
Joe Fernandez [Mon, 1 Dec 2014 18:51:54 +0000 (18:51 +0000)]
am
1f5acf84: docs: December 2014 Dashboard update
* commit '
1f5acf84800f58607e5e9f36c48e3b53f10c1163':
docs: December 2014 Dashboard update
Joe Fernandez [Mon, 1 Dec 2014 18:25:01 +0000 (10:25 -0800)]
docs: December 2014 Dashboard update
Change-Id: I80e2477d02ef5eb0964ae6e68ffa11d703db4fe5
Jason Monk [Mon, 1 Dec 2014 18:33:37 +0000 (18:33 +0000)]
Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
Amith Yamasani [Mon, 1 Dec 2014 18:32:10 +0000 (18:32 +0000)]
Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
smain@google.com [Mon, 1 Dec 2014 18:08:58 +0000 (18:08 +0000)]
am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
7512a46e7e9dfcd6e522e8229b91a63b9e9189de':
change Trulia context image
smain@google.com [Mon, 1 Dec 2014 18:04:39 +0000 (18:04 +0000)]
am
fdff66ee: change Trulia context image
* commit '
fdff66ee030869f0f5cb3d1614d66f7d087e2008':
change Trulia context image
smain@google.com [Mon, 1 Dec 2014 17:40:42 +0000 (09:40 -0800)]
change Trulia context image
Change-Id: I99e43b358af518750cf7ddae4856bb8ee42729f5
Jeff Sharkey [Wed, 26 Nov 2014 21:38:26 +0000 (13:38 -0800)]
Sanitize display names, keep extensions intact.
When creating or renaming files on external storage, sanitize the
requested display names to be valid FAT filenames. This also fixes
a handful of directory traversal bugs.
Also relax logic around generating display names to allow any
extension which maps to the requested MIME type. Tests to verify.
Bug:
18512473,
18504132
Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
Akira Numata [Tue, 25 Nov 2014 08:50:12 +0000 (17:50 +0900)]
APK still has privileged flag after being moved from "/system/priv-app"
When an app is moved from "/system/priv-app" to another location
during OTA update, the privileged flag should be removed.
(cherry picked from commit
76bf60ead8132b86436ebbba40eaa8f2c8bbe812)
Change-Id: I39feeac7ece89c28045d196ae69fc974b1c6510b
Geoff Mendal [Mon, 1 Dec 2014 17:26:18 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 17:24:52 +0000 (09:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8d79c516d1b137f23ec8f4178d156f9bc0f57676
Auto-generated-cl: translation import
Jason Monk [Fri, 21 Nov 2014 16:08:55 +0000 (11:08 -0500)]
SysUI: QS Wifi get connected wifi rssi from NC
Get the connected rssi for WiFi QS panel from NetworkController to
ensure it matches the status bar/QS.
Bug:
18479823
Change-Id: I82ca0cc9169a91b4e0ae6f07008d48fdb7b820f0
John Spurlock [Mon, 1 Dec 2014 17:06:12 +0000 (17:06 +0000)]
Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
Ihab Awad [Mon, 1 Dec 2014 16:24:16 +0000 (16:24 +0000)]
Merge "Telecom API updates (1/6)" into lmp-mr1-dev
Chet Haase [Mon, 1 Dec 2014 15:52:58 +0000 (15:52 +0000)]
Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 15:07:54 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 15:02:48 +0000 (07:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1475c76eb44b69ef727a11f409e7d938552ee26d
Auto-generated-cl: translation import
John Spurlock [Mon, 1 Dec 2014 14:59:03 +0000 (14:59 +0000)]
Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
John Spurlock [Mon, 1 Dec 2014 14:58:36 +0000 (14:58 +0000)]
Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
John Spurlock [Mon, 1 Dec 2014 14:58:16 +0000 (14:58 +0000)]
Merge "Volume: Update remote volume icons." into lmp-mr1-dev
Chet Haase [Mon, 1 Dec 2014 14:57:15 +0000 (06:57 -0800)]
Zero duration animations snap to end value when started
A recent change to seeking behavior altered the logic of
setCurrentPlayTime() (which is called when animations are first
started) to set the current animated fraction to 0 for 0-duration
animations. This fix ensures that 0-duration animations snap to
their end value (fraction == 1) instead, matching the behavior
prior to the seeking fix.
Issue #
18542543 Animations with 0 duration stay in initial state when calling setCurrentPlayTime(0)
Change-Id: I9916d962cf46453a9e3e1207f58baf16f4a5830a
Geoff Mendal [Mon, 1 Dec 2014 14:36:32 +0000 (06:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2cb5a0bf876f8553710f0ed3882f7ef56da24557
Auto-generated-cl: translation import
John Spurlock [Sat, 29 Nov 2014 18:22:21 +0000 (13:22 -0500)]
Zen: Improve zen mode panel condition selection.
- Decouple condition requests from expansion, now
pre-request when zen panel unhidden.
- Animate zen mode panel expansion.
- Improve default selection logic, ensure something
is selected as soon as we are in the expanded state.
- Tweak visual spacing.
- Map null condition to Indef properly when we start
out in zen.
- Avoid unnecessary condition teardown when the conditions
are updated but unchanged from current.
- Cap number of optional conditions to display, default=3.
Bug:
18335618
Change-Id: I007b7c3b2e75e2b42805af240684aa8581e9951a
John Spurlock [Sat, 29 Nov 2014 16:33:49 +0000 (11:33 -0500)]
Doze: Break out proxcheck stats by pulse reason.
Enumerate all possible reasons for doze pulses, and subdivide
the proxcheck stats (near/far) by reason. Include reason in
doze log when starting a pulse.
Bug:
18373928
Change-Id: I4ebc2df082f51d47e3b2f0cb3999faeb582ef8dc
Ihab Awad [Wed, 12 Nov 2014 21:41:16 +0000 (13:41 -0800)]
Telecom API updates (1/6)
Bug:
18292176
Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
Wally Yau [Fri, 28 Nov 2014 20:40:30 +0000 (12:40 -0800)]
Set stream volume to max when userMasterVolume is set to true.
When useMasterVolume is set, we don't want to apply the volume
attenuation twice, once at the stream mixer and once at the master
volume control. It should only be applied once at the master volume
control.
Change-Id: Id5b1cf97571733515b5680c638f11cde8824cfc0
Fixed: b/
18460548
John Spurlock [Fri, 28 Nov 2014 20:29:21 +0000 (15:29 -0500)]
Volume: Improve inline volume controls used in settings.
- Make the system internal ringer mode change signal available to
other system components via a standard intent, instead of a
volume-controller-only binder call.
- Update sysui to use new intent for icon policy.
- Add proper muting state to the volumizer, to look more like
the associated volume panel slider.
- Add basic ringer mode state tracking for the notification-ring
slider setting.
Bug:
17899613
Change-Id: Ie2df52edb070055ef59c74039162a0e785d2fdbb
Elliott Hughes [Thu, 27 Nov 2014 18:57:00 +0000 (18:57 +0000)]
am
3e2848d2: am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
3e2848d249cafbf1cc79b600eab9bce055adcf8e':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Thu, 27 Nov 2014 18:49:58 +0000 (18:49 +0000)]
am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
8fc8856268218fbd286eeb0b2f34eec23cb74f8c':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Thu, 27 Nov 2014 18:41:15 +0000 (18:41 +0000)]
am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
85e21bd534d38f8de12e8229865a863f32c30e7a':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Tue, 25 Nov 2014 19:18:43 +0000 (11:18 -0800)]
Mention ProGuard in the JNI documentation.
(cherry picked from commit
8e1bbfe0f1e4dac35b20972a71656e4c9bf437a1)
Change-Id: I22731dfb94dcc1271b987ed52914e665704dd378
Adrian Roos [Thu, 27 Nov 2014 13:00:59 +0000 (13:00 +0000)]
Merge "Fix projection permission dialog layering" into lmp-mr1-dev
Geoff Mendal [Thu, 27 Nov 2014 10:09:40 +0000 (10:09 +0000)]
am
022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '
022f4277c468176d43d4ed1cc12898e33ed1a502':
Import translations. DO NOT MERGE
Scott Main [Thu, 27 Nov 2014 10:08:51 +0000 (10:08 +0000)]
am
2995bd80: am
5a27b4b8: am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
2995bd8033ecbf4e1a5b3392ec27008d2d184b8a':
docs:advmgr-updates
smain@google.com [Thu, 27 Nov 2014 10:08:45 +0000 (10:08 +0000)]
am
277fb8fd: am
d3c17270: am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
277fb8fdaeb546119bc31269425edc72b75e87dd':
define height for context images to avoid content jumps on load
Narayan Kamath [Thu, 27 Nov 2014 09:57:35 +0000 (09:57 +0000)]
resolved conflicts for merge of
7377998d to lmp-mr1-dev
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
Amit Mahajan [Thu, 27 Nov 2014 03:05:45 +0000 (03:05 +0000)]
Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
Eino-Ville Talvala [Thu, 27 Nov 2014 00:23:40 +0000 (00:23 +0000)]
Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
Alan Viverette [Thu, 27 Nov 2014 00:08:58 +0000 (16:08 -0800)]
Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
BUG:
18541882
Change-Id: I2ba4611e08ba08667ef5ee4fb556d1c9075ca6d2
Eric Laurent [Wed, 26 Nov 2014 23:52:06 +0000 (23:52 +0000)]
Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 23:42:52 +0000 (23:42 +0000)]
Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 23:27:02 +0000 (15:27 -0800)]
Add string for "Connected via Wi-Fi assistant".
Bug:
18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
Jeremy Joslin [Wed, 26 Nov 2014 22:24:15 +0000 (14:24 -0800)]
Fix the ordering of extra values in the PI.
Bug:
18539720
Change-Id: I6bb69394b05923ca25bc1b4902bc2540a13812bd
Eino-Ville Talvala [Wed, 22 Oct 2014 21:39:31 +0000 (14:39 -0700)]
CameraManager: Separate service listener into a singleton
Currently, every CameraManager instance adds itself as a camera service
listener, which has the unfortunate side effect of keeping them all alive
indefinitely.
This is doubly unfortunate since every CameraManager keeps the Context it
was constructed with, and therefore may be leaking whole Activities along
with the CameraManager itself.
Break out a global per-process CameraManager which handles service
connection keepalive and availability listeners, so that local camera
manager instances can go out of scope as expected.
Bug:
18077200
Change-Id: I1be5fb8d3492131e98bb4a84121400d4abb2b9e1
Wale Ogunwale [Thu, 20 Nov 2014 19:42:38 +0000 (11:42 -0800)]
Added unique id to display devices and their settings.
The display setting saved to disk were using a localized name for
the key. This is an issue if the user changes languages after the
display settings have been saved. We now use the non-localized
name for the display to access the settings if it is available,
else we fall back on the localized name.
Bug:
18190800
Change-Id: I837c06a8935df10727229a1aa2bb6eeb3953707f
Jinsuk Kim [Wed, 26 Nov 2014 21:27:16 +0000 (21:27 +0000)]
Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev
Chris Craik [Wed, 26 Nov 2014 20:50:08 +0000 (20:50 +0000)]
Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev
Lajos Molnar [Wed, 26 Nov 2014 19:14:24 +0000 (19:14 +0000)]
Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev
vandwalle [Wed, 26 Nov 2014 19:05:00 +0000 (19:05 +0000)]
Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev
Chris Craik [Wed, 26 Nov 2014 18:59:58 +0000 (18:59 +0000)]
Revert "Force-use the pbuffer surface for destroy"
bug:
18528859
This reverts commit
b945f2313aee6e49a082ba5caaf95334d2570d52.
Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d
Dohyun Lee [Mon, 24 Nov 2014 12:08:15 +0000 (21:08 +0900)]
Enable stencil clipping within clearLayerRegions
bug:
18538502
Cherry-pick of
adc0d9da8648abfea1035fb1108eceea9fd9b5b1 from AOSP
Previously stencil clipping within clearLayerRegions is disabled by commit
62d307c2402777d5e53b4590af5f32f8c55afd81. However, clearing whole layer
regions causes black-colored triangle regions when a TextView has
RotateAnimation because the draw within clearLayerRegions does not
affected by the current stencil clip.
Change-Id: Id32a0b16754b109905f833e063ebfa156bd953f2
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
Jeff Sharkey [Wed, 26 Nov 2014 18:49:32 +0000 (18:49 +0000)]
Merge "package_info GID shouldn't have write." into lmp-mr1-dev
Ryan Lothian [Wed, 26 Nov 2014 18:04:45 +0000 (18:04 +0000)]
Fix broken @see javadoc in android.media.* classes
This CL fixes all android.media.* javadoc that includes an "ERROR(...)"
message when rendered to HTML.
Bug:
18537403
Change-Id: Ic60f7cfe4cf4961da163d955387d65a5d2011905
(cherry picked from commit
d550f9028ee7f52018fbed3cfd2d0b18d6a7c4f0)
Geoff Mendal [Wed, 26 Nov 2014 17:58:42 +0000 (09:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5e59a2d77b28018d896af444cd63847d5b1e33ac
Auto-generated-cl: translation import
Craig Mautner [Wed, 26 Nov 2014 02:59:45 +0000 (18:59 -0800)]
Force additional layout pass after drawing
If AppWindowToken.allDrawn is changed from true to false an
additional layout pass is required to change WindowStateAnimator.
mDrawState from READ_TO_SHOW to HAS_DRAWN.
Fixes bug
18456175
Change-Id: Iddac657e5303a4154309889417374c0c6994c4df
Eric Laurent [Wed, 26 Nov 2014 17:46:44 +0000 (09:46 -0800)]
AudioRecord JNI: pass attributes to native AudioRecord.
Bug:
16006090.
Change-Id: Ic6448dda0de65dada3a195cfc2ec73698b04b7b2
Adrian Roos [Tue, 25 Nov 2014 20:11:19 +0000 (21:11 +0100)]
Fix projection permission dialog layering
Bug:
18392920
Change-Id: I32c2c61339cbea9edd4a7a3f80365213fb4a69ac
John Spurlock [Wed, 26 Nov 2014 16:37:00 +0000 (11:37 -0500)]
Volume: Update remote volume icons.
Remove last holo references by using the new-style cast connected
icon. There is only one icon for the remote stream, since
it is never muted by policy.
Bug:
18102850
Change-Id: Iffe3a19deca6599780ebdb26869ae46aa8623f81
John Spurlock [Wed, 26 Nov 2014 16:32:36 +0000 (16:32 +0000)]
Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev
Geoff Mendal [Wed, 26 Nov 2014 16:30:48 +0000 (16:30 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 26 Nov 2014 16:13:55 +0000 (08:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia430daa8ca9fbc8181130d7380a4ca5761d01ef1
Auto-generated-cl: translation import
Jeff Davidson [Wed, 26 Nov 2014 15:55:16 +0000 (15:55 +0000)]
Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 15:54:24 +0000 (15:54 +0000)]
Merge "Fix WifiTile's Connected indicator for ephemeral networks." into lmp-mr1-dev
John Spurlock [Wed, 26 Nov 2014 15:11:19 +0000 (10:11 -0500)]
Volume: Avoid making bad forceVolumeControlStream call.
Ensure we don't call audio manager with STREAM_MASTER, which is
a pseudo-stream value internal to volume panel.
Bug:
18250921
Change-Id: I4b6af9fc60d7683e9103be52cc937c33c1c15e31
Geoff Mendal [Wed, 26 Nov 2014 15:08:46 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 26 Nov 2014 14:56:43 +0000 (06:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I885436b95251805a80c4a6edf308448d5ed43ca3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 26 Nov 2014 14:32:43 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 26 Nov 2014 14:31:37 +0000 (06:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idfd2434481ce912e23afaaa7fb6bbef3dcad35f8
Auto-generated-cl: translation import
Jorim Jaggi [Mon, 24 Nov 2014 19:12:50 +0000 (20:12 +0100)]
Fix jank when pin/pattern is shown
- Only update layout params of status bar window when needed
- Do not update security method all the time, only when needed (only
when reset gets called)
- Check for actual used security method when updating states for
bouncer
Bug:
18505838
Change-Id: Ib3d0021c0cc364fa5598e06e0a2bae059ae79cbe
Jorim Jaggi [Wed, 26 Nov 2014 14:07:19 +0000 (14:07 +0000)]
Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev
Paul Jensen [Wed, 26 Nov 2014 12:04:58 +0000 (12:04 +0000)]
Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev
Scott Main [Wed, 26 Nov 2014 11:56:53 +0000 (11:56 +0000)]
am
5a27b4b8: am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
5a27b4b8216cf758f302200f7a2b0a071a1be90e':
docs:advmgr-updates
smain@google.com [Wed, 26 Nov 2014 11:56:49 +0000 (11:56 +0000)]
am
d3c17270: am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
d3c172703df68c70aca6f212fda3023246869777':
define height for context images to avoid content jumps on load
Narayan Kamath [Wed, 26 Nov 2014 10:34:45 +0000 (10:34 +0000)]
resolved conflicts for merge of
a42f7c1d to lmp-sprout-dev
Change-Id: I8e53c9d7e0014b4ffc621c561b737aa2dae5460c
Jinsuk Kim [Wed, 26 Nov 2014 07:57:08 +0000 (16:57 +0900)]
Do not perform forceVolumeControlStream in master volume mode
The method should be no-op when in master volume mode.
Bug:
18250921
Change-Id: Iaab806db935ef97aa1124c3447e228d3eaef7584
Jinsuk Kim [Wed, 26 Nov 2014 05:58:37 +0000 (05:58 +0000)]
Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev
Scott Main [Wed, 26 Nov 2014 03:19:30 +0000 (03:19 +0000)]
am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
fc793074063ee40b0bc4b4cbf710802123f84251':
docs:advmgr-updates
Scott Main [Wed, 26 Nov 2014 03:13:25 +0000 (03:13 +0000)]
Merge "docs:advmgr-updates" into lmp-docs
smain@google.com [Wed, 26 Nov 2014 02:22:44 +0000 (02:22 +0000)]
am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
3a4b011c9e4260ec34b490368ccf19edb3a0b5fe':
define height for context images to avoid content jumps on load
smain@google.com [Wed, 26 Nov 2014 02:05:39 +0000 (18:05 -0800)]
define height for context images to avoid content jumps on load
Change-Id: I95fb6d628f8be12c31c0b7fa2978dd266f72dbf6
Andy Hung [Wed, 26 Nov 2014 02:04:43 +0000 (02:04 +0000)]
Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev
Dianne Hackborn [Wed, 26 Nov 2014 01:44:21 +0000 (01:44 +0000)]
Merge "Re-tune low memory killer params." into lmp-mr1-dev
vandwalle [Sat, 22 Nov 2014 01:59:30 +0000 (17:59 -0800)]
make startScan with worksource specific to location scans
Change-Id: Ia09dae3e334ef6fd11f2b468e78ad7c2c3cf55e9