Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,191 Commits 3 Branches 0 Tags
551deffb7679e893ee8df750914cdb978bf2afb5
Commit Graph

155191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ccb7a9af27 Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 2014-10-16 14:54:19 +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
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
Geoff Mendal
fb0356852d Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-16 01:48:42 +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
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
Alan Viverette
b4a29247ff Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 2014-10-16 01:07:04 +00:00
Alan Viverette
0511023432 Merge "Document Toolbar's vertical alignment strategy" into lmp-mr1-dev 2014-10-16 00:46:24 +00:00
Alan Viverette
8afc90fd71 Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 2014-10-16 00:44:36 +00:00
Marco Nelissen
4683a10f9c am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '36c931b31a15b4ed740c861ec34b7e6573cfd32e':
  Also consider secondary storage when verifying paths
 2014-10-16 00:41:10 +00:00
Marco Nelissen
36c931b31a Merge "Also consider secondary storage when verifying paths" into lmp-dev 2014-10-16 00:38:03 +00:00
Dirk Dougherty
0cd670b39b am a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev 
* commit 'a0b3796d937dff83b5dd94e8f091a36bc9b304dd':
  Doc change: Add diffs for API level 21.
 2014-10-16 00:23:49 +00:00
Adam Powell
19c0a1632f Merge "View measurement optimization" into lmp-mr1-dev 2014-10-16 00:21:29 +00:00
Geoff Mendal
cc29c5ef82 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-16 00:21:26 +00:00
Dirk Dougherty
a0b3796d93 Merge "Doc change: Add diffs for API level 21." into lmp-dev 2014-10-16 00:20:02 +00:00
Alan Viverette
29632521c3 Add style support to PopupMenu, clean up constructor javadoc 
BUG: 18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
 2014-10-15 17:19:30 -07:00
Geoff Mendal
5e14dc8426 Import translations. DO NOT MERGE 
Change-Id: I1232fd67bffa5401e778116a418bbc20902f2723
Auto-generated-cl: translation import
 2014-10-15 17:16:40 -07:00
xinhe
36eaa8690d Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev 2014-10-15 23:41:54 +00:00
Quddus Chong
073c80d346 am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '0a276b9448d907822bee1c3009608694fc480fcc':
  docs: Added L API overview.
 2014-10-15 23:41:23 +00:00
Dirk Dougherty
41d5d14df2 am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit '8ca0f84ea3c6f17e7d0121a87197bfd25f9becfa':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-15 23:41:13 +00:00
Geoff Mendal
e134ac1cec am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e2a1f1cd885ae73fc165f0623697b94668e01c86':
  Import translations. DO NOT MERGE
 2014-10-15 23:41:05 +00:00
Craig Mautner
d1a58c45fe am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit '5d460b88715c8a902eb3930e690ddd1b8d84338f':
  Remove unnecessary logging.
 2014-10-15 23:40:54 +00:00
Eric Rowe
de96b966fb am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit '1b4a728ac689fc63b5b5153e95b8b634f701fcfb':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-15 23:40:40 +00:00
Craig Mautner
87441860bf am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit 'e52791055c855a957cad767dfa9889faae86660c':
  Move desired task to top if not already there.
 2014-10-15 23:40:11 +00:00
John Spurlock
3d4aec1bb7 am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'b2344c81bcf49129d303a2919cfffd7a720c261b':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-15 23:40:07 +00:00
Evan Charlton
e8a700e9f7 am 843e2343: Add WindowManager.aidl to AIDL list 
* commit '843e234318421b320e74bb2d09c3b436d82ee127':
  Add WindowManager.aidl to AIDL list
 2014-10-15 23:39:57 +00:00
RoboErik
0dfd86e006 am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit 'c7be69f1d63bcc8411875ff53e5561f2f4692072':
  Don't call size on a null metadata
 2014-10-15 23:39:29 +00:00
xinhe
6bb21401a4 Sprint: MMS proxy authorization does not include NAI 
Read the NAI from CSIM and pass it to MMS module
Bug:17752727

Change-Id: Ib7f53bed87183bd9e67103c676218b5748be668f
 2014-10-15 16:31:19 -07:00
Quddus Chong
0a276b9448 Merge "docs: Added L API overview." into lmp-dev 2014-10-15 23:26:43 +00:00
Tom Taylor
8bda5cedb7 am 522fe28e: am 6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 
* commit '522fe28e3d8da3d8c094d668071368fdc738e74b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 23:24:54 +00:00
Prashant Malani
1c542181e9 am 0227cebc: am c64522fb: am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
* commit '0227cebcb2faaf364c76b94e4cc5a5c9adcf1528':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-15 23:24:50 +00:00
Ricardo Cervera
257507c4fa am e0cf20b5: am 7e50d970: am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit 'e0cf20b5051dc107d5f905696a948f69272c6c1f':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 23:24:46 +00:00
Luan Nguyen
295d5a76da am faea1ffa: am bff5c193: am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'faea1ffab25ec5164c02881d16909706b8aebed9':
  docs: Android Wear Design fixes
 2014-10-15 23:24:42 +00:00
smain@google.com
d7ce4f5653 am fcebd6c3: am b3994c2e: am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'fcebd6c32069a23f539a860a3f9363893cfed146':
  add the butterbar for L announce to Preview landing page
 2014-10-15 23:24:38 +00:00
smain@google.com
235bc036bc am 24ff6491: am 2912627e: am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '24ff6491f1380a9fe89867bb6202d33bc6185a76':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 23:24:34 +00:00
Geoff Mendal
24d305b910 am 7b5d78f8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '7b5d78f89092852d7f7b2c73d73e2b769ec6dd35':
  Import translations. DO NOT MERGE
 2014-10-15 23:24:23 +00:00
George Mount
7c479f5a01 Use empty snapshots list when there are no shared elements. 
Bug 17964119

Change-Id: Ia2a63e52623d1e4238b0fd4e25d565451e856834
 2014-10-15 16:21:51 -07:00
Tom Taylor
522fe28e3d am 6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 
* commit '6d4f4575463ef5fdcdfbf3118a893ecbdb14a02b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 23:15:26 +00:00