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

98784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
79d59f0968 DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care. 
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03

Conflicts:

	services/java/com/android/server/ServiceWatcher.java
 2013-01-16 17:37:21 -08:00
Sungmin Choi
05a96d11dd fix typo for symbol 
remove duplicated symbol (sliding_layout)

Change-Id: I401de3832328731d554dd4cda991b77b99454579
 2013-01-17 10:25:40 +09:00
Dirk Dougherty
ce15192c72 am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit '4a0f95cffbb9925e95c216aea41f3450885d4061':
  Doc change: Fix urls to work properly with https.
 2013-01-16 16:39:17 -08:00
Dirk Dougherty
4a0f95cffb am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit '3987f6c1793bd44305c491e9b57134a1df285599':
  Doc change: Fix urls to work properly with https.
 2013-01-16 16:37:03 -08:00
Victoria Lease
b2efa40bc3 Merge "Prevent OOM death for services under ServiceWatcher's care." 2013-01-17 00:33:54 +00:00
Dirk Dougherty
3987f6c179 Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 2013-01-17 00:30:09 +00:00
Winson Chung
103bc3342e Merge "Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug 7974275)" 2013-01-17 00:27:24 +00:00
Justin Koh
b16dcd14b5 am 73d94a30: (-s ours) am ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev 
* commit '73d94a30a25aec25e27aa1d0a328f033465461c0':
  Remove doSingleCrunch call DO NOT MERGE
 2013-01-16 16:23:32 -08:00
Victoria Lease
fd08d1ece5 Prevent OOM death for services under ServiceWatcher's care. 
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03
 2013-01-16 16:21:41 -08:00
Justin Koh
73d94a30a2 am ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'ba1992f8e9e50ca58f007ff528d2f6d2c2b18223':
  Remove doSingleCrunch call DO NOT MERGE
 2013-01-16 16:21:28 -08:00
Justin Koh
ba1992f8e9 Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev 2013-01-17 00:11:44 +00:00
Amith Yamasani
5ebefec5bd Merge "Fix test build failure" 2013-01-17 00:10:16 +00:00
Amith Yamasani
45c0924fbb Fix test build failure 
Change-Id: Ic96c2490439a78af2fb92db49b25b67b56954a20
 2013-01-16 16:04:00 -08:00
Dianne Hackborn
a7110fd19a Merge "Fix build." 2013-01-16 23:36:11 +00:00
Dianne Hackborn
9139625aae Fix build. 
Change-Id: I068539623b3b133793fc9b8188d876eca59a8281
 2013-01-16 15:34:35 -08:00
Amith Yamasani
d4fe37bee7 Merge "Rename bindService to bindServiceAsUser to follow convention." 2013-01-16 23:26:30 +00:00
Jeff Sharkey
d05efe727b Merge "Create directory on background thread." 2013-01-16 23:09:48 +00:00
Jeff Sharkey
80b54ded74 Create directory on background thread. 
Bug: 7726949
Change-Id: I707431075055cddb8da2c2bca37e91a846938dce
 2013-01-16 15:07:37 -08:00
Winson Chung
cd6a9ef58c Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug 7974275) 
Change-Id: Icb71d28eb80105757026d7fac530db936b327500
 2013-01-16 15:01:11 -08:00
Jeff Sharkey
b34cbc1f66 Merge "Create screenshot directory if missing." 2013-01-16 23:01:10 +00:00
Justin Koh
3944abbb50 Remove doSingleCrunch call DO NOT MERGE 
Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev.

Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a
 2013-01-16 14:51:29 -08:00
Jeff Sharkey
149e02cb61 Create screenshot directory if missing. 
Also use File to build paths instead of String template.

Bug: 7726949
Change-Id: I9aa0e6a0890c5450fe11e8007f8f4cb2e3287256
 2013-01-16 14:39:20 -08:00
Siva Velusamy
281184fb86 Merge "Support hierarchy viewer commands via DDM" 2013-01-16 22:23:55 +00:00
Amith Yamasani
27b89e6658 Rename bindService to bindServiceAsUser to follow convention. 
This is for the multi-user version of bindService, not the original.

Change-Id: Ib2de35941196accf387b1a276a77e6f9af805ec0
 2013-01-16 12:30:11 -08:00
Derek Sollenberger
49eab2a8ef Update version for serialized view (e.g. Saved Page). 
The update ensures that previous versions are deserialized and
played back using the appropriate version of Skia.

There are companion changes to this in...
  external/skia
  external/webkit

bug: 8019756
Change-Id: I8d6507a82fa9adee94c3cb6ab1eb52bc64e8fa72
 2013-01-16 15:13:59 -05:00
Dianne Hackborn
35654b61e8 More work on App Ops service. 
Implemented reading and writing state to retain information
across boots, API to retrieve state from it, improved location
manager interaction to monitor both coarse and fine access
and only note operations when location data is being delivered
back to app (not when it is just registering to get the data at
some time in the future).

Also implement tracking of read/write ops on contacts and the
call log.  This involved tweaking the content provider protocol
to pass over the name of the calling package, and some
infrastructure in the ContentProvider transport to note incoming
calls with the app ops service.  The contacts provider and call
log provider turn this on for themselves.

This also implements some of the mechanics of being able to ignore
incoming provider calls...  all that is left are some new APIs for
the real content provider implementation to be involved with
providing the correct behavior for query() (return an empty
cursor with the right columns) and insert() (need to figure out
what URI to return).

Change-Id: I36ebbcd63dee58264a480f3d3786891ca7cbdb4c
 2013-01-16 12:11:01 -08:00
Elliott Hughes
e9818ee8df DO NOT MERGE Fix build. 
Looks like a method that won't compile was left behind as part of
a merge conflict resolution.

Change-Id: I75eabc0c626a619a666642c7c685e4ce544095e7
 2013-01-16 11:26:35 -08:00
Scott Kennedy
8a8b047f2d am 2fd47fea: am b61121d2: am ee6f89ff: am 3332aa98: am d7ec742c: docs: Minor typos 
* commit '2fd47fea3299ef122e2bc8dc92a4a628b75dfd68':
  docs: Minor typos
 2013-01-16 10:18:02 -08:00
Scott Main
35909a0879 am 465ef7f2: am 6f8fe8dd: am 841c3491: am ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit '465ef7f2a2b1af43657d83bc1d12b8d646a6e335':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:17:58 -08:00
Scott Main
258d6d74dc am 5c7c1468: am 29502977: am de902da2: docs: put new devbytes playlist on the develop landing 
* commit '5c7c1468f71186488e91fe550777cd16e3e07645':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:17:53 -08:00
Scott Kennedy
2fd47fea32 am b61121d2: am ee6f89ff: am 3332aa98: am d7ec742c: docs: Minor typos 
* commit 'b61121d2a162493e97530fc7a6cbfce47c014b00':
  docs: Minor typos
 2013-01-16 10:15:54 -08:00
Scott Main
465ef7f2a2 am 6f8fe8dd: am 841c3491: am ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit '6f8fe8dd4af55fb45ba9002cb0c36c8818a0b030':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:15:51 -08:00
Scott Main
5c7c1468f7 am 29502977: am de902da2: docs: put new devbytes playlist on the develop landing 
* commit '29502977fc4b4e05868775b9153714d4d6d050c1':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:15:47 -08:00
Scott Kennedy
b61121d2a1 am ee6f89ff: am 3332aa98: am d7ec742c: docs: Minor typos 
* commit 'ee6f89ff9cf08f78af84428102b910dd1275ef2d':
  docs: Minor typos
 2013-01-16 10:13:02 -08:00
Scott Main
6f8fe8dd4a am 841c3491: am ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit '841c3491143e4946586caa7fe7cd4691d044ce62':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:12:59 -08:00
Scott Main
29502977fc am de902da2: docs: put new devbytes playlist on the develop landing 
* commit 'de902da2c1f9e133de69267b5dbb122bce15adbc':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:12:56 -08:00
Scott Kennedy
ee6f89ff9c am 3332aa98: am d7ec742c: docs: Minor typos 
* commit '3332aa985280d7e84c7cb70c33610efdd24873d7':
  docs: Minor typos
 2013-01-16 10:09:46 -08:00
Scott Main
841c349114 am ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit 'ceddf9f8e824573d7e6be4b21edf0ffb89c7c929':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:09:46 -08:00
Scott Kennedy
3332aa9852 am d7ec742c: docs: Minor typos 
* commit 'd7ec742c30be95da4d20930dd5000897bfe3f127':
  docs: Minor typos
 2013-01-16 10:08:08 -08:00
Baligh Uddin
b13e2eb46e Import translations. DO NOT MERGE 
Change-Id: I8798175fdbe28807f866875a002d8bf3e028c66e
Auto-generated-cl: translation import
 2013-01-16 09:54:01 -08:00
Baligh Uddin
2125706d42 Import translations. DO NOT MERGE 
Change-Id: I5583386d09eb83518341b123d6d415ab48b80f18
Auto-generated-cl: translation import
 2013-01-16 09:40:55 -08:00
Siva Velusamy
945bfb6068 Support hierarchy viewer commands via DDM 
Hierarchy Viewer currently interfaces to the host via a socket
opened by ViewServer which resides in the WindowManagerService.
Since this has access to all windows, it is enabled only on
debug builds.

This CL adds necessary support to DDM to handle all the commands
required for Hierarchy Viewer. It only misses two commands that
are sent to the Window Manager (which we don't have access to
from the applications).

A future CL will remove the ViewServer functionality.

Change-Id: I1dae316a00737b0cae4e640ccc97bf9bb1d05973
 2013-01-16 09:13:06 -08:00
Scott Main
de902da2c1 docs: put new devbytes playlist on the develop landing 
Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288
 2013-01-15 20:46:33 -08:00
Dirk Dougherty
4166513f23 Doc change: Fix urls to work properly with https. 
Change-Id: I8bc996dff0a0b44992987f93019a2a5be40430cd
 2013-01-15 19:57:25 -08:00
Scott Kennedy
d7ec742c30 docs: Minor typos 
One of these was mentioned in a comment in external 40435

Change-Id: I70f41214f41a91c716d642fe389ac2d3000175f4
 2013-01-15 19:33:56 -08:00
Kristian Monsen
2d76d4f35c Fix build break in master-chromium 
Include needed headers and sort them correctly.

Change-Id: I8557c98234d86f4d0b105182f4f191a826c9aeb5
 2013-01-15 19:23:21 -08:00
Xia Wang
b6cf3c02de Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." 2013-01-15 18:03:01 -08:00
Xia Wang
b2d98ceb27 Fix image processing test to include all benchmark tests 
-- each test case can be excuted separately
-- add a test case to run all benchmarks.

Change-Id: I3c61dfe50267a6db11bc1895a4f37ed618a9103b
 2013-01-15 18:00:38 -08:00
Sasha Levitskiy
f849124b6b Merge "Removed Throttle Manager as obsolete" 2013-01-15 16:56:30 -08:00
Scott Kennedy
278afa73b2 am 7e553e15: am d50a0383: am ff5b7393: am 39ea055f: am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev 
* commit '7e553e15d9f903f01e7038bd691aaa94e4524b97':
  docs: Another fix for external 42607
 2013-01-15 16:52:14 -08:00