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

156752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Taylor
b2e54c1b46 am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '75e7fbaa83448753a1db9647e58693f1a281900c':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:30:23 +00:00
Tom Taylor
75e7fbaa83 am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '37906e6ebc1985ad4b7151116b7cf4fef8322b19':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:23:51 +00:00
Tom Taylor
37906e6ebc am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '44f6d0d5810ce507394cc514481d977315d2496f':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:18:16 +00:00
Sreeram Ramachandran
0f8f120839 Don't use framework permission strings for netd permissions. 
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.

Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
 2014-11-04 10:15:03 -08:00
Scott Kennedy
4b28b1c3f5 am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs 
* commit 'cf57296da6a22bff03eefda7b704787769ad4d37':
  Fix a small typo in a variable name
 2014-11-04 18:12:05 +00:00
Tom Taylor
44f6d0d581 am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:11:02 +00:00
Ricardo Cervera
c190e7ee01 am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs 
* commit 'af002b352ade0d7f9eeff15221f487c3912ebb34':
  docs: Fix the circularReveal example.
 2014-11-04 18:07:11 +00:00
Scott Kennedy
cf57296da6 am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs 
* commit 'd78ce50372ec473b6a895d053f9ffc2956e933ef':
  Fix a small typo in a variable name
 2014-11-04 18:06:32 +00:00
Tom Taylor
4c5b16d740 am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '66aa87ae0355a4e6c8ed56704fec4fb225ed18f6':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:03:07 +00:00
Scott Kennedy
d78ce50372 Merge "Fix a small typo in a variable name" into lmp-docs 2014-11-04 18:01:28 +00:00
Ricardo Cervera
af002b352a am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs 
* commit '61f91724a9375732cd95333921388a3e5a64ac33':
  docs: Fix the circularReveal example.
 2014-11-04 18:00:56 +00:00
Ricardo Cervera
61f91724a9 Merge "docs: Fix the circularReveal example." into lmp-docs 2014-11-04 17:56:22 +00:00
Tom Taylor
66aa87ae03 am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '90743d6409eaecdc869fdcf891ffff8b0a5757ec':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 17:53:14 +00:00
Tom Taylor
db864e4ddc am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '5244937248b7283b5cf586b5637a108579217d4e':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 17:49:26 +00:00
Tom Taylor
90743d6409 am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 17:43:41 +00:00
Tom Taylor
5244937248 am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'bc57a1f81317f765865e3e0c00d3421a3084955e':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 17:42:20 +00:00
Eric Laurent
fe91d4e6a2 Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 2014-11-04 17:02:25 +00:00
Jorim Jaggi
6fd88022c2 Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev 2014-11-04 16:54:12 +00:00
Adrian Roos
e94a84d2a7 Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev 2014-11-04 16:40:38 +00:00
Adrian Roos
261d5ab8f4 Refactor LockSettingsService into storage and logic 
Creates a new LockSettingsStorage class to handle
stroring and retreiving data.

Bug: 18163444
Change-Id: Ia3bc4ad679c5e1217756ae6b3b80cfce3599baed
 2014-11-04 17:38:20 +01:00
John Spurlock
8c4aad505a Merge "QS: Create the tile background once per tile." into lmp-mr1-dev 2014-11-04 16:26:14 +00:00
George Mount
e48ef2a3ef Cancel animation when target changes. 
Bug 18201083

Change-Id: I2ea15063b18881c4b31ae6cdc287649dbc4a61f7
 2014-11-04 07:55:03 -08:00
Griff Hazen
9c95015b0c Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 2014-11-04 15:23:21 +00:00
Rob Tsuk
e6c0bda5dd Merge "Make points drawn with default paint visible" into lmp-mr1-dev 2014-11-04 15:20:00 +00:00
Jorim Jaggi
0cce70c9fa Fix jump in two-finger expand motion with no notifications 
Bug: 18185048
Change-Id: Ib54789e45b7b68a5fc9d6056cb53de23b2be3260
 2014-11-04 16:13:41 +01:00
John Spurlock
31798f17b1 QS: Create the tile background once per tile. 
Bug: 18219320
Change-Id: I15cbb7623c3e81b724fb0c4e830ae4e6615552dc
 2014-11-04 09:41:32 -05:00
Jorim Jaggi
1482b0535e Merge "Update QS tile states after unlocking" into lmp-mr1-dev 2014-11-04 14:31:46 +00:00
Jorim Jaggi
8289301c74 Merge "Always update quick settings header translation in onLayout" into lmp-mr1-dev 2014-11-04 14:27:50 +00:00
Adrian Roos
ad3bc7f878 Fix a keyguard charging status 
Fixes a bug where the keyguard was showing
a charging state even though the device was
not plugged in.

Bug: 18166083
Change-Id: I85a2cda674ffdafb37df70598f4028414a639def
 2014-11-04 14:18:16 +00:00
Adrian Roos
c0f0a74762 Fix low profile bar mode for Material themed apps 
Bug: 17691219
Change-Id: I1b1fb2e831e5d4c41073bb4db0793bf66468c4c4
 2014-11-04 14:16:16 +00:00
John Spurlock
d94017b0c2 Merge "QS: New rotation-lock tile icon, using AVDs." into lmp-mr1-dev 2014-11-04 12:15:10 +00:00
Nicolas Prevot
8da8ab5cf2 Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev 2014-11-04 11:08:19 +00:00
Nicolas Prevot
ac7774e8c1 Merge "Do not fix uris inside the system." into lmp-mr1-dev 2014-11-04 10:47:25 +00:00
Sander Alewijnse
47ffc60578 Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev 2014-11-04 10:24:28 +00:00
Narayan Kamath
78a3b7d5af Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 2014-11-04 09:48:19 +00:00
Mark Renouf
c2a667cc4e am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit '2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae':
 2014-11-04 07:22:48 +00:00
Mark Renouf
5070b63f40 am 2faa0c53: am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours 
* commit '2faa0c532c38cd171b9fa4843cb9ef43621f9f4e':
 2014-11-04 07:22:44 +00:00
kmccormick
0fc93ca3d7 am eac757a8: am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit 'eac757a8a26ed4839aca716845fdec1d6ad0842f':
 2014-11-04 07:22:41 +00:00
Mark Renouf
2750e9ffe1 am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit '4cc7ae80387df1556cd4f2a0db75cf91057f7609':
 2014-11-04 07:18:31 +00:00
Mark Renouf
2faa0c532c am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours 
* commit '066f97e79bce5ac6722f44dcb411f9642c40026c':
 2014-11-04 07:18:28 +00:00
kmccormick
eac757a8a2 am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit 'b2dfaf0ee621642190598b32b5ead861402b32ec':
 2014-11-04 07:18:24 +00:00
Mark Renouf
4cc7ae8038 If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours 
automerge: 01afc37  -s ours

* commit '01afc37403a244e75fbfa385b197d76e476213e8':
 2014-11-04 07:15:18 +00:00
Mark Renouf
066f97e79b Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours 
automerge: ff2e718  -s ours

* commit 'ff2e71830cafe063e876e5a56db0d33a8a5ba679':
 2014-11-04 07:14:17 +00:00
kmccormick
b2dfaf0ee6 am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a 
automerge: 5298190

* commit '5298190a30288d29cb9107d89b00411def3e469b':
 2014-11-04 07:13:11 +00:00
Alan Viverette
b4f8a98176 Default gradient radius to %p when no intrinsic width or height set 
BUG: 18224018
Change-Id: I05cbe3023d0a5e6813658063d3a3633c6ddd8d96
 2014-11-03 18:45:23 -08:00
Dongwon Kang
085329b69a Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev 2014-11-04 02:41:54 +00:00
Alan Viverette
5ecbfeb38b Always update date picker position after change in range 
BUG: 18204507
Change-Id: Id3ae11cdb68f60901a3145ebd93f3acbbccd71d2
 2014-11-03 18:31:36 -08:00
Eric Laurent
adbe8bf85f AudioService: fix wired headset insertion delay. 
Do not systematically delay a device connection
message by 1 second if another message is still in the queue
but calculate delay based on last message insertion time.

Bug: 17882912.

Change-Id: Id86c338488f41eebfa1dfd926032468be0294cec
 2014-11-03 18:26:57 -08:00
Eric Laurent
8befd6fd05 Merge "AudioService: fix cross deadlock" into lmp-mr1-dev 2014-11-04 02:00:32 +00:00
David Friedman
6666f34c9b am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit 'e20e2b9a4863144633bb5ba9d7bedf7d0948c760':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 01:34:05 +00:00