159297 Commits

Author SHA1 Message Date
Christoph Studer
3eff1e1f0e am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
* commit '92c411b24eaa787158b19b209050ea35fc5070b6':
  Fix MediaStyle docs mentioning 2 max actions in compact view
2014-12-17 12:22:33 +00:00
Christoph Studer
92c411b24e Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs 2014-12-17 12:16:48 +00:00
Jinsuk Kim
1481a42828 CEC: Pass port ID for set_audio_return_channel
This CL passes a port ID when enabling/disabling ARC in case
there are multiple HDMI ports that support the feature.

Bug: 18781204

Change-Id: I632518132bf07c8ae6f0ff5135429ca719b596b2
2014-12-17 17:29:08 +09:00
Joe Fernandez
ca27fb9711 am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs
* commit '6ff265cc882cd7512efcf4736b014ac27e77e5fe':
  docs: studio revision 21 update
2014-12-17 02:58:28 +00:00
Joe Fernandez
e479dc219f am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
* commit 'f9ea93cdc9791c71f39caeda71d9abc9a91e89d5':
  docs: studio tools help monkey update
2014-12-17 02:58:25 +00:00
Joe Fernandez
93813012c0 am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs
* commit 'b8e29d01fb6c7cbadacfd6ada6625dfdc79ec194':
  docs: help-adt link updates
2014-12-17 02:58:20 +00:00
Sungsoo Lim
d0b09b04b8 am 31d592dc: am cd45de8b: Missing Javadoc update while API review
* commit '31d592dc1cd9825c06c55562884be37f523350b3':
  Missing Javadoc update while API review
2014-12-17 02:40:50 +00:00
Joe Fernandez
6ff265cc88 am df916a89: Merge "docs: studio revision 21 update" into lmp-docs
* commit 'df916a89feba37f8d16bd61101d43be7d1667bf8':
  docs: studio revision 21 update
2014-12-17 02:28:18 +00:00
Joe Fernandez
f9ea93cdc9 am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
* commit '80287e768fd40b61dc4e7b8a0394e1f732805dc9':
  docs: studio tools help monkey update
2014-12-17 02:28:13 +00:00
Joe Fernandez
df916a89fe Merge "docs: studio revision 21 update" into lmp-docs 2014-12-17 02:21:50 +00:00
Joe Fernandez
80287e768f Merge "docs: studio tools help monkey update" into lmp-docs 2014-12-17 02:20:15 +00:00
Joe Fernandez
b8e29d01fb am 740436b6: Merge "docs: help-adt link updates" into lmp-docs
* commit '740436b6767aac4c5409b3c9f42ca2606d5ed124':
  docs: help-adt link updates
2014-12-17 01:55:29 +00:00
Joe Fernandez
740436b676 Merge "docs: help-adt link updates" into lmp-docs 2014-12-17 01:44:22 +00:00
Sungsoo Lim
31d592dc1c am cd45de8b: Missing Javadoc update while API review
* commit 'cd45de8ba336d689500c7a65a6a21611cc73d537':
  Missing Javadoc update while API review
2014-12-17 01:43:16 +00:00
Yorke Lee
d3836e9df4 Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev 2014-12-17 00:17:02 +00:00
Sungsoo Lim
cd45de8ba3 Missing Javadoc update while API review
Bug: 18550989
Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf
(cherry picked from commit 4e389e557efb7806b73d2059d46e2809c1a9f83d)
2014-12-16 23:20:04 +00:00
Nancy Chen
ab4f36c0df Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev 2014-12-16 23:06:29 +00:00
Cheuksan Wang
5cec9203a1 remove actions and calls for the old sms/mms api
BUG: 18005911

Change-Id: Ifb900eb7f8bc03e205ac46d3dfb27e4baaaaf6b8
2014-12-16 13:40:36 -08:00
Tim Murray
6c02facd83 Merge "Fix typo with register native allocation." into lmp-mr1-dev 2014-12-16 21:33:03 +00:00
Jeff Davidson
a20ca67d94 Add global setting for ephemeral network timeout.
Bug: 18637384
Change-Id: I6bde3c9eef12caf2cc51c449abffc1c69f60c17f
2014-12-16 13:30:06 -08:00
Rich Slogar
7749dede45 docs: plugin reference update
Change-Id: Icb7881b990ce49f04d2c09d8b9ebcdb4c3db318e
2014-12-16 13:21:56 -08:00
Christopher Tate
be3206ecdc am 5c3e277f: Fix bad alarm delivery
* commit '5c3e277fb42bd799287936c5aee0d30fbcc7e65c':
  Fix bad alarm delivery
2014-12-16 21:04:56 +00:00
Christopher Tate
0dab4dc03d Fix bad alarm delivery
The man bent over his hourglass,
A programmer of sorts. The day was green.

They said, "You have a blue hourglass,
You do not fire alarms when they're asked."

The man replied, "Alarms as they're asked
are changed within the blue hourglass."

And they said then, "But fire, you must
Alarms beyond us, yet themselves,

Alarms within the blue hourglass
That trigger exactly when they're asked."

 ---

Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0.  That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed.  For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)

Bug 18726690
Bug 18765436

This is a 'git revert' of 81f9882b5aadd6a2289c9f521a06a7af5f35ebf0
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.

(Cherrypick of 5c3e277fb42bd799287936c5aee0d30fbcc7e65c from its
original branch.)

Change-Id: Ib9c3200f7e6bc6fa0c9928ee9db4cfd87f039353
2014-12-16 12:54:49 -08:00
Nancy Chen
27d1c2d148 Pass onPostDialChar call back from Telephony to Telecom.
Add plumbing to alert Telecom every time a character is processed after
the post dial wait state (the processing happens in Telephony).

Bug: 18644688
Change-Id: I487d76aa9c959ca528c6377374aa35c2d0b4a803
2014-12-16 12:53:04 -08:00
Christopher Tate
5c3e277fb4 Fix bad alarm delivery
The man bent over his hourglass,
A programmer of sorts. The day was green.

They said, "You have a blue hourglass,
You do not fire alarms when they're asked."

The man replied, "Alarms as they're asked
are changed within the blue hourglass."

And they said then, "But fire, you must
Alarms beyond us, yet themselves,

Alarms within the blue hourglass
That trigger exactly when they're asked."

 ---

Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0.  That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed.  For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)

Bug 18726690
Bug 18765436

This is a 'git revert' of 81f9882b5aadd6a2289c9f521a06a7af5f35ebf0
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.

Change-Id: I54c763775877de5b6eeb5617544aa6100bb17526
2014-12-16 12:48:47 -08:00
Pavel Zhamaitsiak
ec3f46a5ec Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 2014-12-16 19:27:37 +00:00
Christoph Studer
0bb83b07d1 Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 2014-12-16 18:16:42 +00:00
Tim Murray
c13160a5c1 Fix typo with register native allocation.
bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
2014-12-16 10:13:05 -08:00
Adam Powell
67af29f6d6 Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 2014-12-16 18:01:04 +00:00
Adam Lesinski
f1f179a765 Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev 2014-12-16 17:50:04 +00:00
Omkar Kolangade
827fcb7f8d IMS OMA-DM Intent and ImsReasonInfo Additions
Adding an intent for OMA-DM use case where
the network sends a string error indicating
the device is not provisioned to make calls.
The string the network is expected to send
is added to ImsReasonInfo.

Bug: 18242739
Change-Id: If7f654f834f543523af40b422ea9659c5f0b4de4
2014-12-16 09:48:27 -08:00
ztenghui
d8ce65c9b5 Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 2014-12-16 17:45:02 +00:00
Andre Eisenbach
cd460538a4 Merge "Don't send the onServiceDisconnected callback after close." into lmp-mr1-dev 2014-12-16 17:16:55 +00:00
Adam Lesinski
54de298c01 AAPT: Copy android:revisionCode to Splits
Bug:18706179
Change-Id: I669b56e0b67dd1bfda7749ef433b55af16851154
2014-12-16 09:16:26 -08:00
Jason Monk
052e9b12f5 Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev 2014-12-16 15:44:07 +00:00
Benjamin Franz
c88b6bdcfa Don't send the onServiceDisconnected callback after close.
Bug: 18667402
Change-Id: Ia029fd861d643f6646fb124d76ca2a1d2a1a695a
2014-12-16 15:33:03 +00:00
Sarah Maddox
48f9c8e48c am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs
automerge: 8f0f627

* commit '8f0f627e0e76918a57941c71ad49ea6758f68886':
  docs: Updates lesson 1 of location API training: Get last-known location.
2014-12-16 01:39:00 +00:00
smain@google.com
9af05a6899 am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download
automerge: c21b455

* commit 'c21b4553cbdeb8286a49108ec6059871ad81eba2':
  brute force improve suggestions for sdk download
2014-12-16 01:37:42 +00:00
Rich Slogar
579110887d am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update
automerge: b2a9bd5

* commit 'b2a9bd5e9b1984b8aeda17b0c1477e9190fc171e':
  docs: studio 1.0.1 revision update
2014-12-16 01:36:40 +00:00
smain@google.com
a01e83b266 am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs
automerge: 63ed5e1

* commit '63ed5e1b7736006f8d4ac5b4e60c453e2b26ad81':
  fix distribute nav styles. they were not highlighted correctly.
2014-12-16 01:35:19 +00:00
Joe Fernandez
519fbf3ae7 am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
automerge: d799f75

* commit 'd799f75c6b3adb088372f73967aee6362407e59b':
  docs: uiautomator blog link removal
2014-12-16 01:33:56 +00:00
Joe Fernandez
9a05dee5ec am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs
automerge: 72268ad

* commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7':
  docs: studio basics typo
2014-12-16 01:32:49 +00:00
Luan Nguyen
556ce7f145 am 47efca78: am a854ddfd: docs: Add two new general functionality requirements
automerge: bb01880

* commit 'bb01880e6216c360a4732b02a1becb32520fcf5e':
  docs: Add two new general functionality requirements
2014-12-16 01:30:17 +00:00
Mark Renouf
1302ee3a23 If no display settings are matched, return the first one. DO NOT MERGE
automerge: d3adc51  -s ours

* commit 'd3adc51a1b845e37845af6a885ce7371c2ce252c':
  If no display settings are matched, return the first one. DO NOT MERGE
2014-12-16 01:29:01 +00:00
Brian Carlstrom
a00be9b4d5 Remember failed dexopt to avoid retry
Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9
2014-12-15 15:57:56 -08:00
Jay Shrauner
12b5e504fd Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 2014-12-15 23:56:53 +00:00
ztenghui
d76da520ed Remove 2 sub-tests from the internal test app.
b/18171696

Change-Id: I4c4e96c2d0a8e664d81abb300a8f56c5bbb358cd
2014-12-15 15:47:41 -08:00
Raph Levien
50e9228493 Preserve leading "+" in phone numbers
The normalizeNumber method in PhoneNumberUtils preserves a leading "+"
but only if it's the first character in the string. Thus it gets
dropped if there is leading punctuation such as "(". This patch
preserves the leading "+" as long as it would be the first character
in the normalized phone number.

Bug: 18418335
Change-Id: Ifcb1d3dd6c2943c729f570e7f3c90d1da9ee8b4b
2014-12-15 15:46:17 -08:00
Adam Lesinski
0f0e85a689 Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 2014-12-15 23:35:23 +00:00
Yorke Lee
4f80324540 Revert "Allow home to be pressed while in incoming call screen"
This reverts commit ad84e0637f43311a05e894393be6538909b937fb.

Bug: 18742942
Change-Id: I6c0a1651526a37cca8e27be9fbd36a2f59943366
2014-12-15 23:22:06 +00:00