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
Brian Carlstrom
20de619d66 Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 2014-10-16 01:01:26 +00:00
Alan Viverette
c07241cab3 am 05110234: Merge "Document Toolbar\'s vertical alignment strategy" into lmp-mr1-dev 
* commit '0511023432ff24c5ddda563e326273936b5d40f5':
  Document Toolbar's vertical alignment strategy
 2014-10-16 00:52:29 +00:00
Alan Viverette
205a5e69cc am 8afc90fd: Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 
* commit '8afc90fd715457033ca70dae3cd53377957d8b94':
  Add style support to PopupMenu, clean up constructor javadoc
 2014-10-16 00:52:24 +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
Adam Powell
f8c7d87a65 am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev 
* commit '19c0a1632f3be67c8cbbee210cd6d8eedfe3649a':
  View measurement optimization
 2014-10-16 00:28:16 +00:00
Geoff Mendal
c892fb1860 am cc29c5ef: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'cc29c5ef825a45cc106ef9891930a9cb52036d13':
  Import translations. DO NOT MERGE
 2014-10-16 00:28:11 +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
1a352f4f6b am 36eaa869: Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev 
* commit '36eaa8690da761a4218a790e18858e4319ffa8d0':
  Sprint: MMS proxy authorization does not include NAI
 2014-10-15 23:49:13 +00: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
Tom Taylor
a5c4507c7d am 8bda5ced: am 522fe28e: am 6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 
* commit '8bda5cedb750912afec65940a53f4ba4ed31ec17':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 23:33:26 +00:00
Prashant Malani
84dd2ec66d am 1c542181: am 0227cebc: am c64522fb: am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
* commit '1c542181e93a4ff6e2b29272237beda1583732f9':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-15 23:33:22 +00:00
Ricardo Cervera
908e1ad44b am 257507c4: am e0cf20b5: am 7e50d970: am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '257507c4fac1a0e99b9f2d7630a46d5555659ea7':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 23:33:17 +00:00
Luan Nguyen
e1c0784473 am 295d5a76: am faea1ffa: am bff5c193: am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit '295d5a76dad948ef03721deb0023ba8483901e57':
  docs: Android Wear Design fixes
 2014-10-15 23:33:12 +00:00
smain@google.com
6512c697ac am d7ce4f56: am fcebd6c3: am b3994c2e: am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'd7ce4f5653d9fddcb150660143a0a07fb4627e01':
  add the butterbar for L announce to Preview landing page
 2014-10-15 23:33:07 +00:00
smain@google.com
abde6dee74 am 235bc036: am 24ff6491: am 2912627e: am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '235bc036bc31870814e6c57bd72182953186f07b':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 23:33:02 +00:00
Geoff Mendal
79e468605e am 24d305b9: (-s ours) am 7b5d78f8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '24d305b9100701b44b1f200c1478b3a7cce0ea6e':
  Import translations. DO NOT MERGE
 2014-10-15 23:32:57 +00:00
Libin.Tang@motorola.com
4798bca274 am 0499bb5d: IMS:change enhanced 4g setting to store in setting db. 
* commit '0499bb5de45cf5542db7ac42406cd856d3386f1f':
  IMS:change enhanced 4g setting to store in setting db.
 2014-10-15 23:32:52 +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
Prashant Malani
0227cebcb2 am c64522fb: am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
* commit 'c64522fb2e1893c21b1b1cc9051a3d1013c5d987':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-15 23:14:27 +00:00
Ricardo Cervera
e0cf20b505 am 7e50d970: am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '7e50d9706cd0d7cd5c58c976fd582c81478a975c':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 23:14:24 +00:00
Luan Nguyen
faea1ffab2 am bff5c193: am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'bff5c1932c6bdd2a777b4236f9f1d562a53029fb':
  docs: Android Wear Design fixes
 2014-10-15 23:14:17 +00:00
smain@google.com
fcebd6c320 am b3994c2e: am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'b3994c2e58c7cebef8274ff6d801819a2b189183':
  add the butterbar for L announce to Preview landing page
 2014-10-15 23:14:12 +00:00
smain@google.com
24ff6491f1 am 2912627e: am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '2912627e007b95cf4b16c9e52a3acbec0c8bae60':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 23:14:07 +00:00