143627 Commits

Author SHA1 Message Date
Prashant Malani
85d5144984 resolved conflicts for merge of bc3699b1 to lmp-dev
Change-Id: I1b219b5b48afb08ce3704a4f064a85652d2d9339
2014-07-24 15:29:27 -07:00
Prashant Malani
bc3699b1c3 am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"
2014-07-24 18:06:03 +00:00
John Spurlock
09890b3a90 Merge "QS: Handle all camera api exceptions during init." into lmp-dev 2014-07-24 15:36:51 +00:00
John Spurlock
553b48b50a QS: Handle all camera api exceptions during init.
Temporary workaround to unblock certain devices.

Bug:16547333
Change-Id: I80d8ec609e5c32b9db290576c5ec791ad915c45c
2014-07-24 18:12:58 -04:00
John Reck
ad2947a7e7 Merge "fix build" into lmp-dev 2014-07-24 15:36:21 +00:00
John Reck
73e8205f75 fix build
Change-Id: I597255b2b311b7daec7ffe537f62ee78eace50be
2014-07-24 14:46:54 -07:00
Yao Chen
80bb169d0f Use a sequence number for thumbnail callback.
Change-Id: I27888cd0437b4f654cb29371b7d86b9341d84ae9
2014-07-24 21:40:40 +00:00
John Reck
1aa5d2d706 Fix ALL compile warnings
All warnings/errors fixed for GCC & Clang

Change-Id: I2ece3a136a5ae97a9acc3069537ed986238b5fd3
2014-07-24 14:28:08 -07:00
George Mount
71d34ec5be Merge "Fix no transition when only shared element exists." into lmp-dev 2014-07-24 20:48:02 +00:00
George Mount
b4c5d7bf21 Fix no transition when only shared element exists.
Bug 16245703

Change-Id: Ie31baaf7f58038fc79ffca0206ce3bec0ef64cb4
2014-07-24 13:19:51 -07:00
Justin Morey
5a99ee3334 Merge "Fix build" into lmp-dev 2014-07-24 15:36:51 +00:00
Justin Morey
b5deda7382 Fix build
Change-Id: I8790b274864610b7e00d7ea12efe96b3b826301f
2014-07-24 10:53:40 -05:00
Kenny Guy
4dcb0dc453 Load package information from correct user.
Handle case where a package is only installed
for secondary user.

Bug: 15983201
Change-Id: I6733011c59e6d08d275dc761660d38b709051d79
2014-07-24 15:49:18 +00:00
Robert Greenwalt
41f9696d51 Merge "Fix DUN-based tethering." into lmp-dev 2014-07-24 15:36:21 +00:00
Robert Greenwalt
fab50167a8 Fix DUN-based tethering.
It was calling into dead ConnectivityService code rather than using
the new ConnectivityManager shim code.

bug:15221541
Change-Id: I1e3eea8a658a162ce36673ed1cf7b1e7e4372c42
2014-07-24 14:39:51 -07:00
Prashant Malani
b4dcc64fe6 Merge "Revert "Remove circular mask"" into klp-modular-dev 2014-07-24 15:36:14 +00:00
Jean-Michel Trivi
e19dfacb74 Merge "Remove MediaFocusControl persisting media button receiver" into lmp-dev 2014-07-24 15:36:09 +00:00
Baligh Uddin
b3bb0e3f0d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 20:48:02 +00:00
Jean-Michel Trivi
f2bbad1e76 Remove MediaFocusControl persisting media button receiver
MediaFocusControl doesn't handle media button receivers anymore,
 so it should read and persist a receiver, and monitor
 package addition/removals.
Also involved a security vulnerability, see bug

Bug 15428797

Change-Id: Ia2be01b20dc4a9820cc0cd3d0605ac03770b266b
2014-07-24 10:06:13 -07:00
Baligh Uddin
7e75d21c65 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 15:35:58 +00:00
Craig Mautner
6714e86a54 Refactor screen blocking logic.
Because of the call to turn on the screen introduced in ag/495255
is now made earlier we may not have sent the wakeup broadcast by
the time the windows have all drawn. In such a case onScreenOn()
did not release the wakelock and the screen stayed off.

This change ensures that no matter the timing of onScreenOn()
the wakelock will be released but only for the onScreenOn()
called in response to the most recent screen on transition.

Fixes bug 16404078.

Change-Id: Ic1e3e61e16c1fc34d4ec657e0e53ac49a05ca6a4
2014-07-24 20:49:57 +00:00
Alan Viverette
96335e3543 Merge "Remove the max ripple count exceeded warning" into lmp-dev 2014-07-24 15:36:09 +00:00
Alan Viverette
e5d6cf85e2 Remove the max ripple count exceeded warning
BUG: 16543509
Change-Id: I84ec8e01136d1f0f34c6153d8ef7936de547746e
2014-07-24 13:45:46 -07:00
Alan Viverette
61968a93a8 Update icons for search and back
BUG: 16539661
Change-Id: If914e812841d2844a4fa50cc5a863615531371a2
2014-07-24 13:42:40 -07:00
Alan Viverette
0da25b9298 Merge "Update icons for search and back" into lmp-dev 2014-07-24 15:35:58 +00:00
Adam Lesinski
d4bd75be4f Merge "Add <feature-group> tag and change aapt badging" into lmp-dev 2014-07-24 15:36:09 +00:00
Prerepa Viswanadham
5bec5af971 cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
Change-Id: Ia58a46392157e274f8fc4696e8e25af480eb2d2a
2014-07-24 19:28:12 +00:00
Svetoslav
f7c42c5067 Updated accessibility nodes not properly cached.
We have an accessibiliy node info cache in the process of each
accessibility service. Sometimes the cached node changes and
in this case we have evict from the cache the sub-trees rooted
at children that are no longer present. There was bug where if
none of the children is present anymore we did not evict their
sub-trees.

Also the verification logic was not stopping if a duplicate
node is seen potentially getting into an infinite loop.

bug:15729762

Change-Id: I7adf4f0a1bde07b385556d9acdded5059231f1f3
2014-07-24 19:24:42 +00:00
John Spurlock
747a69965e Merge "Volume: force-dismiss panel when the screen turns off." into lmp-dev 2014-07-24 15:36:51 +00:00
John Spurlock
8c79d2eedd Volume: force-dismiss panel when the screen turns off.
Bug:16492823
Change-Id: Ifc069ef936dc5f29d11f6b11dcc7131f440c7f0b
2014-07-24 15:15:25 -04:00
John Spurlock
8d9e9614dd Merge "QS: Fix clipped battery icon when expanded." into lmp-dev 2014-07-24 15:36:51 +00:00
John Spurlock
2eec8fe5eb QS: Fix clipped battery icon when expanded.
Change-Id: If5ad46b9f25e70af0e13654ce1137955eb87eec2
2014-07-24 12:16:14 -04:00
Wei Wang
82a1cfa4fe Merge "Move AdvertiseData length check to BluetoothAdvertiser." into lmp-dev 2014-07-24 15:36:09 +00:00
Hector Dearman
d49d6bf0cd Merge "Update CookieManager API for Council review." into lmp-dev 2014-07-24 15:36:05 +00:00
Chris Craik
9a89bc6524 Compute layer bounds over subset of VertexBuffer verts
bug:15538815
Change-Id: I0dbb54f656a6ae99a87c5734761107e1c2351b65
2014-07-24 17:49:23 +00:00
Ruben Brunk
1b1f1b611c camera2: Move noise model to dynamic metadata.
Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
2014-07-24 17:43:54 +00:00
Hector Dearman
ffae672881 Update CookieManager API for Council review.
Remove synchronized from setAcceptThirdPartyCookies

Bug: 16403458
Change-Id: I6073da2c03fd0952bc447f7cfe0d959148af6877
2014-07-24 18:10:25 +01:00
Chris Craik
058fc64001 Connect shadow style attributes to renderer
bug:15859361

Moves lighting info out of StatefulBaseRenderer, since it's not useful
at record time, and only used by OGLR.

Change-Id: I7ab065d02d9304afad1dc4c48597a7a621366f8e
2014-07-24 16:41:13 +00:00
Ricardo Cervera
753d849b2a am 0f1e067a: am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811
* commit '0f1e067a28c2ef50d4db53ad19e0902b052bd014':
  docs: Fixed RecyclerView example. Bug: 16483811
2014-07-24 16:22:40 +00:00
Robert Ly
eb355efc1b am 39572996: am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
* commit '39572996f25d4b4ce744d9d04080e33b687ab03b':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
2014-07-24 16:22:29 +00:00
Scott Rowe
fc66190344 am 162493b5: am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
* commit '162493b5e3fb1bbf4505c2d18ebf6c900d7875e6':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
2014-07-24 16:22:15 +00:00
Yorke Lee
feb2b8c0bf Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev 2014-07-24 15:36:09 +00:00
ram
ab458a1858 IMS: Adding ims on/off interface files and callback for enabled/disabled features.
Change-Id: I4e0049d605d9e7d13035c43e2504cdfb67a7a102
2014-07-24 17:36:17 +00:00
Amit Mahajan
0bf65d2d71 Merge "Add API invokeOemRilRequestRaw" into lmp-dev 2014-07-24 15:35:58 +00:00
Svetoslav
b59555ca74 Print to PDF putting a pring job in a wrong state.
When printing to a PDF file we get a Uri from the storage APIs
and write the content. Once the file is written to storage the
print job is completed and there is print service involved. Th
spooler was wrongly putting the job in a failed state instead
of a complete state.

bug:16522267

Change-Id: I4741c9b9eb763e118e7dfb2c7c502bd7fc13f7a1
2014-07-24 17:17:07 +00:00
Steven Liu
3099c83144 Add API invokeOemRilRequestRaw
this API is used by system app, app could communicate with RIL
with it.

Change-Id: I5397c1cf2b108d9dc3a9694b1f071dc60bb5b341

Conflicts:
	telephony/java/com/android/internal/telephony/ITelephony.aidl
2014-07-24 10:15:49 -07:00
Leon Scroggins III
e138eb58f3 Merge "Document BlurMaskFilter.Blur." into lmp-dev 2014-07-24 15:36:02 +00:00
Adrian Roos
723632ea1a Update KeyguardUserSwitcher to use UserSwitcherController
Also wires up the button to expand the keyguard user switcher.
Also respects the EDU simple switcher setting.

Bug: 16043126
Change-Id: I58871ec3323b2cafcacbc747fec5f20c56172969
2014-07-24 15:32:32 +00:00
Yorke Lee
7a5e5726ab Add Calls.TRANSCRIPTION to CallLog (2/2)
Dialer needs access to the TRANSCRIPTION column via the CallLog to
show voicemail transcriptions inline.

Change-Id: Id1807923a07af9e9e34783e6be2e39485eee7795
2014-07-24 08:30:33 -07:00
Selim Cinek
baa2327459 Implemented new camera affordance
Also fixed a bug in the touch logic where you could close the shade / hint
after going to the camera / phone.

Bug: 15126905
Change-Id: Iadfde56cb68f4048868eedec6bd3456f55823cd9
2014-07-24 15:28:10 +00:00