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

172071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Taylor
6209d4e4d8 am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '7c570346082f7f0399614b87f9a4c67d1ae1f1c6':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 19:18:50 +00:00
Scott Kennedy
50567bb1f0 am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs 
* commit '4b28b1c3f579e285b9b030ea1612bf7cb0ef04e1':
  Fix a small typo in a variable name
 2014-11-04 19:16:55 +00:00
Ricardo Cervera
aa74347713 am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs 
* commit 'c190e7ee015202b6bc2be08a3c874efaf42b779f':
  docs: Fix the circularReveal example.
 2014-11-04 19:16:48 +00:00
Wale Ogunwale
2749a5e6ce am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:14:49 +00:00
Tom Taylor
7c57034608 am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '47419a443591ea3c641da8720514e1384dd75440':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 19:14:26 +00:00
Tom Taylor
47419a4435 am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '192a39044290be84a1086a876a9d4ab0571ab97b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 19:08:16 +00:00
Wale Ogunwale
e54553c841 am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit 'd54b578e47fb410c776bb3a4272c2c523153f657':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:06:11 +00:00
Tom Taylor
192a390442 am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '23fb29723c47b2aeb6aecc382a503630a8d8e983':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 19:00:42 +00:00
Wale Ogunwale
d54b578e47 Fix issue #17305377: Don't kill process if it still has tasks. 
We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.

Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.

Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
 2014-11-04 10:59:31 -08:00
Tom Taylor
23fb29723c am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'd7044fe1f12b48cc7ba6803772ec4a2f2fe14c19':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:50:31 +00:00
Tom Taylor
d7044fe1f1 am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'b2e54c1b46c275d017fb5bef17add3eb4c465508':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-04 18:39:38 +00:00
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
daccecb263 am d9764f1c: am 13e4928a: am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 
* commit 'd9764f1c233a3106ce11c4c48fb93b020a1061d4':
  AudioService: fix wired headset insertion delay.
 2014-11-04 17:15:55 +00:00
Eric Laurent
d9764f1c23 am 13e4928a: am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 
* commit '13e4928a49f6e86b5dd8c5a34b38550f110f1e99':
  AudioService: fix wired headset insertion delay.
 2014-11-04 17:09:57 +00:00
Jorim Jaggi
ae39f3b2a8 am a8cee180: am 534495c7: am 6fd88022: Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev 
* commit 'a8cee1800ccaac46c1d16091bc1a25209d193cd3':
  Fix jump in two-finger expand motion with no notifications
 2014-11-04 17:08:02 +00:00
Eric Laurent
13e4928a49 am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 
* commit 'fe91d4e6a2ef4e51910965ea258f91c14f5ee0dc':
  AudioService: fix wired headset insertion delay.
 2014-11-04 17:06:18 +00:00
Jorim Jaggi
a8cee1800c am 534495c7: am 6fd88022: Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev 
* commit '534495c7a98b7d35d9859f663522bd6af047b4dd':
  Fix jump in two-finger expand motion with no notifications
 2014-11-04 17:03:07 +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
534495c7a9 am 6fd88022: Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev 
* commit '6fd88022c286730b6f17917dff2d9dd2d74bbfee':
  Fix jump in two-finger expand motion with no notifications
 2014-11-04 16:58:23 +00:00
Adrian Roos
bb89d8499d am 7515c186: am a5dd432c: am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev 
* commit '7515c1866772384d3d5f561f6639d8b037998647':
  Refactor LockSettingsService into storage and logic
 2014-11-04 16:54:22 +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
7515c18667 am a5dd432c: am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev 
* commit 'a5dd432c088487374c08395aed98c7eacdfa791a':
  Refactor LockSettingsService into storage and logic
 2014-11-04 16:50:28 +00:00
Adrian Roos
a5dd432c08 am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev 
* commit 'e94a84d2a78edd9f1b92d69aca361bc3affc1cfe':
  Refactor LockSettingsService into storage and logic
 2014-11-04 16:45:49 +00:00
Adrian Roos
e94a84d2a7 Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev 2014-11-04 16:40:38 +00:00
John Spurlock
e0e5453048 am fbca0e84: am df80f1c9: am 8c4aad50: Merge "QS: Create the tile background once per tile." into lmp-mr1-dev 
* commit 'fbca0e845501a0c3d0f1da9a36a9cf881f2f8ab9':
  QS: Create the tile background once per tile.
 2014-11-04 16:38:54 +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
fbca0e8455 am df80f1c9: am 8c4aad50: Merge "QS: Create the tile background once per tile." into lmp-mr1-dev 
* commit 'df80f1c92be7446895b98f28e1c1d7c7649ba399':
  QS: Create the tile background once per tile.
 2014-11-04 16:34:15 +00:00
John Spurlock
df80f1c92b am 8c4aad50: Merge "QS: Create the tile background once per tile." into lmp-mr1-dev 
* commit '8c4aad505a0034b89abbdd7e11c18ffe11756c5f':
  QS: Create the tile background once per tile.
 2014-11-04 16:30:01 +00: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
Griff Hazen
f7936df688 am 472b990a: am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '472b990ae11f4ae4c16d90cbb02e9efa868db382':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:37:00 +00:00
Griff Hazen
472b990ae1 am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '07e8b2fb7409f0893d13a6cfb4687ba70b220e91':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:33:17 +00:00
Rob Tsuk
0d00b27ecf am 6bd8d825: am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit '6bd8d825b29fa4db3046644f36c2256a5d0600e0':
  Make points drawn with default paint visible
 2014-11-04 15:32:41 +00:00
Rob Tsuk
6bd8d825b2 am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit 'c4aea977cd35c423132382cf0ae1f3238e2c7d10':
  Make points drawn with default paint visible
 2014-11-04 15:29:10 +00:00
Griff Hazen
07e8b2fb74 am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '9c95015b0ccaa02b97b4c96950e2b07e6a5a7b4e':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:28:14 +00:00
Rob Tsuk
c4aea977cd am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit 'e6c0bda5dd945f3668b4108c49ee52f1a04253d6':
  Make points drawn with default paint visible
 2014-11-04 15:23:59 +00:00