drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,960 Commits 1 Branch 0 Tags
Commit Graph

161960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
799ff2ea09 am ab4f36c0: Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev 
* commit 'ab4f36c0df73bbe583a16eaa960401fd3f9c0db8':
  Pass onPostDialChar call back from Telephony to Telecom.
 2014-12-16 23:10:45 +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
fac7bfd6e4 am 6c02facd: Merge "Fix typo with register native allocation." into lmp-mr1-dev 
* commit '6c02facd83f1fa1ebf11d9cfda9872232c2d2d15':
  Fix typo with register native allocation.
 2014-12-16 21:36:37 +00: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
Christopher Tate
892e65cb2a am 0dab4dc0: Fix bad alarm delivery 
* commit '0dab4dc03d1daae72bba9d364e15f6055cb339fd':
  Fix bad alarm delivery
 2014-12-16 21:07:54 +00: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
ab4f9976e0 am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 
* commit 'ec3f46a5ec961e7f41d1e0d40e97806e9767bfb3':
  IMS OMA-DM Intent and ImsReasonInfo Additions
 2014-12-16 19:32:24 +00: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
88fb463ea3 am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '0bb83b07d1602c1a99c938471edfc411a47dbffc':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:26:26 +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
91ff85da1a am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 
* commit '67af29f6d642c3c578ee1b5af70dc525955982a5':
  Fix touch intercept bug in ResolverDrawerLayout
 2014-12-16 18:08:34 +00: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
503a4494d6 am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev 
* commit 'f1f179a765b6969ba51574d4a10b0381acb0f945':
  AAPT: Copy android:revisionCode to Splits
 2014-12-16 17:57:07 +00:00
ztenghui
84c7ef8a28 am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 
* commit 'd8ce65c9b5142ff9aeadb4caecd46a4811021d7b':
  Remove 2 sub-tests from the internal test app.
 2014-12-16 17:51:54 +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
f6b62a9d91 am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
* commit 'cd460538a4e00cd36be478b00d298a6e2526528f':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:21:13 +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
b1a280a3ee am 052e9b12: Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev 
* commit '052e9b12f5fc7a1e3ecdd126ca8c07298941f291':
  Add config to handle periodic check of tether provision
 2014-12-16 16:59:44 +00: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
99c5ac9e14 am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627 
* commit '48f9c8e48c5d765afc025c2bda3695d0dd13388e':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 02:00:46 +00:00
smain@google.com
1d97aebdd9 am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455 
* commit '9af05a689964ca2563c038484b385e8dfb58ed3d':
  brute force improve suggestions for sdk download
 2014-12-16 02:00:41 +00:00
Rich Slogar
ccaf3552e6 am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update automerge: b2a9bd5 
* commit '579110887d9d5d21ca8ed0b4179b61de3b876410':
  docs: studio 1.0.1 revision update
 2014-12-16 02:00:36 +00:00
smain@google.com
f912c21e43 am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1 
* commit 'a01e83b2665e32f0ee74ee97b37e12fe1c9ac986':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 02:00:30 +00:00
Joe Fernandez
9a0be7d31d am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75 
* commit '519fbf3ae7dbf27f62321c727e721f29aa89ac92':
  docs: uiautomator blog link removal
 2014-12-16 02:00:24 +00:00
Joe Fernandez
e33b63feec am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad 
* commit '9a05dee5ece7ba9cf3127bac89b0f3ff1d8448b8':
  docs: studio basics typo
 2014-12-16 01:54:09 +00:00
Luan Nguyen
443e57df26 am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880 
* commit '556ce7f145de641e0f920ed3059be5a82eb0bb7b':
  docs: Add two new general functionality requirements
 2014-12-16 01:54:03 +00:00
Mark Renouf
3e4a43e4f5 am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours 
* commit '1302ee3a2338dec77da81deca51811e31f693c09':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 01:53:58 +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
2350c7cb12 am a00be9b4: Remember failed dexopt to avoid retry 
* commit 'a00be9b4d521287fdf4678fb196c3e3a0053c3e4':
  Remember failed dexopt to avoid retry
 2014-12-16 00:55:20 +00:00
Jay Shrauner
59e96ee423 am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 
* commit '12b5e504fd3845fed9c649cf01cd27b84fb6742c':
  Fix NPE in Transport.applyBatch
 2014-12-16 00:55:11 +00:00
Adam Lesinski
465d123464 am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 
* commit '0f0e85a68961e303ac85d31fb36ec8384277349d':
  AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
 2014-12-16 00:54:59 +00:00
Brian Carlstrom
a00be9b4d5 Remember failed dexopt to avoid retry 
Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9
 2014-12-15 15:57:56 -08:00