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

98653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
5429865241 Merge "Reduce TextLayoutCache logging." 2013-01-17 20:56:57 +00:00
Jeff Sharkey
3f32a313db Reduce TextLayoutCache logging. 
Change-Id: I09ae49b0a9708de219b18b00ce5b82ee4a0b2bcd
 2013-01-17 12:53:27 -08:00
Andy McFadden
a81aec78fb am ac5b4040: am 7155becc: am ba92f666: am ee3a1d5e: am 9b6687bb: Fix code snippet 
* commit 'ac5b404053494d766468042ab129419c135e0f06':
  Fix code snippet
 2013-01-17 12:21:12 -08:00
Andy McFadden
ac5b404053 am 7155becc: am ba92f666: am ee3a1d5e: am 9b6687bb: Fix code snippet 
* commit '7155becc05d99fb5ec52734cdef5605ae4a229e1':
  Fix code snippet
 2013-01-17 12:18:43 -08:00
Andy McFadden
7155becc05 am ba92f666: am ee3a1d5e: am 9b6687bb: Fix code snippet 
* commit 'ba92f6666db5ff5614df348bce5c9081b1495955':
  Fix code snippet
 2013-01-17 12:14:24 -08:00
Andy McFadden
ba92f6666d am ee3a1d5e: am 9b6687bb: Fix code snippet 
* commit 'ee3a1d5ecefe3d67df40c53de892b56ddf71bc81':
  Fix code snippet
 2013-01-17 12:11:47 -08:00
Andy McFadden
ee3a1d5ece am 9b6687bb: Fix code snippet 
* commit '9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
  Fix code snippet
 2013-01-17 12:09:40 -08:00
Dirk Dougherty
dde7f84691 am dae2ac6f: am d275891a: am ce15192c: am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit 'dae2ac6f22bd5ab42d54365eedc1ea7dac0db360':
  Doc change: Fix urls to work properly with https.
 2013-01-17 12:01:48 -08:00
Dirk Dougherty
dae2ac6f22 am d275891a: am ce15192c: am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit 'd275891a8aceab307746befcc0be08f4a73e99c2':
  Doc change: Fix urls to work properly with https.
 2013-01-17 11:59:18 -08:00
Dirk Dougherty
d275891a8a am ce15192c: am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit 'ce15192c72a3491f632d8cee89f2f58da1e4e0b6':
  Doc change: Fix urls to work properly with https.
 2013-01-17 11:55:49 -08:00
Elliott Hughes
ec6afcc69a am 8c27d0b3: am 686fad5e: am b1e16f11: Merge "Track a typo fix in hidden libcore API." 
* commit '8c27d0b3093593fe0d2c229ffcc9a35dbaf5fc59':
  Track a typo fix in hidden libcore API.
 2013-01-17 11:34:38 -08:00
Elliott Hughes
ebf724b641 am 2d40f625: (-s ours) Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp 
* commit '2d40f625c457d93cd7fabb0ca8ea360519f40da9':
  DO NOT MERGE Fix build.
 2013-01-17 11:34:23 -08:00
Andy McFadden
9b6687bbc6 Fix code snippet 
One of the examples was incorrect (both here and in the original).

http://b.android.com/42776

Change-Id: I2a218b724f50caf47d5185ef529ae8ab3104794f
 2013-01-17 11:24:02 -08:00
Fabrice Di Meglio
18d9824be0 Fix SystemUI navigation bar recent icon loading in landscape mode 
- load the correct landscape asset when needed (the portrait one was used in
both portrait and landscape modes)

Change-Id: I27d2aad993ee78c5a0c4a5f834e2a7f1f852cfa9
 2013-01-17 10:57:40 -08:00
Elliott Hughes
8c27d0b309 am 686fad5e: am b1e16f11: Merge "Track a typo fix in hidden libcore API." 
* commit '686fad5e2367fe08afe6e219d460be994127fb5e':
  Track a typo fix in hidden libcore API.
 2013-01-17 10:32:00 -08:00
Elliott Hughes
686fad5e23 am b1e16f11: Merge "Track a typo fix in hidden libcore API." 
* commit 'b1e16f11ffd3a391be1a44a352c122b6dad1e8a5':
  Track a typo fix in hidden libcore API.
 2013-01-17 10:28:43 -08:00
Elliott Hughes
b1e16f11ff Merge "Track a typo fix in hidden libcore API." 2013-01-17 18:19:49 +00:00
Elliott Hughes
26df61683a Track a typo fix in hidden libcore API. 
Change-Id: I6fa3c2ef7f4d73bbf6557560e46c7c11bff74a32
 2013-01-17 09:24:47 -08:00
Elliott Hughes
2d40f625c4 Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp 2013-01-17 17:02:50 +00:00
Robert Greenwalt
0f8d155363 Merge "Second pass tying into dns cache per interface" 2013-01-17 16:15:33 +00:00
Junichi Monma
6d191ed994 Added the necessary Harfbuzz scripts for rendering Japanese text correctly. 
bug id : b/8023135

Change-Id: Ie9a69f480026302ff949fdf2b4089e4d95a38fb0
 2013-01-17 16:13:22 +09:00
Michael Wright
1e71010e58 Adds enum value for KEYCODE_ASSIST 
Change-Id: I5ec0563317cee15407429449d790030905be25af
 2013-01-16 19:33:10 -08:00
Dianne Hackborn
2125dd57cc Merge "AppOps: fix nested op tracking, new API to get apps using permissions." 2013-01-17 02:51:11 +00:00
Stephen Hines
4e17a9e671 Actually test fract(float). 
Change-Id: I402c7ea43ea626f9748982919cb3753015df3da7
 2013-01-16 18:50:24 -08:00
Dianne Hackborn
e799175b6b AppOps: fix nested op tracking, new API to get apps using 
permissions.

Change-Id: I20c7bd58febc01d6911a90440867eaacd133c464
 2013-01-16 18:10:40 -08:00
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
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
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