OSDN Git Service
Ihab Awad [Sun, 12 Oct 2014 00:14:46 +0000 (17:14 -0700)]
Revert "Add color to PhoneAccount objects (1/3)"
This reverts commit
0000cd81c84d73d3f878cd581fb89b7ea257a05a.
Dianne Hackborn [Sat, 11 Oct 2014 00:29:53 +0000 (00:29 +0000)]
am
bbbeafa9: Merge "Fix issue #
17829949: Don\'t kill Bluetooth service..." into lmp-dev
* commit '
bbbeafa9bf0c4598b32c615c72e2c87ef62c85e9':
Fix issue #
17829949: Don't kill Bluetooth service...
Amit Mahajan [Sat, 11 Oct 2014 00:24:13 +0000 (00:24 +0000)]
am
c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev
* commit '
c6c18618e999f24675e23b67e6c488d700199579':
Fix to show low LTE signal strength as -140 instead of 0.
Alan Viverette [Sat, 11 Oct 2014 00:24:03 +0000 (00:24 +0000)]
am
99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev
* commit '
99cc35bbde7415fcdeada6fb4243097af85ae33f':
Add Cutive Mono as serif monospace font for captioning
Dianne Hackborn [Sat, 11 Oct 2014 00:17:45 +0000 (00:17 +0000)]
Merge "Fix issue #
17829949: Don't kill Bluetooth service..." into lmp-dev
Amit Mahajan [Sat, 11 Oct 2014 00:07:18 +0000 (00:07 +0000)]
Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev
Amit Mahajan [Fri, 10 Oct 2014 21:41:44 +0000 (14:41 -0700)]
Fix to show low LTE signal strength as -140 instead of 0.
Bug:
17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
Alan Viverette [Fri, 10 Oct 2014 23:41:16 +0000 (23:41 +0000)]
Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev
Ihab Awad [Fri, 10 Oct 2014 23:02:10 +0000 (23:02 +0000)]
Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-dev
Dianne Hackborn [Fri, 10 Oct 2014 22:03:13 +0000 (15:03 -0700)]
Fix issue #
17829949: Don't kill Bluetooth service...
...even in extreme low memory condition
Bind to Bluetooth with BIND_IMPORTANT, so that it is allowed to
go to a higher oom adj level.
Fix some problems when this is done from a system or persistent
process, where this would go to a level that is *too* high. Instead,
introduce a new oom adj level for it that is right below persistent.
Change-Id: I002bcc4accc36c8579c4cda161be7d2fba21ba17
Selim Cinek [Fri, 10 Oct 2014 21:18:32 +0000 (21:18 +0000)]
am
2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev
* commit '
2c461def93f235d3a7853851ee125cb3caaf2955':
Fixed missing translation for wallpaper cropper
Selim Cinek [Fri, 10 Oct 2014 21:14:33 +0000 (21:14 +0000)]
Merge "Fixed missing translation for wallpaper cropper" into lmp-dev
Selim Cinek [Fri, 10 Oct 2014 20:55:36 +0000 (13:55 -0700)]
Fixed missing translation for wallpaper cropper
Also a fixed a small visibility issue.
Bug:
17927204
Change-Id: Ia9566fe8fe0c70f83edc295b0bf8317e94eb85fe
George Mount [Fri, 10 Oct 2014 20:52:22 +0000 (20:52 +0000)]
am
1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
* commit '
1a285496fb504d4c4d41e97a7c3b67210c1a67ef':
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
George Mount [Fri, 10 Oct 2014 20:48:09 +0000 (20:48 +0000)]
Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
George Mount [Fri, 10 Oct 2014 20:22:36 +0000 (13:22 -0700)]
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
Bug
17938614
Change-Id: Ia341fdd63ab57ec16a3de6349b7eb07fdc0a48ae
Alan Viverette [Fri, 10 Oct 2014 19:52:25 +0000 (12:52 -0700)]
Add Cutive Mono as serif monospace font for captioning
Sets up Courier and Courier New to point to Cutive Mono, since
Courier is a serif monospace font.
BUG:
17666124
Change-Id: I96bb2ff59020edd8210c253752f76f0eb5100e18
Jerome Dochez [Fri, 10 Oct 2014 19:24:48 +0000 (19:24 +0000)]
am
f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev
* commit '
f47f8855175213b4bf1014593f97bc81c042dfd1':
Added a daemon mode to aapt to receive streams of commands from gradle.
Jerome Dochez [Fri, 10 Oct 2014 19:21:48 +0000 (19:21 +0000)]
Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev
Selim Cinek [Fri, 10 Oct 2014 18:53:10 +0000 (18:53 +0000)]
am
3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev
* commit '
3e683b6a0f40e176ba9ffce652939ecef23b9dc2':
Fixed a bug where the panel got into a wrong state
Selim Cinek [Fri, 10 Oct 2014 18:49:11 +0000 (18:49 +0000)]
Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev
Christopher Tate [Fri, 10 Oct 2014 18:05:32 +0000 (18:05 +0000)]
am
1133e29f: Tweak wallpaper restore rejection threshold
* commit '
1133e29f22252cc36102f41204c3de35779e49d2':
Tweak wallpaper restore rejection threshold
Ihab Awad [Wed, 8 Oct 2014 22:24:14 +0000 (15:24 -0700)]
Add color to PhoneAccount objects (1/3)
Change-Id: I1887ba14f284453784299434cbc3d67c950d4266
Christopher Tate [Fri, 10 Oct 2014 17:49:16 +0000 (10:49 -0700)]
Tweak wallpaper restore rejection threshold
Raise the height ratio threshold slightly in order to start accepting
restores of height=1920 images onto height=2560 devices.
Bug
17882661
Change-Id: I63b47817fdf754cda9a052bddb62aee764522c6f
Jinsuk Kim [Fri, 10 Oct 2014 14:45:33 +0000 (14:45 +0000)]
am
294297df: Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev
* commit '
294297df4e3f327a81d922563c518aee8ee3e51d':
CEC: Prevents HdmiControlService from turning on TV on wakeup
Dianne Hackborn [Fri, 10 Oct 2014 14:44:59 +0000 (14:44 +0000)]
am
7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev
* commit '
7ea69880bdbf2c51140460dcfd063dc015c3ce26':
Improve some docs, fix some debugging.
Jinsuk Kim [Fri, 10 Oct 2014 03:52:24 +0000 (03:52 +0000)]
Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev
Dianne Hackborn [Fri, 10 Oct 2014 01:27:12 +0000 (01:27 +0000)]
Merge "Improve some docs, fix some debugging." into lmp-dev
Dianne Hackborn [Fri, 10 Oct 2014 00:59:38 +0000 (17:59 -0700)]
Improve some docs, fix some debugging.
- Add docs to Binder, Messenger, ResultReceier to explain their
relation (or lack there-of) to process lifecycle.
- Clarify some aspects of process lifecycle for services.
- Fix help text of am command.
- Fix per-package dumping of battery stats to not include history.
- Fix per-package dumping of proc stats to only include aggregated
and current stats and fix some formatting.
- Fix per-process dumping of meminfo to have an option to interpret
the input as a package, so including all processes that are
running code of that package.
- Fix top-level per-package debug output to correctly include all
of these improvements and give them a little more time (10s) to
complete for timing out.
Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
Selim Cinek [Fri, 10 Oct 2014 00:48:05 +0000 (17:48 -0700)]
Fixed a bug where the panel got into a wrong state
Bug:
17939708
Change-Id: Ieaa9dc2fc0c92ce52b02ac4ea452df47ee492ac3
Svetoslav [Fri, 10 Oct 2014 00:10:38 +0000 (00:10 +0000)]
am
c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev
* commit '
c43caf52a61e56d5ed78f947fc8c299ad5273abf':
Fix child view ordering for accessibility.
Svetoslav [Fri, 10 Oct 2014 00:03:53 +0000 (00:03 +0000)]
Merge "Fix child view ordering for accessibility." into lmp-dev
Svetoslav [Thu, 9 Oct 2014 22:49:02 +0000 (15:49 -0700)]
Fix child view ordering for accessibility.
When reporting views to accessibility services we are ordering the
children in a parent based on their location on the screen. The
initial implementation worked pretty well in practive but violated
the transitivity property leading to rare crashes in apps. The current
implementation does not violate transitivity but does not produce
good ordering.
Given the lack of time and to minumize risk this change uses the
old strategy which works most of the time and if that fails we
fall back to the current strategy. Coming up with a correct strategy
that produces good results requires more time.
bug:
17887986
Change-Id: I1c233ecdf318befc315e793696ac48bd6c652ab6
Selim Cinek [Thu, 9 Oct 2014 23:06:32 +0000 (23:06 +0000)]
am
f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev
* commit '
f9df9dd845ba1d1b14b450bd9df654243921381f':
Fixed an issue where the notification could become transparent
Christopher Tate [Thu, 9 Oct 2014 23:06:27 +0000 (23:06 +0000)]
am
2aa1d18e: Fix bug
17931760 - spurious timeout leads to mayhem
* commit '
2aa1d18e3acd269ed7a5f5a4843d447735f0676c':
Fix bug
17931760 - spurious timeout leads to mayhem
Selim Cinek [Thu, 9 Oct 2014 23:05:03 +0000 (23:05 +0000)]
Merge "Fixed an issue where the notification could become transparent" into lmp-dev
Selim Cinek [Thu, 9 Oct 2014 22:54:40 +0000 (15:54 -0700)]
Fixed an issue where the notification could become transparent
Bug:
17668881
Change-Id: If8389084c7696bb8d3c0155f1262ec1fe7973c44
Christopher Tate [Thu, 9 Oct 2014 22:20:24 +0000 (15:20 -0700)]
Fix bug
17931760 - spurious timeout leads to mayhem
We know a priori that the PMBA metadata package's backup pass
doesn't need to be tracked for timeout, because it's run inline
rather than as an asynchronous separate-process operation.
Change-Id: Ifd21ab3a016917f5e557a38c1c88f8d8ac1337d2
Christoph Studer [Thu, 9 Oct 2014 21:01:07 +0000 (21:01 +0000)]
am
2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev
* commit '
2c2cb29a3d7f0a90d753b0fa9c32c1fc5cdbff32':
WallpaperCropper: Use white color for action bar
Christoph Studer [Thu, 9 Oct 2014 20:56:44 +0000 (20:56 +0000)]
Merge "WallpaperCropper: Use white color for action bar" into lmp-dev
Christoph Studer [Thu, 9 Oct 2014 20:50:21 +0000 (13:50 -0700)]
WallpaperCropper: Use white color for action bar
Bug:
17343815
Change-Id: I5802f04204d081b97fbc2e2cb203fa03f16fea6a
Justin Koh [Thu, 9 Oct 2014 20:49:02 +0000 (20:49 +0000)]
Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev
Justin Koh [Thu, 9 Oct 2014 20:33:19 +0000 (13:33 -0700)]
Make GlobalKeyManager broadcasts send as foreground
Should prioritize these since they are due to user interaction.
Change-Id: If36d5502dbd53de6102b05fd54caed56e22685da
Adam Lesinski [Thu, 9 Oct 2014 19:30:31 +0000 (19:30 +0000)]
am
aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev
* commit '
aeef612f200b6b5cee214230271e1c3d718151ee':
Search all packages for a given type string when looking up resources by name
Dianne Hackborn [Thu, 9 Oct 2014 19:30:26 +0000 (19:30 +0000)]
am
6166a824: Merge "Implement issue #
17906468: Allow search request to fall back to global search" into lmp-dev
* commit '
6166a824b2ea7b7918f54769005ab691e15f77f7':
Implement issue #
17906468: Allow search request to fall back to global search
Jorim Jaggi [Thu, 9 Oct 2014 19:30:16 +0000 (19:30 +0000)]
am
01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev
* commit '
01f1c5c85476b7eee3155ac1a1f6b570582ecd6c':
Fix content description for bluetooth icon
Joe Fernandez [Thu, 9 Oct 2014 19:30:00 +0000 (19:30 +0000)]
am
401418d5: Merge "Revert "Removed preview license."" into lmp-dev
* commit '
401418d53b699e6cde53e45fba066c933868b6c1':
Revert "Removed preview license."
Sandeep Siddhartha [Thu, 9 Oct 2014 19:29:55 +0000 (19:29 +0000)]
am
ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev
* commit '
ed65c63bdc4a4413da5195f7e5fa392ce72f6135':
Add tests for model management [SDK Only]
Etan Cohen [Thu, 9 Oct 2014 19:29:43 +0000 (19:29 +0000)]
am
5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.
* commit '
5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
TD_SCDMA is more like GSM than CDMA - re-classifying.
Robin Lee [Thu, 9 Oct 2014 19:11:29 +0000 (19:11 +0000)]
am
a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev
* commit '
a300025d23fac899c2294a8281b12b52d4e830b6':
DevicePolicy: One cert tracker warning per profile
Joe Fernandez [Thu, 9 Oct 2014 19:11:22 +0000 (19:11 +0000)]
am
e2f757d9: am
a63f81ec: am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit '
e2f757d9f3341b66d75d335cd9dd29848a4b8969':
docs: Android TV publishing requirements
Chong Zhang [Thu, 9 Oct 2014 19:11:11 +0000 (19:11 +0000)]
am
a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost
* commit '
a6ae8ba4a59f3f893fe8893335e7517388123c10':
MediaHTTPConnection: do not use proxy for localhost
Christopher Tate [Thu, 9 Oct 2014 19:11:06 +0000 (19:11 +0000)]
am
2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev
* commit '
2e0f66820e12bbd24f476fba863d9dab564c6f97':
Also monitor MOVED_TO events for wallpaper updates
Fred Fettinger [Thu, 9 Oct 2014 19:09:50 +0000 (19:09 +0000)]
am
6c858c25: am
b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
* commit '
6c858c25f31bcdd72b60cbd0c91b085d9f298ffa':
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
mike dooley [Thu, 9 Oct 2014 19:09:41 +0000 (19:09 +0000)]
am
879142bf: Fix hangouts conference calling regression.
* commit '
879142bf1c6b72670d4aedac82938f00a97acf5b':
Fix hangouts conference calling regression.
Tim Kilbourn [Thu, 9 Oct 2014 19:09:30 +0000 (19:09 +0000)]
am
37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev
* commit '
37bd07768a05aabb0905608606f354a488a2d5cf':
Don't start SearchDialog on television.
Jeff Brown [Thu, 9 Oct 2014 19:09:01 +0000 (19:09 +0000)]
am
704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev
* commit '
704998abbafea84c28c0bcd0c540af87562b4cc9':
Ensure we correctly unblank displays when added.
smain@google.com [Thu, 9 Oct 2014 19:08:56 +0000 (19:08 +0000)]
am
b880707c: am
63cd4977: am
770c3c5e: fix unclickable link due to overlay from offset dev below
* commit '
b880707c7facd8f9232379ef481b2b5a0030b682':
fix unclickable link due to overlay from offset dev below
smain@google.com [Thu, 9 Oct 2014 19:08:41 +0000 (19:08 +0000)]
am
9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev
* commit '
9f928944fa4186e97b051b0076d7e30469b92124':
update droiddoc option to include api level 21 for javadoc tagging
Christopher Tate [Thu, 9 Oct 2014 19:08:33 +0000 (19:08 +0000)]
am
6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev
* commit '
6dea8de7097eb91c9595cea63acd489e34c63aac':
Actually tell the widget service that restore is starting
Adam Lesinski [Thu, 9 Oct 2014 19:02:23 +0000 (19:02 +0000)]
Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev
Dianne Hackborn [Thu, 9 Oct 2014 19:00:11 +0000 (19:00 +0000)]
Merge "Implement issue #
17906468: Allow search request to fall back to global search" into lmp-dev
Jorim Jaggi [Thu, 9 Oct 2014 18:29:35 +0000 (18:29 +0000)]
Merge "Fix content description for bluetooth icon" into lmp-dev
Adam Lesinski [Thu, 9 Oct 2014 18:08:04 +0000 (11:08 -0700)]
Search all packages for a given type string when looking up resources by name
Previously we would stop at the first match when looking for a type string,
but we should search all packages in case a feature Split added a type
with the same name.
Bug:
17924027
Change-Id: I6bc7ef073324db99448538cd8bdf566658f066ff
Joe Fernandez [Thu, 9 Oct 2014 18:03:20 +0000 (18:03 +0000)]
Merge "Revert "Removed preview license."" into lmp-dev
Joe Fernandez [Thu, 9 Oct 2014 18:02:10 +0000 (18:02 +0000)]
Revert "Removed preview license."
New plan: We need this for the Device Preview images provided on the final L-Preview page.
This reverts commit
4974e7f27cf93842001c10379c0be0b24eb035d7.
Change-Id: I1b5fd6d58c53c6ac14f86c688eaea540d683134a
Sandeep Siddhartha [Thu, 9 Oct 2014 17:54:15 +0000 (17:54 +0000)]
Merge "Add tests for model management [SDK Only]" into lmp-dev
Jorim Jaggi [Thu, 9 Oct 2014 00:10:58 +0000 (17:10 -0700)]
Fix content description for bluetooth icon
Bug:
17921584
Change-Id: I908d31aaa15188baffee76933a3025bad6bc2631
Dianne Hackborn [Thu, 9 Oct 2014 00:43:48 +0000 (17:43 -0700)]
Implement issue #
17906468: Allow search request to fall back to global search
Change-Id: I04834b2a9f1ec4a68c6a3fed14da2f8dd93b3be7
Etan Cohen [Thu, 9 Oct 2014 00:10:33 +0000 (17:10 -0700)]
TD_SCDMA is more like GSM than CDMA - re-classifying.
Bug:
17788412
Change-Id: Icc6a692a1f038624dde772f8d8f197aab604c166
RoboErik [Thu, 9 Oct 2014 16:46:46 +0000 (16:46 +0000)]
am
a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev
* commit '
a78601dc1929428007fdbb07da0a07ae3fb60bd5':
Ensure metadata bundles are unparceled before making them available
Christopher Tate [Thu, 9 Oct 2014 16:46:36 +0000 (16:46 +0000)]
am
c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
* commit '
c0a30bcfaecf38ab5b55c53e82505570ffffa71e':
Turn on dimension validation in wallpaper restore
Georgi Nikolov [Thu, 9 Oct 2014 16:46:26 +0000 (16:46 +0000)]
am
6eb0f480: Merge "BUG
17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev
* commit '
6eb0f4808dd984a7fa45da5eca03b4c5d8ff9327':
BUG
17887323: Need to turn off DEBUG log spam in Job Scheduler
Ye Wen [Thu, 9 Oct 2014 16:46:19 +0000 (16:46 +0000)]
am
de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev
* commit '
de73afe268bd7979017ae4b9481fc1ebf5df6c19':
Make MmsServiceBroker more robust to MmsService crashes
Adam Lesinski [Thu, 9 Oct 2014 16:46:14 +0000 (16:46 +0000)]
am
59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev
* commit '
59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f':
Remove UsageEvents#resetToStart() as it doesn't work
Robin Lee [Thu, 9 Oct 2014 12:55:16 +0000 (12:55 +0000)]
Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev
Joe Fernandez [Thu, 9 Oct 2014 12:07:07 +0000 (12:07 +0000)]
am
a63f81ec: am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit '
a63f81ec897988befad7b286b50f73a42319fd5e':
docs: Android TV publishing requirements
Joe Fernandez [Thu, 9 Oct 2014 12:01:36 +0000 (12:01 +0000)]
am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit '
e15773be4837baf15079d5d7e8f8c0c09cef952f':
docs: Android TV publishing requirements
Robin Lee [Mon, 6 Oct 2014 10:36:25 +0000 (11:36 +0100)]
DevicePolicy: One cert tracker warning per profile
Shows one notification per profile instead of one notification per
user or (previously) one notification per device.
Bug:
17794425
Change-Id: I6f0d34a16fa2a45082941387ac765dd99eefa131
Joe Fernandez [Thu, 9 Oct 2014 04:19:19 +0000 (04:19 +0000)]
Merge "docs: Android TV publishing requirements" into klp-modular-docs
Joe Fernandez [Mon, 6 Oct 2014 05:12:10 +0000 (22:12 -0700)]
docs: Android TV publishing requirements
Change-Id: If1105cb596934034a7156b573c99905bbe6c4978
Geoff Mendal [Thu, 9 Oct 2014 03:06:49 +0000 (03:06 +0000)]
am
49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
49c5ddd67793735a2d6fc036614cdfab944d56f6':
Import translations. DO NOT MERGE
Quddus Chong [Thu, 9 Oct 2014 03:03:14 +0000 (03:03 +0000)]
am
8f25f390: am
9df3d67b: am
7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
* commit '
8f25f390e515be9783e8cce913f8de051e097419':
docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
Mike Lockwood [Thu, 9 Oct 2014 03:03:09 +0000 (03:03 +0000)]
am
3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev
* commit '
3910f53c5ebccbe64ab768591dc7c377f1eb0153':
bootanimation: Tweak parameters for pcm_open for playing boot sounds.
Eino-Ville Talvala [Thu, 9 Oct 2014 03:02:35 +0000 (03:02 +0000)]
am
ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev
* commit '
ef773e3569969592fb220b7ccc49dafcabfdd67a':
Camera2: Docs cleanup, especially units and range
camera2: Update docs only for legacy devices
Chong Zhang [Thu, 9 Oct 2014 00:05:16 +0000 (17:05 -0700)]
MediaHTTPConnection: do not use proxy for localhost
Bug:
17681512
Change-Id: Iba25d89636d8f96efc0eb90e0dd7a135c82ff16a
Christopher Tate [Thu, 9 Oct 2014 02:04:01 +0000 (02:04 +0000)]
Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev
Christopher Tate [Wed, 8 Oct 2014 21:51:09 +0000 (14:51 -0700)]
Also monitor MOVED_TO events for wallpaper updates
Restore uses moveTo(), not open/write/close, so we need
to watch for that as well. Now the wallpaper service sees
and regenerates the wallpaper image immediately upon restore.
Bug
17909454
Change-Id: I0db224c3d507bdc40399d49bb4bea01899f76ad1
Fred Fettinger [Thu, 9 Oct 2014 01:23:59 +0000 (01:23 +0000)]
am
b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
* commit '
b4093c12f8a8cf73f869419904c60e953f5725ee':
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
mike dooley [Wed, 8 Oct 2014 20:39:28 +0000 (13:39 -0700)]
Fix hangouts conference calling regression.
Check the connection-by-id hash table instead of conference-by-id hash
table when setting conferenceable connections.
Bug:
17919110
Change-Id: Ia8a5ab3fb96926e600d21eca7737a0044b233563
Fred Fettinger [Fri, 29 Aug 2014 19:02:31 +0000 (14:02 -0500)]
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
Cherry-picked into klp-modular-dev.
bug:
17441218
GLConsumer uses glBindTexture() directly instead of going through
Caches::bindTexture(). This can cause libhwui to draw with the wrong
texture bound in the following case which involves 2 TextureViews:
Frame 1:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
Frame 2:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 2)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
HWUI renders TextureView B:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 2) and draws
In this case, HWUI will incorrectly draw TextureView A using texture 2 on
frame 2, because mBoundTextures[0]=1, even though the texture currently
bound to GL_TEXTURE_EXTERNAL_OES is 2.
Since GLConsumer is always used with a target of GL_TEXTURE_EXTERNAL_OES,
work around this problem by having mBoundTextures[] store only the
textures bound to the target GL_TEXTURE_2D. This is the common case
where the extra performance is needed. Since it's legal to have
different textures bound to GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES
on one texture unit, Caches::bindTexture() does not need to clear
mBoundTextures[mTextureUnit] when target != GL_TEXTURE_2D.
Change-Id: I8bc54ab8adcfacad7f3ed17a31236dc7a86c967a
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
(cherry picked from commit
e4de36bbc2baf13206deb53ced39f0befadb1861)
Tim Kilbourn [Thu, 9 Oct 2014 00:49:34 +0000 (00:49 +0000)]
Merge "Don't start SearchDialog on television." into lmp-dev
Svetoslav [Thu, 9 Oct 2014 00:15:02 +0000 (00:15 +0000)]
am
3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev
* commit '
3dd06d9005bd572a3b012b3a2b27adfa94533144':
Restored widget provider id not properly updated.
Dianne Hackborn [Thu, 9 Oct 2014 00:14:54 +0000 (00:14 +0000)]
am
89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '
89b196958fee07475765bd3c458098464ba16f2e':
Put in real "code" (aka marketing) name.
Jeff Brown [Thu, 9 Oct 2014 00:14:39 +0000 (00:14 +0000)]
Merge "Ensure we correctly unblank displays when added." into lmp-dev
Deepanshu Gupta [Thu, 9 Oct 2014 00:14:31 +0000 (00:14 +0000)]
am
908a4f9a: am
4f133894: Exclude KXmlParser from LayoutLib.
* commit '
908a4f9a4372a9627e821b5800936095b0f0b5b0':
Exclude KXmlParser from LayoutLib.
Jeff Sharkey [Thu, 9 Oct 2014 00:14:25 +0000 (00:14 +0000)]
am
562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev
* commit '
562262cc89838529316ff2f3e511c0d876b08677':
Bring along more ApplicationInfo fields.
Geoff Mendal [Thu, 9 Oct 2014 00:13:25 +0000 (00:13 +0000)]
am
f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
f121892bc8c73b06086f8ebc059dd86f680b5197':
Import translations. DO NOT MERGE
smain@google.com [Thu, 9 Oct 2014 00:10:06 +0000 (00:10 +0000)]
am
63cd4977: am
770c3c5e: fix unclickable link due to overlay from offset dev below
* commit '
63cd4977fd72de401f347ba159a71fe3d04399b3':
fix unclickable link due to overlay from offset dev below
smain@google.com [Thu, 9 Oct 2014 00:04:57 +0000 (00:04 +0000)]
am
770c3c5e: fix unclickable link due to overlay from offset dev below
* commit '
770c3c5ed52f354fe04ced31aaa56ba57a028955':
fix unclickable link due to overlay from offset dev below