Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,796 Commits 3 Branches 0 Tags
3c0abd408797a960f29575fe173011b87dc4ddf3
Commit Graph

161796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Studer
3c0abd4087 am e326af3c: am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs automerge: 4328588 
* commit 'e326af3cdba9f8e2a1a8626dc48524410d84e6fa':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 17:50:04 +00:00
Joe Fernandez
fa7d86a115 am e8ce10da: am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs automerge: ca27fb9 
* commit 'e8ce10dac8db89387d83554a8e3909cec560536a':
  docs: studio revision 21 update
 2014-12-17 17:49:59 +00:00
Joe Fernandez
425663b5a0 am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs automerge: e479dc2 
automerge: c79d5e2

* commit 'c79d5e29de3ba4259e3c87650c77c3e87507cab0':
  docs: studio tools help monkey update
 2014-12-17 17:48:33 +00:00
Joe Fernandez
a5142ca4d4 am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs automerge: 9381301 
* commit '85787187fca274303412a48e1fa91f7e7388ce94':
  docs: help-adt link updates
 2014-12-17 17:44:30 +00:00
Sungsoo Lim
c502394816 am 47aafcd6: am 31d592dc: am cd45de8b: Missing Javadoc update while API review automerge: d0b09b0 
* commit '47aafcd66c9c703fcfd301ec850e433f40e4b190':
  Missing Javadoc update while API review
 2014-12-17 17:44:25 +00:00
Christopher Tate
6f3be11181 am 52ab8613: am 5c3e277f: Fix bad alarm delivery automerge: be3206e 
* commit '52ab8613ea2556ad9dd5c786e0cf43eb5a4e24c9':
  Fix bad alarm delivery
 2014-12-17 17:44:21 +00:00
Christoph Studer
e326af3cdb am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs 
automerge: 4328588

* commit '4328588cb532571c3b11867048d0972ff2e4d969':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 17:43:33 +00:00
Joe Fernandez
e8ce10dac8 am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs 
automerge: ca27fb9

* commit 'ca27fb9711f24df8b88a41c8a360f57c7252ba79':
  docs: studio revision 21 update
 2014-12-17 17:42:19 +00:00
Joe Fernandez
c79d5e29de am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs 
automerge: e479dc2

* commit 'e479dc219ff4d289105e32264c1fa66187aa5555':
  docs: studio tools help monkey update
 2014-12-17 17:40:58 +00:00
Joe Fernandez
85787187fc am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs 
automerge: 9381301

* commit '93813012c0be63a4cbcdf9e076323fd4afd6dfb7':
  docs: help-adt link updates
 2014-12-17 17:39:45 +00:00
Sungsoo Lim
47aafcd66c am 31d592dc: am cd45de8b: Missing Javadoc update while API review 
automerge: d0b09b0

* commit 'd0b09b04b8c2bf666b15fcc1c496d6ab33c44a86':
  Missing Javadoc update while API review
 2014-12-17 17:37:53 +00:00
Christopher Tate
52ab8613ea am 5c3e277f: Fix bad alarm delivery 
automerge: be3206e

* commit 'be3206ecdce7aead184e8939a29ac7dd5f91931e':
  Fix bad alarm delivery
 2014-12-17 17:36:46 +00:00
Geoff Mendal
2e2fd473be Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-17 16:25:14 +00:00
Geoff Mendal
2a68115a48 Import translations. DO NOT MERGE 
Change-Id: I9e2ca7deb58492b7f2271715536eaaa945d21ec2
Auto-generated-cl: translation import
 2014-12-17 07:39:09 -08:00
Geoff Mendal
13f57b848c am 0de82370: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '0de823704d94d9e9e5cceccf4573afed4fd66b28':
  Import translations. DO NOT MERGE
 2014-12-17 15:28:03 +00:00
Geoff Mendal
0de823704d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-17 15:22:30 +00:00
Geoff Mendal
e333ef546e Import translations. DO NOT MERGE 
Change-Id: I52f334af6fd23d7e74c142dafe7bb431604602e5
Auto-generated-cl: translation import
 2014-12-17 07:18:42 -08:00
Christoph Studer
1464dd2f92 am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit '0b22e395d24cba14d4113fb326bfcb57c6aa5996':
  Notification: Fix bigLargeIcon
 2014-12-17 15:18:31 +00:00
Christoph Studer
0b22e395d2 Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 2014-12-17 15:14:03 +00:00
Geoff Mendal
6641a0b5a2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-17 14:53:39 +00:00
Geoff Mendal
63383c96a4 am 8f0d3694: (-s ours) Import translations. DO NOT MERGE 
* commit '8f0d3694f667263df6bed7b1c89df3911145437c':
  Import translations. DO NOT MERGE
 2014-12-17 14:51:23 +00:00
Geoff Mendal
c8be182061 Import translations. DO NOT MERGE 
Change-Id: I23edfacad6257591c34c9af3b18e6ed03d3e80e4
Auto-generated-cl: translation import
 2014-12-17 06:50:55 -08:00
Geoff Mendal
8f0d3694f6 Import translations. DO NOT MERGE 
Change-Id: Ib6806ea69f69ba66b4dc09a46b6e86d0ace3e734
Auto-generated-cl: translation import
 2014-12-17 06:44:29 -08:00
Paul Jensen
24594794cb am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev 
* commit 'b0575a24df6bc840d720dafa6e737cdd61fb2c6f':
  Fix race between CONNECTIVITY_ACTION and setting default network.
 2014-12-17 12:59:29 +00:00
Paul Jensen
b0575a24df Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev 2014-12-17 12:54:16 +00:00
Christoph Studer
4328588cb5 am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs 
* commit '3eff1e1f0e685e1dbb7e2621f5a8ab51a1c321d7':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 12:28:14 +00:00
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
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
50d8e5b0c0 am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev 
* commit 'd3836e9df4ee0b22dd115e96abe976730263129d':
  Revert "Allow home to be pressed while in incoming call screen"
 2014-12-17 00:30:26 +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 4e389e557e)
 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
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
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
81f9882b5a.  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 81f9882b5a
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.

(Cherrypick of 5c3e277fb4 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