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

156234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Libin.Tang@motorola.com
0499bb5de4 IMS:change enhanced 4g setting to store in setting db. 
Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
 2014-10-15 16:12:39 -07:00
Geoff Mendal
7b5d78f890 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-15 22:38:39 +00:00
Geoff Mendal
90a1bd0769 Import translations. DO NOT MERGE 
Change-Id: I77f88b9cd7716f3dc5e432f943d015860018858a
Auto-generated-cl: translation import
 2014-10-15 15:19:49 -07:00
Geoff Mendal
ae3010b5ca Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-15 22:16:36 +00:00
Geoff Mendal
61dd94f71c am 512c2330: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '512c2330c652c56996bf3ef63ddad242752cebcd':
  Import translations. DO NOT MERGE
 2014-10-15 22:10:15 +00:00
Geoff Mendal
95d6d8c585 Import translations. DO NOT MERGE 
Change-Id: Ia14afe9895bf88d66edcadaed7885994c3a2a846
Auto-generated-cl: translation import
 2014-10-15 15:09:43 -07:00
Geoff Mendal
512c2330c6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-15 22:02:00 +00:00
Geoff Mendal
718ba70f6e Import translations. DO NOT MERGE 
Change-Id: I5026d19ec972e3853cbb858a56b4b80cd3ca82c5
Auto-generated-cl: translation import
 2014-10-15 14:59:09 -07:00
Alan Viverette
274d24f18d am b70cfb91: Merge "Avoid saveLayer in RippleDrawable if the background won\'t draw" into lmp-mr1-dev 
* commit 'b70cfb9103b02e90409ba1f1bc334210f139774f':
  Avoid saveLayer in RippleDrawable if the background won't draw
 2014-10-15 21:21:59 +00:00
Alan Viverette
b70cfb9103 Merge "Avoid saveLayer in RippleDrawable if the background won't draw" into lmp-mr1-dev 2014-10-15 21:18:00 +00:00
Jay Shrauner
60841fcb7b am 9e18d7ab: Merge "Remove unused onConferenceWith method" into lmp-mr1-dev 
* commit '9e18d7ab70eb581200afe0abbd1bb6e32f9e135d':
  Remove unused onConferenceWith method
 2014-10-15 20:52:52 +00:00
Andrew Lee
2cd596c6a2 am 4ef72f85: Merge "Add helper method for checking phone capabilities." into lmp-mr1-dev 
* commit '4ef72f85e0b5a8b9efac301577106afa4a8fd17a':
  Add helper method for checking phone capabilities.
 2014-10-15 20:52:44 +00:00
Jay Shrauner
9e18d7ab70 Merge "Remove unused onConferenceWith method" into lmp-mr1-dev 2014-10-15 19:59:19 +00:00
Andrew Lee
4ef72f85e0 Merge "Add helper method for checking phone capabilities." into lmp-mr1-dev 2014-10-15 19:29:57 +00:00
Tom Taylor
6d4f457546 Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 2014-10-15 19:20:36 +00:00
Prashant Malani
c64522fb2e am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
* commit '645e017ca54e654c34b131235e90589a7d92ce0c':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-15 19:12:33 +00:00
Ricardo Cervera
7e50d9706c am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit 'dc1f308048a732572fae3cf92ddfe5cd943c0059':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 19:12:26 +00:00
Luan Nguyen
bff5c1932c am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'c07a288a889ac88282118d4089e969f20c1aabe3':
  docs: Android Wear Design fixes
 2014-10-15 19:12:18 +00:00
smain@google.com
b3994c2e58 am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
  add the butterbar for L announce to Preview landing page
 2014-10-15 19:12:05 +00:00
smain@google.com
2912627e00 am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 19:11:43 +00:00
Nancy Chen
68a4192126 am 00bc5cf8: am 9faf13b4: Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 
* commit '00bc5cf896814f55db4dd27be72fe26bc48a0d0b':
  Add API method to extract subscription ID from phone account (1/3)
 2014-10-15 18:55:06 +00:00
Nancy Chen
00bc5cf896 am 9faf13b4: Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 
* commit '9faf13b47467916897cf5c019a3a74df871b8f65':
  Add API method to extract subscription ID from phone account (1/3)
 2014-10-15 18:50:38 +00:00
Jay Shrauner
2ec53ebbc6 Remove unused onConferenceWith method 
Never part of public API

Bug:17860628
Change-Id: Ib7c4f4c402bd29d82cc0b9e1f496496ea86efce1
 2014-10-15 11:48:04 -07:00
Nancy Chen
9faf13b474 Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 2014-10-15 18:47:03 +00:00
Jim Miller
1a02efb124 am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit 'ce711c6d57732c3582da0828c0361f55381f4223':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:37:06 +00:00
Jim Miller
ce711c6d57 am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:31:32 +00:00