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

172155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
af53bfd06e am efd8a85d: Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev 
* commit 'efd8a85d30c35ca4a274835f10e371289bb9bc5e':
  Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService
 2014-11-04 22:37:03 +00:00
Tom Hudson
ed83a47d13 Merge "Replace StatefulBaseRenderer inheritance with CanvasState member" 2014-11-04 22:33:00 +00:00
Adam Lesinski
efd8a85d30 Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev 2014-11-04 22:32:31 +00:00
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
Tom Hudson
984162fb7e Replace StatefulBaseRenderer inheritance with CanvasState member 
Incrementally disentangles DisplayListRenderer and OpenGLRenderer.
Introduces abstract CanvasStateClient class to share three functions
between the two.

Design doc at https://docs.google.com/a/google.com/document/d/1PY1JF7AfPEF2UOUAnETS5j_4_tnJShTAMExvpCJfP8o/edit?usp=sharing.

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

Change-Id: Ic9fdffe18808e7d921ad06d01ea1ca25b2ad6f23
 2014-11-04 17:16:36 -05: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
RoboErik
131e63adaa Add extras to the PlaybackState 
This allows apps to include extras that are atomic with play state
changes.

bug:18189125
bug:18103891
Change-Id: Ia3bc5b0dcf29960cb70e2ff3a67ec1fdd48b7a5a
 2014-11-04 13:47:45 -08:00
Adam Lesinski
32e580604d Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService 
- Forgot to increment loop variable :S

Bug:18239732
Change-Id: Ie37a83584d7849108dbfd3bd4cbb595520d488b1
 2014-11-04 13:38:46 -08:00
RoboErik
566c1ed18f Add setRatingType to MediaSession 
This was missing in L. Needed to tell controllers how to rate content.

bug:18051829
Change-Id: I26e662ff04f77ed7f2922bf9e74acf74c850547b
 2014-11-04 13:14:19 -08: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
Bryce Lee
55e846d4a2 Add config to control going to sleep when entering theater mode. 
Bug: 18241209
Change-Id: I7fa29d92391b1c8ab74585008d6599fd7174cc61
 2014-11-04 12:43:44 -08: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
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
Jeff Davidson
161977998f Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED. 
This is necessary/desired for two reasons:

1. UX around network scoring shipped with L despite lacking underlying
platform support. We do not want network scoring applications to
trigger this UX on L devices, and therefore we must break the contract
of what defines a network scorer so that apps build against the new
contract don't trigger the old UX.

2. As a start towards generalizing the term "score" for a potentially
broader role in the future, though that role is very much undefined.

Bug: 18160480
Change-Id: If228977513e32e45bc44dbeda24aa18436fdfca6
 2014-11-04 10:55:49 -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