Evan Charlton
fcca6cd019
Merge "Revert "Expose sendEnvelope.""
2014-05-14 22:08:10 +00:00
Evan Charlton
605e4942d6
Merge "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""
2014-05-14 22:07:47 +00:00
Evan Charlton
0082e3302f
Remove obsolete ThirdPartyCall APIs
...
These should have been reverted long ago. Additional cleanup will need
to happen, but this is a good first pass.
Change-Id: I6d3c2919299c0a0b9714ffecd30da68e5c880b6a
2014-05-14 15:05:47 -07:00
Jinsuk Kim
02adbb1506
Merge "Add a new resource for HDMI-CEC logical device type definition"
2014-05-14 22:02:06 +00:00
Dirk Dougherty
f8f018ba5c
am ae4388f7: am 0f582284: am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit 'ae4388f794d3ba4087f65b528eba06d5015c9c9a':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:54:27 +00:00
Dirk Dougherty
e221e7a7fb
Merge "resolved conflices for merge of 93ccd1a2 to master"
2014-05-14 21:52:28 +00:00
Dirk Dougherty
9a6672beb1
resolved conflices for merge of 93ccd1a2 to master
...
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
2014-05-14 14:50:13 -07:00
Sreeram Ramachandran
1fdc902cc5
Merge "Fix reboot loop due to NPE."
2014-05-14 21:48:31 +00:00
David Christie
3c9a0e7928
Merge "Fix typo in comment"
2014-05-14 21:45:44 +00:00
Sreeram Ramachandran
4696ee488b
Fix reboot loop due to NPE.
...
All that's old is new again: http://ag/63748 .
Change-Id: I83df48447dbcb7f6edf02bd07abf721b009afa49
2014-05-14 14:45:00 -07:00
Andrew Lee
4268b243de
Merge "Handle normalization of a "null" phone number."
2014-05-14 21:44:39 +00:00
David Christie
00dc056b61
Fix typo in comment
...
Change-Id: I880385f250d95ad9eea1c39bdf126797177e00a1
2014-05-14 14:28:54 -07:00
Dirk Dougherty
ae4388f794
am 0f582284: am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit '0f5822847ae3422d939a7959f6a25178fcc12232':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:24:29 +00:00
Dirk Dougherty
93ccd1a2eb
am 0540bc37: am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.
...
* commit '0540bc373c84b4ab590708cc9f79c95eeac5114c':
Doc change: Updated content for distribute.
2014-05-14 21:24:24 +00:00
Dirk Dougherty
0f5822847a
am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit '980a285b4c29254fd65b0426256918ae2b5eea85':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:21:23 +00:00
Dirk Dougherty
0540bc373c
am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.
...
* commit 'a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
Doc change: Updated content for distribute.
2014-05-14 21:21:15 +00:00
Dirk Dougherty
980a285b4c
am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit '5eb99943d5cf4ad32c61d94e944c155d1c77a915':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:17:27 +00:00
Dirk Dougherty
a4e6c7d1d4
am 3506ac87: Doc change: Updated content for distribute.
...
* commit '3506ac87c09c0748d92ef594c94365a5d7b07262':
Doc change: Updated content for distribute.
2014-05-14 21:17:22 +00:00
Dirk Dougherty
5eb99943d5
Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
2014-05-14 21:16:31 +00:00
Dirk Dougherty
3506ac87c0
Doc change: Updated content for distribute.
...
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
2014-05-14 14:10:51 -07:00
ztenghui
f11310f395
Check the array before accessing it
...
TODO: Figure out why the path is generating empty polygon.
bug: 14615368
Change-Id: If116e34388b7c6a71bf5ddd36e0c9716d7450732
2014-05-14 21:02:45 +00:00
Evan Charlton
8f402c36cb
Revert "Expose sendEnvelope."
...
This reverts commit 6eac2ee0fc8a652c4cb1e7ca6602a080d4f82dbd.
Change-Id: Ie04a873bb1d4935208e687917e86cbe80312a6d1
2014-05-14 14:02:21 -07:00
Evan Charlton
c0d138ab86
Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."
...
This reverts commit 37384dedab38239433a41641fe87fc3e51bb6976.
2014-05-14 14:01:47 -07:00
Adam Lesinski
f8c940733e
Merge "Fix potential crash in libandroidfw"
2014-05-14 20:30:09 +00:00
Ed Heyl
2cf184233b
merge master nova by hand, skipped translations
...
Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
2014-05-14 13:24:53 -07:00
Andrew Lee
b31c310fcf
Handle normalization of a "null" phone number.
...
Bug: 14900155
Change-Id: I1c4c5c6dec4c4c470b436102c72a7476d3d5237c
2014-05-14 13:00:28 -07:00
Michael Wright
92ddeeab47
Merge "Remove reflection from InputEventConsistencyVerifier ctor."
2014-05-14 19:50:49 +00:00
Michael Wright
fa28b98447
Merge "Only translate prefixed strings to keys / axes."
2014-05-14 19:43:16 +00:00
George Mount
7b75062fb0
Allow changing order of matching Views in Transitions.
...
Bug 14899804
Change-Id: I13c080141fce6be8430d540e3c42d40a445bb224
2014-05-14 12:40:06 -07:00
Chris Wren
154f828365
Merge "Add intrusiveness signal extractor."
2014-05-14 19:30:13 +00:00
Winson Chung
1147c40651
Adding method for applications to query their own tasks. (Bug 14627210)
...
Change-Id: I33299bf59784849171b19af4a5be2ab7665581c5
2014-05-14 12:11:01 -07:00
Adrian Roos
9e317da936
Merge "Fix adaptive auto brightness bugs"
2014-05-14 19:02:18 +00:00
Jae Seo
3c659dea47
Merge "Add more columns to help identify TV channels"
2014-05-14 19:00:52 +00:00
Jerome Poichet
9e4f4040f3
Merge "Adding device name"
2014-05-14 18:57:14 +00:00
Baligh Uddin
f0eead5552
Import translations. DO NOT MERGE
...
Change-Id: Id4e88701137fcf9ab763a6ecc20ab3e8b93c08f7
Auto-generated-cl: translation import
2014-05-14 11:48:00 -07:00
Adam Lesinski
7322ea7b73
Fix potential crash in libandroidfw
...
A malformed APK may cause a crash if it
encodes its chunk size as a signed number
(MSB set to 1).
Bug:14898892
Change-Id: I342853c2b0859e5be15d712d451323afc367d329
2014-05-14 11:46:19 -07:00
Adrian Roos
36f92166fc
Merge "Follow up for "A better auto brightness""
2014-05-14 18:30:01 +00:00
Chris Wren
5190c0fefa
Add intrusiveness signal extractor.
...
Temporarily bump noisy things to the top so the user can find them.
This is the first example of a delayed ranking reconsideration.
Change-Id: I07271ba197101ad462e4f99fb7c369a39c8c2e2f
2014-05-14 14:24:04 -04:00
Adrian Roos
6e2d465b9c
Follow up for "A better auto brightness"
...
Original CL: I62d0695b7da16ffa7a27c465c3b6bc4b1515f9c0
Change-Id: I79c307586c0ba9be275d3920a3805f45b6006ce8
2014-05-14 18:05:54 +00:00
Adrian Roos
6dee605c83
Fix adaptive auto brightness bugs
...
Fix update of the light sensor in AutoBrightnessController.
Register observer for Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ.
Change-Id: I5201259c4efc0afa200fea3ad9fe3af2991d8676
2014-05-14 19:54:16 +02:00
Yongqin Liu
559484ed6a
app_process: change app_process a symlink of primary version
...
Change app_process to be a symlink to the primary version
and have app_process32/app_process64 be the 32-bit/64-bit
versions respectively.
This will make it possible to use the primary zygote for
am/pm commands and other scripts that use app_process and
don't need a specific zygote.
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ibef545994eb95ddc82101c95df613ad1d06345e6
2014-05-14 18:48:42 +01:00
Baligh Uddin
aab161cf2c
Import translations. DO NOT MERGE
...
Change-Id: I443d4950531e7ab7018cb5db1b8316f1b8baaa9e
Auto-generated-cl: translation import
2014-05-14 10:44:46 -07:00
Igor Murashkin
9c595174cc
camera2: Use StreamConfigurationMap for format/size/duration lookup
...
* Also @hide/@deprecate a bunch of other keys
* Move some classes into android.hardware.camera2.params
Bug: 14628001
Change-Id: I2db490a0849680a133a901403477a147b004fb28
2014-05-14 10:40:53 -07:00
John Spurlock
a7e089f28c
Merge "Add QS rotation tile toggle animation."
2014-05-14 17:34:03 +00:00
John Spurlock
444eb2e130
Add QS rotation tile toggle animation.
...
Change-Id: Ic7e6e36759ef17ab35d639d22bbd2f6bf2470272
2014-05-14 13:32:14 -04:00
Justin Koh
1c46c2d784
If there is only 1 simple global action, autolaunch it
...
Requested by UX. Also made settings available before provisioning
Bug: 14683740
Bug: 14886954
Change-Id: If62ccc6472a72b7adb4d309ee89e51069f8e0413
2014-05-14 17:30:32 +00:00
Craig Stout
162043076b
Merge "AlertDialog and AppError themes for TV."
2014-05-14 16:19:51 +00:00
Christoph Studer
ffeb0c3814
Track notification airtime
...
...and write it together with posttime to the
SQLite log.
Bug: 13672846
Change-Id: I605447f89a0c89782a320c298ddb59cbb8994367
2014-05-14 18:00:27 +02:00
Robert Greenwalt
16fa43a28d
Merge "Undeprecate funcs until we're ready for api-review"
2014-05-14 15:56:32 +00:00
Robert Greenwalt
7a91a7434a
Undeprecate funcs until we're ready for api-review
...
Fixing javadoc deprecated tags to fix a checkbuild error breaks the current/api.txt.
We're not ready for the api change yet, so back out the comments.
Change-Id: Ia95e394da7329c1b9e3876e589c3c2137ba18048
2014-05-14 08:55:13 -07:00