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

171796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
7c1f995b7b am 892e65cb: am 0dab4dc0: Fix bad alarm delivery 
* commit '892e65cb2ac4b4917b41060300bbaa3414233394':
  Fix bad alarm delivery
 2014-12-16 21:13:25 +00:00
Christopher Tate
892e65cb2a am 0dab4dc0: Fix bad alarm delivery 
* commit '0dab4dc03d1daae72bba9d364e15f6055cb339fd':
  Fix bad alarm delivery
 2014-12-16 21:07:54 +00:00
Ying Wang
cd69b5a2de am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
* commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:57:35 +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
Ying Wang
49b2f00acf am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
* commit 'c80c12dda9c1ce11affdccb2923b2e570daacfcd':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:50:58 +00:00
Ying Wang
c80c12dda9 Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 2014-12-16 20:46:17 +00:00
Ying Wang
34db51cdd7 Cleanup Obsolete LOCAL_PRELINK_MODULE. 
Bug: 18675947
Change-Id: If4909c5f8495136d381b289a3d55e811313abccc
 2014-12-16 12:45:49 -08:00
Christopher Tate
a8fe14a211 am 15626d3a: am b32a33ce: Merge "Turn debug flag off" 
* commit '15626d3a493b5eb4c1fecb73f8d4fc18547c4c13':
  Turn debug flag off
 2014-12-16 20:34:37 +00:00
Pavel Zhamaitsiak
4abd09f773 am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev 
* commit 'ab4f9976e0cade0009223681ecc5ff49df160dd7':
  IMS OMA-DM Intent and ImsReasonInfo Additions
 2014-12-16 19:37:15 +00: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
2bd62b53b6 am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:31:53 +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
Adam Powell
ea12691338 am 91ff85da: am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev 
* commit '91ff85da1a2a106c8ddb5e204928e0d6ef094283':
  Fix touch intercept bug in ResolverDrawerLayout
 2014-12-16 18:13:01 +00: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 Lesinski
915f44e1ee am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev 
* commit '503a4494d64d30f9b904b24a56fff986810da610':
  AAPT: Copy android:revisionCode to Splits
 2014-12-16 18:02:09 +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
8a23b3820d am 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev 
* commit '84c7ef8a28d321e190d4d3f9a0c91ee5ae41bf9a':
  Remove 2 sub-tests from the internal test app.
 2014-12-16 17:56:51 +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
7ea97e28e6 am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
* commit 'f6b62a9d913441cb400fc60f3187fc9c1f28dc97':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:27:46 +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
b8ba4719c1 am b1a280a3: am 052e9b12: Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev 
* commit 'b1a280a3ee38af72c6eed10ec9763f1202e63dd8':
  Add config to handle periodic check of tether provision
 2014-12-16 17:05:10 +00: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
Christopher Tate
15626d3a49 am b32a33ce: Merge "Turn debug flag off" 
* commit 'b32a33cec1bf54ba3fc243c1fbab59a98506c0ef':
  Turn debug flag off
 2014-12-16 03:03:11 +00:00
Christopher Tate
b32a33cec1 Merge "Turn debug flag off" 2014-12-16 02:53:13 +00:00
Sarah Maddox
91a41ac173 am 99c5ac9e: 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 '99c5ac9e14db60abb8186c4737803b4cf90c1dc0':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 02:31:39 +00:00
smain@google.com
eb9a46075f am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455 
* commit '1d97aebdd96105fd0b24587406acbedec451a5ad':
  brute force improve suggestions for sdk download
 2014-12-16 02:31:34 +00:00
Rich Slogar
f44fdaedbf am ccaf3552: am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update automerge: b2a9bd5 
* commit 'ccaf3552e62bb7ef2373bd4c282d275a209b7d91':
  docs: studio 1.0.1 revision update
 2014-12-16 02:31:29 +00:00
smain@google.com
b1eb5c97d6 am f912c21e: am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1 
* commit 'f912c21e4325c87798ae6930ca734fb18636f9e5':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 02:31:23 +00:00
Joe Fernandez
11341c4d32 am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75 
* commit '9a0be7d31da7c340fd1f5b57c9e1527726697fcc':
  docs: uiautomator blog link removal
 2014-12-16 02:31:17 +00:00
Joe Fernandez
d6bba15c03 am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad 
* commit 'e33b63feecf6dc76db716c8064f5a21c751b81d7':
  docs: studio basics typo
 2014-12-16 02:23:24 +00:00
Luan Nguyen
56102be892 am 443e57df: am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880 
* commit '443e57df26077652d35b4e294e4a5ed3cd6030b3':
  docs: Add two new general functionality requirements
 2014-12-16 02:23:17 +00:00
Mark Renouf
990d605733 am 3e4a43e4: am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours 
* commit '3e4a43e4f5bbf273dcaef049a2c0c1574c62fc82':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 02:23:11 +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