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

156333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
d1ec1c4715 am 31e4eeb2: am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit '31e4eeb26f2c843d141f969271cff8e825909788':
  Fix spurious restore session timeouts
 2014-10-16 18:39:32 +00:00
Christopher Tate
31e4eeb26f am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit 'ce39d25f2c5908c3f6067a70b2ab504929e2eb5f':
  Fix spurious restore session timeouts
 2014-10-16 18:34:56 +00:00
Geoff Mendal
a9e131ce28 am c218d8f1: (-s ours) am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c218d8f19881deed098875e2caf41b7ca9e42133':
  Import translations. DO NOT MERGE
 2014-10-16 17:56:38 +00:00
Brian Carlstrom
fe6cde379a am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit '6580c273a51daee08972149f2d2ede8ef6e7a79a':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 17:56:33 +00:00
Geoff Mendal
299c69078b am 551deffb: (-s ours) am fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '551deffb7679e893ee8df750914cdb978bf2afb5':
  Import translations. DO NOT MERGE
 2014-10-16 17:56:28 +00:00
Marco Nelissen
d3a62f1b6e am a2d77ed7: am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit 'a2d77ed7d7abc1cf10fb961dd8a64f3a9e323736':
  Also consider secondary storage when verifying paths
 2014-10-16 17:56:21 +00:00
Dirk Dougherty
07d717affc am 7e4a3aec: am 0cd670b3: am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev 
* commit '7e4a3aecbd9ebc3c91a50eacfe24293811338df9':
  Doc change: Add diffs for API level 21.
 2014-10-16 17:56:16 +00:00
Geoff Mendal
c218d8f198 am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '00e4d7830cc7834efdcec2a35d130cbc89e16551':
  Import translations. DO NOT MERGE
 2014-10-16 17:45:58 +00:00
Brian Carlstrom
6580c273a5 am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 17:45:54 +00:00
Geoff Mendal
551deffb76 am fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'fb0356852dad1daeb673cdf117193a8421f66aaa':
  Import translations. DO NOT MERGE
 2014-10-16 17:45:45 +00:00
Marco Nelissen
a2d77ed7d7 am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '4683a10f9c8c73056e5e1f9748ab9eee701dc3fa':
  Also consider secondary storage when verifying paths
 2014-10-16 17:45:36 +00:00
Dirk Dougherty
7e4a3aecbd am 0cd670b3: am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev 
* commit '0cd670b39be13e1840927694b36d6c61e5c7c1dd':
  Doc change: Add diffs for API level 21.
 2014-10-16 17:45:31 +00:00
Adrian Roos
c344cdc1bb am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 
* commit 'ccb7a9af271836fde98636d9ce6ebbda09eb0158':
  Prevent ChooserActivity from taking over the system bars
 2014-10-16 14:56:40 +00:00
Adrian Roos
ccb7a9af27 Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 2014-10-16 14:54:19 +00:00
George Mount
27a08f2ad5 am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 
* commit 'ea6f0ae86d62cff88d63b926578c588a956d0512':
  Use empty snapshots list when there are no shared elements.
 2014-10-16 14:25:45 +00:00
George Mount
ea6f0ae86d Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 2014-10-16 14:21:43 +00:00
Quddus Chong
e58249f84a am 7ef4ba61: am 073c80d3: am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '7ef4ba61c83871ea02df760729524bfc7c27b8a9':
  docs: Added L API overview.
 2014-10-16 06:49:52 +00:00
Dirk Dougherty
382170af6d am b175ee29: am 41d5d14d: am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit 'b175ee295e4e159ca5ac062f7732a5c785c9133b':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-16 06:49:47 +00:00
Geoff Mendal
08d339fc20 am 7ef55776: (-s ours) am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7ef557764c27efc5766c849b4982c70d05864dfe':
  Import translations. DO NOT MERGE
 2014-10-16 06:49:43 +00:00
Craig Mautner
45e0baf333 am 49bb8cdc: am d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit '49bb8cdc5ecf42bdb66d948a900bee10de1c8323':
  Remove unnecessary logging.
 2014-10-16 06:49:38 +00:00
Eric Rowe
1e684b3ded am ea626e1a: am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit 'ea626e1af8019786d514d3de0b8a1fa274ca424c':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-16 06:49:34 +00:00
Craig Mautner
2ecd9de2d5 am d1bba16d: am 87441860: am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit 'd1bba16da53f927792f489057c1d477b8079876e':
  Move desired task to top if not already there.
 2014-10-16 06:49:29 +00:00
John Spurlock
c824a9d444 am 4f7eee43: am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit '4f7eee438be7e51d7988a2a61123139e74b7b802':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 06:49:24 +00:00
Evan Charlton
e3d3aa3f38 am df88ad0b: am e8a700e9: am 843e2343: Add WindowManager.aidl to AIDL list 
* commit 'df88ad0b81b8b1a6ca76d5961632717165594e9f':
  Add WindowManager.aidl to AIDL list
 2014-10-16 06:49:20 +00:00
RoboErik
5e1b92c054 am 56d8876f: am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit '56d8876f4b9a1a43e4eed0d8b1afff26331cf095':
  Don't call size on a null metadata
 2014-10-16 06:49:16 +00:00
Quddus Chong
7ef4ba61c8 am 073c80d3: am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '073c80d346e053532092efec9c2c12a3a39d2dcd':
  docs: Added L API overview.
 2014-10-16 05:52:08 +00:00
Dirk Dougherty
b175ee295e am 41d5d14d: am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit '41d5d14df218d2711be0b16b0f15ddd4cabf3a4f':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-16 05:52:04 +00:00
Geoff Mendal
7ef557764c am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e134ac1cece66293b31543948fbabc5b7fc64b94':
  Import translations. DO NOT MERGE
 2014-10-16 05:52:01 +00:00
Craig Mautner
49bb8cdc5e am d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit 'd1a58c45fee09c5e599fe173d5055546fe147b03':
  Remove unnecessary logging.
 2014-10-16 05:51:56 +00:00
Eric Rowe
ea626e1af8 am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit 'de96b966fb6c8e0694f3a94fc0f42d64090d4fa0':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-16 05:51:52 +00:00
Craig Mautner
d1bba16da5 am 87441860: am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit '87441860bf4df2da7ce4537ad31c8240547da655':
  Move desired task to top if not already there.
 2014-10-16 05:51:48 +00:00
John Spurlock
4f7eee438b am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit '3d4aec1bb79caea6fadc36a942fb0c0f84a0f4f2':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 05:51:45 +00:00
Evan Charlton
df88ad0b81 am e8a700e9: am 843e2343: Add WindowManager.aidl to AIDL list 
* commit 'e8a700e9f7956333df647eebe5e8c9eb1ea8c12c':
  Add WindowManager.aidl to AIDL list
 2014-10-16 05:51:41 +00:00
RoboErik
56d8876f4b am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit '0dfd86e00656573cdd3e28742e93319c96f6ce15':
  Don't call size on a null metadata
 2014-10-16 05:51:37 +00:00
Christopher Tate
ce39d25f2c am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit '185fcadf898f0fe41461a632177dfd0d7e5dfb70':
  Fix spurious restore session timeouts
 2014-10-16 03:36:34 +00:00
Christopher Tate
185fcadf89 Merge "Fix spurious restore session timeouts" into lmp-dev 2014-10-16 03:29:00 +00:00
Geoff Mendal
00e4d7830c am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c71a7b3cb8eb1565c01caaf231773759ee63b4cf':
  Import translations. DO NOT MERGE
 2014-10-16 01:56:04 +00:00
Brian Carlstrom
d2b824887f am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit '20de619d66a594fd9e6e76a3a2cb79422aef577c':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 01:56:00 +00:00
Geoff Mendal
c1c44c1bff am 79469425: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '79469425a170b9f8af20153078fb20d6400beefa':
  Import translations. DO NOT MERGE
 2014-10-16 01:48:57 +00:00
Geoff Mendal
fb0356852d Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-16 01:48:42 +00:00
Geoff Mendal
a2ac1ade83 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-16 01:48:29 +00:00
Geoff Mendal
ed8fee2e6f Import translations. DO NOT MERGE 
Change-Id: I3cf464b7c94c35965e627353765c4ef649c2a209
Auto-generated-cl: translation import
 2014-10-15 18:47:17 -07:00
Geoff Mendal
062ddcd116 Import translations. DO NOT MERGE 
Change-Id: I245fdc0e9d1b88231970e945521aaf2813a97b44
Auto-generated-cl: translation import
 2014-10-15 18:44:21 -07:00
Geoff Mendal
79469425a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-16 01:43:51 +00:00
Geoff Mendal
750305b534 Import translations. DO NOT MERGE 
Change-Id: I298dbca14148e723e574c299e6ee1d3aebd9b56c
Auto-generated-cl: translation import
 2014-10-15 18:40:57 -07:00
Geoff Mendal
c71a7b3cb8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-16 01:35:18 +00:00
Geoff Mendal
874633e378 Import translations. DO NOT MERGE 
Change-Id: Ifa43307e6081aa5fae63beb7756b583edf936c72
Auto-generated-cl: translation import
 2014-10-15 18:34:07 -07:00
Christopher Tate
0f32717a17 Fix spurious restore session timeouts 
The restore-session idle timeout should not be ticking while we're
doing legitimate restore work.  We now explicitly stop the timeout
ticker [a delayed message on our handler thread] whenever we undertake
a valid restore operation.  The timer is already correctly resumed
when restore operations conclude.

(In practice we need to suspend the timeout tracking at exactly those
times when we're entering the wakelock-protected restore flow.  The
timeout is reestablished when the wakelock is released; this part
is already in the code.)

Bug 17990544

Change-Id: I7318020ce30fd9c35bc3a644f8c101fd3d063c8b
 2014-10-16 01:34:01 +00:00
Alan Viverette
ca66be9e0e am b4a29247: Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 
* commit 'b4a29247ffb58f44e50edad7cf56ffc2ea0d7c6b':
  Set content description on CalendarView day labels
 2014-10-16 01:21:32 +00:00
Alan Viverette
b4a29247ff Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 2014-10-16 01:07:04 +00:00