159255 Commits

Author SHA1 Message Date
Ruben Brunk
a3fdec8dac Camera2: Fix early EOF in DngCreator#writeByteBuffer.
Bug: 18962278
Change-Id: I8641a03d866930c86bdd2db0a29ccd5560712c90
2015-01-09 13:48:31 -08:00
Christopher Tate
1c6014e77d Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 2015-01-06 18:09:41 +00:00
Dianne Hackborn
5fe8197fde Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 2015-01-06 18:00:00 +00:00
Paul Jensen
9ffb53cb11 Clear process DNS NetID binding when expiring or releaseing legacy requests.
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.

bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
2015-01-06 09:43:04 -05:00
Jinsuk Kim
b0b4921bcb Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 2015-01-06 04:03:21 +00:00
Jinsuk Kim
6ad7cbde22 CEC: Make deviceSelect work for MHL device
MHL device works on hotplug but not when API deviceSelect is invoked
to select it due to a bug not finding the right MHL device instance.
This CL rectifies it by searching for not only CEC but MHL devices
attached to TV.

Bug: 18909552
Change-Id: I4df1ead836090eb3a7476b7738be47a6970edb7d
2015-01-06 11:52:14 +09:00
Andrew Solovay
ff62a5eea7 am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc
* commit '4c7390d392dfe4a5df626ce28d415e01cab7d132':
  docs: New "app compatibility with managed profiles" doc
2015-01-06 02:02:02 +00:00
Joe Fernandez
2719533819 am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
* commit '546a0e8c695808c987be3fbac1b3e632b6c6aa8d':
  docs: studio build output dir name update
2015-01-06 02:01:14 +00:00
Joe Fernandez
851931f062 am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
* commit '21b92f34525e12ede8f842f6c426d33093df3b24':
  docs: gradle version update in plugin file
2015-01-06 02:01:09 +00:00
Joe Fernandez
3dcc12892f am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
* commit '447ea5097ba99ca25ddd613e72e10b57f3405291':
  docs: gradle wrapper security note
2015-01-06 02:01:05 +00:00
Joe Fernandez
765ae116e2 am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
* commit 'eed87a573a2e67c85f5a8e79ad538cce278932d2':
  docs: project file and toc updates
2015-01-06 02:01:01 +00:00
Joe Fernandez
596868b648 am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
* commit 'c811b88ab1bc891fffdef461ead0f6dc7331d04e':
  docs: studio workflow links
2015-01-06 02:00:57 +00:00
Joe Fernandez
a78664e030 am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
* commit '411c779bb746d81278b7646ffd96fa6e4f8336b9':
  docs: studio tips and ticks grammmar typo
2015-01-06 02:00:53 +00:00
Ricardo Cervera
ac4444a26f am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
* commit 'c5fae9593553a89db2ad49306b46b8f9a3631489':
  docs: Update wearable lists docs
2015-01-06 02:00:48 +00:00
Joe Fernandez
b1062ad68e am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
* commit 'c3fb32ab3989806f49cdd21ca58a044daf74f060':
  docs: studio device emulator updates
2015-01-06 02:00:42 +00:00
Sarah Maddox
15e94fdf34 am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
* commit '4811f9b84766adc17efb730160e15785d74875a3':
  docs: Updates the request-location-updates lesson in the location APIs training course.
2015-01-06 02:00:32 +00:00
Ricardo Cervera
fcba64722b am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
* commit '9719336b3a9a059c31200137a93f74445d3c7185':
  docs: Adding vector drawables video
2015-01-06 02:00:24 +00:00
Joe Fernandez
f3d9f03053 am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
* commit 'adaef486464af836cd3408657634c972419e4c80':
  docs: plugin reference update
2015-01-06 02:00:14 +00:00
Christopher Tate
603ad6f7d0 Remove the "backup_data_changed" event log
Nowadays it's just spammy and uninformative, so away it goes.

Bug 18833115

Change-Id: Ic373c596d7a892c4fedc0343e2c03dc1c295225e
2015-01-05 17:07:57 -08:00
Alan Viverette
ccfd34f6b5 Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev 2015-01-06 00:49:09 +00:00
Shishir Agrawal
8955c54e0e Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 2015-01-06 00:37:07 +00:00
Sungsoo Lim
2bdf89b167 Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev 2015-01-06 00:13:14 +00:00
Alan Viverette
c01678ea2d Scroll handle was half as opaque as it was supposed to be
BUG: 18903443
Change-Id: Ie6a220899685f654a40d57ae0408e9c91afe868a
2015-01-05 16:06:26 -08:00
Dianne Hackborn
c478cf5185 Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
No longer modify the base constants when computing oom adj values.

Change-Id: I1fa1e0013d544ad026de6dffecc7598ef7399911
2015-01-05 16:05:05 -08:00
Deepanshu Gupta
4a5baeaec9 Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev 2015-01-05 23:26:04 +00:00
Dianne Hackborn
2980719512 Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 2015-01-05 23:03:48 +00:00
Filip Gruszczynski
8c6b59f46d Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 2015-01-05 22:46:14 +00:00
Dianne Hackborn
b182955a1e Fix issue #18901214: APR: Frequent crash in android
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path.  This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
2015-01-05 14:40:24 -08:00
Alan Viverette
1f3f47b368 Merge "Avoid double-translating View background" into lmp-mr1-dev 2015-01-05 22:26:54 +00:00
Alan Viverette
b15703c9b4 Avoid double-translating View background
Reverse-translate the canvas before passing to Drawable.draw() so that
we don't double-apply the drawable's translation.

BUG: 18904688
Change-Id: I8450de9b240ddeae887b4e1003c0608da814a001
2015-01-05 14:20:42 -08:00
Hui Shu
bb84515211 Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 2015-01-05 22:07:16 +00:00
Wale Ogunwale
1d893785bd Merge "Don't restore persistent task to a stack until needed." into lmp-mr1-dev 2015-01-05 22:03:21 +00:00
Alan Viverette
748902420d Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 2015-01-05 21:39:13 +00:00
Jason Monk
ee2e13e753 Merge "Don't unregister MobileSignalControllers still used" into lmp-mr1-dev 2015-01-05 21:09:23 +00:00
Jason Monk
b142b7552a Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 2015-01-05 21:09:05 +00:00
Filip Gruszczynski
fe56835934 Add system api for disabling touch events in wallpaper behind the window.
Bug: 18721756
Change-Id: I40b749a9916536d52042e5dd49a23575bedad754
2015-01-05 12:57:19 -08:00
Alan Viverette
5c2d8f7d51 Don't override dialog icon drawable unless valid resource ID was set
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.

BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
2015-01-05 12:56:45 -08:00
Jason Monk
c014decc74 Don't unregister MobileSignalControllers still used
Also add some more testing for this section of code that manages
when MobileSignalControllers are added/removed to make sure we
are all good.

Bug: 18728593
Change-Id: I9902854c54d2e1deb58b38b7bd97dac1617831c0
2015-01-05 15:53:00 -05:00
Alan Viverette
22a3163f1d Merge "Fix selector bug" into lmp-mr1-dev 2015-01-05 20:23:47 +00:00
Alan Viverette
dd50858121 Use min when comparing AM and PM text lengths
Also cleans up code a little to prevent unnecessary re-computation
of lower-cased strings and use final where possible.

BUG: 18874813
Change-Id: I852eb7a281aed64ac36e95f32f5fa410f50abfa4
2015-01-05 11:28:12 -08:00
Jason Monk
85eec267dd QS WiFi panel trigger settings on correct user
Bug: 18900000
Change-Id: I67e234eb6300dd05f950f174107b6a28867af7a2
2015-01-05 12:05:24 -05:00
Jason Monk
4ae97d3632 Post broadcasts to bg and cache bt state info
Add a background thread to post bt broadcasts to for processing.

Try to cache all bluetooth connection state info possible and pull
from broadcasts because requesting it too often may be locking up
devices.

Bug: 18771211
Change-Id: I2cf4852c935b2f471e735d953370e5d9e996c6f7
2015-01-05 11:09:48 -05:00
Jinsuk Kim
6cfb44952a Merge "CEC: Let MHL device be of type 'source'" into lmp-mr1-dev 2015-01-05 07:10:08 +00:00
Jinsuk Kim
e416d0f67b CEC: Let MHL device be of type 'source'
MHL devices should be of type source that can stream AV contents
to the connected TV. This should be supported by the API
HdmiDeviceInfo.isSourceType().

Bug: 18897172
Change-Id: I7dcbd7773127bf26797c204504a12c3e2ebbd83b
2015-01-05 16:07:28 +09:00
Sungsoo Lim
d5489220e2 DO NOT MERGE Fix typo
Change-Id: I0c738602616fda510b765e03f8a25abfc8316b84
(cherry picked from commit 9dcba434e27ec4de87eac1448ded4126b3f97773)
2015-01-05 05:50:21 +00:00
Sungsoo Lim
b65ad80de1 Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 2015-01-05 04:25:12 +00:00
Sungsoo Lim
48248c80e5 DO NOT MERGE Make mute/unmute work
Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
(cherry picked from commit d1851e6e4e49b6a45d9e013de2e1384711975328)
2015-01-05 11:50:49 +09:00
Dongwon Kang
017bb8523d DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
Bug: 18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
(cherry picked from commit b61077357eb6d8b95b303ef107b15db243a9621b)
2015-01-05 02:12:44 +00:00
Jinsuk Kim
ad1e3d7df4 CEC: Buffer <Set System Audio Mode>
<Set System Audio Mode> is another command that needs to be buffered
in case the command arrives before the system is ready to process it.
When processed, system audio mode will be enabled based on the
global setting.

Bug: 18809965

Change-Id: Ia6ebc4e2919e1b94498ca28f652c6db95f907f9c
2015-01-02 16:08:56 +09:00
Deepanshu Gupta
f5b02eb7c4 resolved conflicts for a0bc2e7e to lmp-mr1-dev
The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.

This change also fixes the typo in the original change which was fixed
in a subsequent change.

Original commit: 12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a
fix for typo: cb09bc45c58740af953874f9915306d351fc3d9d

Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
2014-12-30 14:07:29 -08:00