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

163291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
58c64870a8 Merge "Typo fixed in sample code" into klp-modular-docs 2014-10-16 14:34:47 +00:00
George Mount
56789daadf am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 
* commit '27a08f2ad547934280b626aee9c60dd3a597e6da':
  Use empty snapshots list when there are no shared elements.
 2014-10-16 14:29:51 +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
Neil Fuller
06965cfd12 am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math" 
* commit '8a3785cafec4b47fe8d61614b04a0e193d616428':
  Replacing FloatMath native implementation with calls to Math
 2014-10-16 09:35:43 +00:00
Neil Fuller
8a3785cafe am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math" 
* commit 'fd2d41b742339d278f4a66f78a7c161108985ed8':
  Replacing FloatMath native implementation with calls to Math
 2014-10-16 09:24:18 +00:00
Lorenzo Colitti
d04d6c91a3 am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 
* commit 'b7d8514822aefbf8274f5464dc12cee151e2b78b':
  Allow root and system to bypass the always-on VPN firewall rules
 2014-10-16 09:23:24 +00:00
Lorenzo Colitti
ffd7335088 am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev 
* commit '917c547beb9adecf2e7d2b355e85e37c2557c5d3':
  Don't make lockdown VPN source firewall rules over-broad.
 2014-10-16 09:23:21 +00:00
Lorenzo Colitti
24f9a26cea am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 
* commit '28dcf0345b2857884c1f1639fadb720318445187':
  Propagate network state changes to the LockdownVpnTracker.
 2014-10-16 09:23:17 +00:00
Lorenzo Colitti
b7d8514822 Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 2014-10-16 08:46:10 +00:00
Lorenzo Colitti
917c547beb Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-dev 2014-10-16 08:45:03 +00:00
Lorenzo Colitti
28dcf0345b Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 2014-10-16 08:37:28 +00:00
Neil Fuller
fd2d41b742 Merge "Replacing FloatMath native implementation with calls to Math" 2014-10-16 08:16:24 +00:00
Quddus Chong
9847ff5a54 am e58249f8: am 7ef4ba61: am 073c80d3: am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit 'e58249f84a4b8b66b178db909106489ad16d77e9':
  docs: Added L API overview.
 2014-10-16 06:55:23 +00:00
Dirk Dougherty
d7ad7a1428 am 382170af: am b175ee29: am 41d5d14d: am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit '382170af6d904efe463cd32a3c392ccf678e787c':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-16 06:55:17 +00:00
Geoff Mendal
4464aab3ad am 08d339fc: (-s ours) am 7ef55776: (-s ours) am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '08d339fc20711ad1105c6f9b87b0bcb276ee7db1':
  Import translations. DO NOT MERGE
 2014-10-16 06:55:13 +00:00
Craig Mautner
e341572ecb am 45e0baf3: am 49bb8cdc: am d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit '45e0baf333c7015456f610631e4fa11d54345aa4':
  Remove unnecessary logging.
 2014-10-16 06:55:08 +00:00
Eric Rowe
39350dc0d3 am 1e684b3d: am ea626e1a: am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit '1e684b3ded150281bea80f67fdfd3a87035a9e74':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-16 06:55:02 +00:00
Craig Mautner
215e2b0f4b am 2ecd9de2: am d1bba16d: am 87441860: am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit '2ecd9de2d5c43101fe86f9479710bab99bf9f3d6':
  Move desired task to top if not already there.
 2014-10-16 06:54:57 +00:00
John Spurlock
d20db2832e am c824a9d4: am 4f7eee43: am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'c824a9d444bf3a7df5f9003bd839fd609130be9e':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 06:54:52 +00:00
Evan Charlton
7468bb98d5 am e3d3aa3f: am df88ad0b: am e8a700e9: am 843e2343: Add WindowManager.aidl to AIDL list 
* commit 'e3d3aa3f38a798a55396d9a9431982085868a3c3':
  Add WindowManager.aidl to AIDL list
 2014-10-16 06:54:47 +00:00
RoboErik
a56d6c3192 am 5e1b92c0: am 56d8876f: am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit '5e1b92c054551708c8652530830f859613d666e4':
  Don't call size on a null metadata
 2014-10-16 06:54:42 +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
Geoff Mendal
386b225600 am c1c44c1b: (-s ours) am 79469425: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c1c44c1bff8fcdc12b6815c87b5615dae31f9a9f':
  Import translations. DO NOT MERGE
 2014-10-16 03:33:49 +00:00
Geoff Mendal
f2932c2f86 am a2ac1ade: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a2ac1ade830e71a4806186f5226bb9f956f668fb':
  Import translations. DO NOT MERGE
 2014-10-16 03:33:40 +00:00
Christopher Tate
185fcadf89 Merge "Fix spurious restore session timeouts" into lmp-dev 2014-10-16 03:29:00 +00:00
David Friedman
778d3552d6 OpenGL 3.1 and AEP documentation for L-release. 
Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
 2014-10-15 19:59:43 -07:00
Alan Viverette
bba4bcf0b1 am ca66be9e: am b4a29247: Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 
* commit 'ca66be9e0ef691a4c8ccd5c7da7e07e618e9bb85':
  Set content description on CalendarView day labels
 2014-10-16 02:37:32 +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