Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,918 Commits 3 Branches 0 Tags
9ea3a401e052dcfb3391c572ae3df300b58552a3
Commit Graph

171918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sreeram Ramachandran
9ea3a401e0 am ebb0bdb0: am 9b32f9a4: am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev 
* commit 'ebb0bdb0f19b4f87f9080e37fb5a7ad540c0ccb2':
  Don't use framework permission strings for netd permissions.
 2014-11-04 22:19:21 +00:00
Sreeram Ramachandran
ebb0bdb0f1 am 9b32f9a4: am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev 
* commit '9b32f9a46687c1f9d720452f8972e43f1d15294b':
  Don't use framework permission strings for netd permissions.
 2014-11-04 22:11:24 +00:00
Sreeram Ramachandran
9b32f9a466 am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev 
* commit '0610ff97f11d37d514ea20fcbd73a96ede3518ce':
  Don't use framework permission strings for netd permissions.
 2014-11-04 22:03:47 +00:00
Sreeram Ramachandran
0610ff97f1 Merge "Don't use framework permission strings for netd permissions." into lmp-mr1-dev 2014-11-04 21:59:23 +00:00
Tom Hudson
a5545d24c7 Merge "Remove status return from all uirenderer::Renderer functions" 2014-11-04 21:05:29 +00:00
Tom Hudson
107843de45 Remove status return from all uirenderer::Renderer functions 
This moves the interface closer to android::Canvas. The only use of
return values was in the OpenGLRenderer subclass; that is replaced
with an internal dirty flag: returned from finish(), checked by
CanvasContext.

This is part of a series of CLs to refactor the Graphics JNI bindings.

BUG:15672762
R=djsollen@google.com,ccraik@google.com

Change-Id: Ifd533eb8839a254b0d3a5d04fc5a2905afdfc89e
 2014-11-04 15:49:44 -05:00
Mike Lockwood
2155e0c83f Merge "Add BluetoothDevice field to BluetoothHeadsetClientCall" 2014-11-04 20:01:38 +00:00
Alan Viverette
12a72ada52 am 954f2567: am 3fff156e: am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev 
* commit '954f2567f90f1fa8b3d3d7d0c426ebd35494e182':
  Pass surface insets from window attributes rather than params
 2014-11-04 19:45:08 +00:00
Alan Viverette
954f2567f9 am 3fff156e: am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev 
* commit '3fff156e13341b0bf818f83d2bb0e9404285dd0c':
  Pass surface insets from window attributes rather than params
 2014-11-04 19:40:08 +00:00
Mike Lockwood
ddbfc9ada1 Add BluetoothDevice field to BluetoothHeadsetClientCall 
Change-Id: I9bc70eb289fdfb64e315e3508ddeef1cb009cc54
 2014-11-04 11:37:24 -08:00
Alan Viverette
3fff156e13 am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev 
* commit '18b055e106d5452ef390716d3ea8d1641a225361':
  Pass surface insets from window attributes rather than params
 2014-11-04 19:34:13 +00:00
Scott Kennedy
0681b7f6ec am af8b1379: am 9f07eb35: am 50567bb1: am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs 
* commit 'af8b13791c1715a8406a66aa19d3a056c2227804':
  Fix a small typo in a variable name
 2014-11-04 19:31:51 +00:00
Ricardo Cervera
461e4429ae am a1b62876: am 9433c87b: am aa743477: am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs 
* commit 'a1b628764e1ff9b15ac3cf707dc0ea40a369c3ab':
  docs: Fix the circularReveal example.
 2014-11-04 19:31:45 +00:00
Alan Viverette
18b055e106 Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev 2014-11-04 19:30:34 +00:00
Alan Viverette
93cad8c4d4 Pass surface insets from window attributes rather than params 
Params only gets set in certain situations, whereas the actual window
attributes always contain the correct surface insets.

BUG: 18214798
Change-Id: Ib5236ccf3f120b26c5abc8671bf29cb3dc269186
 2014-11-04 11:27:19 -08:00
Scott Kennedy
af8b13791c am 9f07eb35: am 50567bb1: am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs 
* commit '9f07eb35037e1780d614d713aa8af80dee8d1ba6':
  Fix a small typo in a variable name
 2014-11-04 19:26:25 +00:00
Ricardo Cervera
a1b628764e am 9433c87b: am aa743477: am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs 
* commit '9433c87b8aca36a4a8fee7de7ccb52c3b705da38':
  docs: Fix the circularReveal example.
 2014-11-04 19:26:16 +00:00
Wale Ogunwale
a9868fbd7b am 2749a5e6: am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit '2749a5e6cec41cbdc019134db6fc96e5283db9b4':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:22:25 +00:00
Scott Kennedy
9f07eb3503 am 50567bb1: am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs 
* commit '50567bb1f047fbed512551534bff6ce017690588':
  Fix a small typo in a variable name
 2014-11-04 19:21:28 +00:00
Ricardo Cervera
9433c87b8a am aa743477: am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs 
* commit 'aa743477137e615ab35b9f6c0d131542cb9c6c41':
  docs: Fix the circularReveal example.
 2014-11-04 19:21:23 +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
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
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
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
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
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
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