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

178457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Studer
58d080e1a2 am f3528480: am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit 'f35284804b4f04b91d772b913d9a6ae1c8a5f65a':
  Notification: Fix bigLargeIcon
 2014-12-17 15:30:02 +00:00
Christoph Studer
f35284804b am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit '1464dd2f925f4b6179a7ede287f13431e6835aec':
  Notification: Fix bigLargeIcon
 2014-12-17 15:23:48 +00: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
d128a280d7 am 00e2afb7: (-s ours) am 6641a0b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '00e2afb7cf26b231143867e7292a29391c6cfe6e':
  Import translations. DO NOT MERGE
 2014-12-17 15:04:20 +00:00
Geoff Mendal
5846f31a43 am 934f9881: (-s ours) am 63383c96: (-s ours) am 8f0d3694: (-s ours) Import translations. DO NOT MERGE 
* commit '934f9881179158e03774fe1ec70734523d0decaf':
  Import translations. DO NOT MERGE
 2014-12-17 15:04:16 +00:00
Geoff Mendal
00e2afb7cf am 6641a0b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '6641a0b5a21c55d1a69cf19393380517ae2a1e95':
  Import translations. DO NOT MERGE
 2014-12-17 14:57:55 +00:00
Geoff Mendal
934f988117 am 63383c96: (-s ours) am 8f0d3694: (-s ours) Import translations. DO NOT MERGE 
* commit '63383c96a4766182b79412acb7642c4a38c357e6':
  Import translations. DO NOT MERGE
 2014-12-17 14:57:50 +00:00
Geoff Mendal
7fb57f3968 Import translations. DO NOT MERGE 
Change-Id: I7048b2f5e758fb9b6448402c4a8bb8114ddb39dd
Auto-generated-cl: translation import
 2014-12-17 06:56:49 -08: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
20bdd86511 am 05517814: am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev 
* commit '05517814a5dcffecefb84448967bac40f055025a':
  Fix race between CONNECTIVITY_ACTION and setting default network.
 2014-12-17 13:11:21 +00:00
Paul Jensen
05517814a5 am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev 
* commit '24594794cbb9bf6bb9c8b57e4427c88efee82304':
  Fix race between CONNECTIVITY_ACTION and setting default network.
 2014-12-17 13:05:39 +00: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
Nick Chalko
02ce449b70 Merge "Include documentation for a null surface in TvInputService.Session.onSetSurface." 2014-12-17 04:35:16 +00:00
Nick Chalko
922a6f3766 Include documentation for a null surface in TvInputService.Session.onSetSurface. 
Bug: 18718144
Change-Id: I359a918da4ceeb01e44b38e6e82a501c0360e681
 2014-12-16 18:58:14 -08:00
Marvin Paul
2584736f18 Merge "Buffer SettingsBackupAgent checksum writes" 2014-12-17 00:52:26 +00:00
Yorke Lee
899ec23fb6 am 50d8e5b0: am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev 
automerge: 41a42c7

* commit '41a42c73e6b6bc17ae4582c9ecf8d15ba32ca3d0':
  Revert "Allow home to be pressed while in incoming call screen"
 2014-12-17 00:41:01 +00:00
Yorke Lee
41a42c73e6 am 50d8e5b0: am d3836e9d: Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev 
* commit '50d8e5b0c067a532f893889ce58125233a12f7fc':
  Revert "Allow home to be pressed while in incoming call screen"
 2014-12-17 00:38:58 +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
Marvin Paul
6879555723 Buffer SettingsBackupAgent checksum writes 
Reduce SettingsBackupAgent I/O when writing new checksum by wrapping
FileOutputStream in a BufferedOutputStream.

Bug: 18674340

Change-Id: Ia8169445d42d032e24d8a395e678295f67841a65
 2014-12-16 16:27:49 -08: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
Nancy Chen
b59e28cd4b am 799ff2ea: am ab4f36c0: Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev 
automerge: aa4e271

* commit 'aa4e271b9cd9ccfe93d40271f2b04c029d0aeb1f':
  Pass onPostDialChar call back from Telephony to Telecom.
 2014-12-16 23:21:39 +00:00
Nancy Chen
aa4e271b9c am 799ff2ea: am ab4f36c0: Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev 
* commit '799ff2ea099bdedf5b93630c2ab3cc362f022e70':
  Pass onPostDialChar call back from Telephony to Telecom.
 2014-12-16 23:19:25 +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
bdcb0e5265 Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
automerge: 501c710

* commit '501c710ec556571d33d3e73642eff158544639de':
  Fix typo with register native allocation.
 2014-12-16 21:50:16 +00:00
Tim Murray
a9c56a04a8 am 68a81bd8: am 8de16999: Merge "Fix typo with register native allocation." 
automerge: d58370e

* commit 'd58370efc1409b4130b30f82b47f39ee14d502b5':
  Fix typo with register native allocation.
 2014-12-16 21:48:55 +00:00
Tim Murray
501c710ec5 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-12-16 21:43:02 +00:00
Tim Murray
d58370efc1 am 68a81bd8: am 8de16999: Merge "Fix typo with register native allocation." 
* commit '68a81bd8817e997cace3bedf8a013d2cdaff9daa':
  Fix typo with register native allocation.
 2014-12-16 21:42:54 +00:00
Tim Murray
d46f43f276 am fac7bfd6: am 6c02facd: Merge "Fix typo with register native allocation." into lmp-mr1-dev 
* commit 'fac7bfd6e4e6d8484b93afabc7fbd31968693a64':
  Fix typo with register native allocation.
 2014-12-16 21:42:18 +00:00
Tim Murray
68a81bd881 am 8de16999: Merge "Fix typo with register native allocation." 
* commit '8de169993f0078bfdd064499c48b9d124cb438be':
  Fix typo with register native allocation.
 2014-12-16 21:36:43 +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
Tim Murray
8de169993f Merge "Fix typo with register native allocation." 2014-12-16 21:30:58 +00:00
Christopher Tate
4328db5769 am 892e65cb: am 0dab4dc0: Fix bad alarm delivery 
automerge: 7c1f995

* commit '7c1f995b7bf171a1b556dcaa4dc16cf46db853be':
  Fix bad alarm delivery
 2014-12-16 21:15:25 +00:00
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
4a3b5bdc7f am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
automerge: cd69b5a

* commit 'cd69b5a2de1bb130cdc7e8e1761409cd1f98f1c4':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:59:18 +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
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
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
Alexandra Gherghina
de67e27e6b Merge "Fix image conversion" 2014-12-16 20:46:18 +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
e01429cc58 am 15626d3a: am b32a33ce: Merge "Turn debug flag off" 
automerge: a8fe14a

* commit 'a8fe14a2116e68b22aa9f5d9aefb27e373dc4074':
  Turn debug flag off
 2014-12-16 20:38:31 +00:00