OSDN Git Service
Robert Ly [Fri, 18 Jan 2013 18:39:34 +0000 (10:39 -0800)]
am
3e7959ab: am
dbdf8767: am
5287cd74: am
6d59e0ea: am
a239b933: am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
3e7959ab4d5215002a96e1a43c232d2d8885bf62':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:37:11 +0000 (10:37 -0800)]
am
dbdf8767: am
5287cd74: am
6d59e0ea: am
a239b933: am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
dbdf8767e24d5d5ecc7a1751a103150676a4aa86':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:34:11 +0000 (10:34 -0800)]
am
5287cd74: am
6d59e0ea: am
a239b933: am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
5287cd7476e0096f5f36866f81b47950343e4155':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:31:48 +0000 (10:31 -0800)]
am
6d59e0ea: am
a239b933: am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
6d59e0ead242978eff8a64d314a1f8554694d8a6':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:28:41 +0000 (10:28 -0800)]
am
a239b933: am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
a239b933f7982ed069ccd284b4eab0fb5e4b6505':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:23:29 +0000 (10:23 -0800)]
am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
548e17dfdbd862cdfc663268a6d67b47f42b9544':
docs: Add PageTransformer to animations training class
Robert Ly [Fri, 18 Jan 2013 18:20:29 +0000 (18:20 +0000)]
Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
Satoshi Kataoka [Fri, 18 Jan 2013 07:05:20 +0000 (23:05 -0800)]
am
2d43bf6b: Merge "Ensure that the input method dialog is dismissed when changing the hardware keyboard state."
* commit '
2d43bf6ba587e1754828b72371832eb89cbdf13b':
Ensure that the input method dialog is dismissed when changing the hardware keyboard state.
Satoshi Kataoka [Fri, 18 Jan 2013 07:03:31 +0000 (07:03 +0000)]
Merge "Ensure that the input method dialog is dismissed when changing the hardware keyboard state."
Satoshi Kataoka [Fri, 18 Jan 2013 04:44:37 +0000 (13:44 +0900)]
Ensure that the input method dialog is dismissed when changing the hardware keyboard state.
Change-Id: I51882ecd2b1a12116f43afff7c23454164a6272b
Jeff Sharkey [Fri, 18 Jan 2013 02:48:22 +0000 (18:48 -0800)]
am
5a0252da: Merge changes Ib8b18f1b,I0d799d82,Ia6222322
* commit '
5a0252da779a98b98c0ef5053c2d20b7bd66de34':
Always give ContentResolver a valid Context.
Define failed connections column, and reset.
Add method to get process group.
Jeff Sharkey [Fri, 18 Jan 2013 02:44:47 +0000 (02:44 +0000)]
Merge changes Ib8b18f1b,I0d799d82,Ia6222322
* changes:
Always give ContentResolver a valid Context.
Define failed connections column, and reset.
Add method to get process group.
Jeff Sharkey [Fri, 18 Jan 2013 02:18:22 +0000 (18:18 -0800)]
Always give ContentResolver a valid Context.
Also add MockContentResolver constructor to provide a Context, and
move to singleton ActivityThread, since there is only one inside
each process. This makes ActivityThread accessible from threads like
InstrumentationThread.
Change-Id: Ib8b18f1b9bba8820ff412d782a43511066eabf24
Jeff Sharkey [Fri, 18 Jan 2013 01:27:33 +0000 (17:27 -0800)]
Define failed connections column, and reset.
When retrying a download, always reset the failed connections count.
Bug:
8022478
Change-Id: I0d799d82dc7a04fe788b8c5faee0045d1e1a9c60
Romain Guy [Thu, 17 Jan 2013 23:50:17 +0000 (15:50 -0800)]
am
b12db26f: Merge "Implement clipRect with a transform, clipRegion & clipPath Bug #
7146141"
* commit '
b12db26fec178794915d819c3dd64f13d788c461':
Implement clipRect with a transform, clipRegion & clipPath Bug #
7146141
Romain Guy [Thu, 17 Jan 2013 23:47:24 +0000 (23:47 +0000)]
Merge "Implement clipRect with a transform, clipRegion & clipPath Bug #
7146141"
Romain Guy [Wed, 16 Jan 2013 02:51:42 +0000 (18:51 -0800)]
Implement clipRect with a transform, clipRegion & clipPath
Bug #
7146141
When non-rectangular clipping occurs in a layer the render buffer
used as the stencil buffer is not cached. If this happens on a
View's hardware layer the render buffer will live for as long
as the layer is bound to the view. When a stencil buffer is
required because of a call to Canvas.saveLayer() it will be allocated
on every frame. A future change will address this problem.
If "show GPU overdraw" is enabled, non-rectangular clips are not
supported anymore and we fall back to rectangular clips instead.
This is a limitation imposed by OpenGL ES that cannot be worked
around at this time.
This change also improves the Matrix4 implementation to easily
detect when a rect remains a rect after transform.
Change-Id: I0e69fb901792d38bc0c4ca1bf9fdb02d7db415b9
Roman Nurik [Wed, 9 Jan 2013 16:35:53 +0000 (08:35 -0800)]
docs: Add PageTransformer to animations training class
Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1
Fabrice Di Meglio [Thu, 17 Jan 2013 23:11:56 +0000 (15:11 -0800)]
am
d859e708: Merge "Fix SystemUI navigation bar recent icon loading in landscape mode"
* commit '
d859e7088ad3e529f322b346ea5fb84e1a07d9ed':
Fix SystemUI navigation bar recent icon loading in landscape mode
Fabrice Di Meglio [Thu, 17 Jan 2013 23:09:13 +0000 (23:09 +0000)]
Merge "Fix SystemUI navigation bar recent icon loading in landscape mode"
Jeff Sharkey [Thu, 17 Jan 2013 22:12:41 +0000 (14:12 -0800)]
Add method to get process group.
Change-Id: Ia62223228a54a6a4e3cdfc5c2e8c73ee194e77ef
Daniel Sandler [Thu, 17 Jan 2013 21:41:10 +0000 (13:41 -0800)]
am
c51d96a9: Merge "Stop redrawing the nav bar any time you touch the screen."
* commit '
c51d96a95b3d1454a9fdc831ff3deb02c5150f0d':
Stop redrawing the nav bar any time you touch the screen.
Daniel Sandler [Thu, 17 Jan 2013 21:38:46 +0000 (21:38 +0000)]
Merge "Stop redrawing the nav bar any time you touch the screen."
Baligh Uddin [Thu, 17 Jan 2013 21:33:28 +0000 (13:33 -0800)]
am
ccb9f5b6: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
ccb9f5b66ee64f60aeed422f73b3b9a5da6a01e7':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jan 2013 21:30:28 +0000 (21:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Jan 2013 21:28:51 +0000 (13:28 -0800)]
am
611c8a89: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
611c8a8900c5a8b5e4bfa4ab5ad2c0b4bb0f9fd2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jan 2013 21:26:15 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into master-chromium
Baligh Uddin [Thu, 17 Jan 2013 21:22:30 +0000 (21:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Daniel Sandler [Thu, 17 Jan 2013 21:02:36 +0000 (16:02 -0500)]
Stop redrawing the nav bar any time you touch the screen.
Bug:
7297091
Change-Id: I77659b9c4677cd01eccb85aaeeb6d8bf5ec9c9d5
Jeff Sharkey [Thu, 17 Jan 2013 21:00:10 +0000 (13:00 -0800)]
am
54298652: Merge "Reduce TextLayoutCache logging."
* commit '
5429865241f1e63f52fbbcf5d97fcca0ec68e793':
Reduce TextLayoutCache logging.
Jeff Sharkey [Thu, 17 Jan 2013 20:56:57 +0000 (20:56 +0000)]
Merge "Reduce TextLayoutCache logging."
Jeff Sharkey [Thu, 17 Jan 2013 20:53:04 +0000 (12:53 -0800)]
Reduce TextLayoutCache logging.
Change-Id: I09ae49b0a9708de219b18b00ce5b82ee4a0b2bcd
Andy McFadden [Thu, 17 Jan 2013 20:25:01 +0000 (12:25 -0800)]
Andy McFadden [Thu, 17 Jan 2013 20:21:12 +0000 (12:21 -0800)]
Andy McFadden [Thu, 17 Jan 2013 20:18:43 +0000 (12:18 -0800)]
Andy McFadden [Thu, 17 Jan 2013 20:14:24 +0000 (12:14 -0800)]
Andy McFadden [Thu, 17 Jan 2013 20:11:47 +0000 (12:11 -0800)]
am
ee3a1d5e: am
9b6687bb: Fix code snippet
* commit '
ee3a1d5ecefe3d67df40c53de892b56ddf71bc81':
Fix code snippet
Andy McFadden [Thu, 17 Jan 2013 20:09:40 +0000 (12:09 -0800)]
am
9b6687bb: Fix code snippet
* commit '
9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
Fix code snippet
Dirk Dougherty [Thu, 17 Jan 2013 20:03:33 +0000 (12:03 -0800)]
am
dde7f846: 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 '
dde7f8469143cb32e0f924a0d138ca448ab3468f':
Doc change: Fix urls to work properly with https.
Dirk Dougherty [Thu, 17 Jan 2013 20:01:48 +0000 (12:01 -0800)]
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.
Dirk Dougherty [Thu, 17 Jan 2013 19:59:18 +0000 (11:59 -0800)]
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.
Dirk Dougherty [Thu, 17 Jan 2013 19:55:49 +0000 (11:55 -0800)]
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.
Elliott Hughes [Thu, 17 Jan 2013 19:39:56 +0000 (11:39 -0800)]
am
ec6afcc6: am
8c27d0b3: am
686fad5e: am
b1e16f11: Merge "Track a typo fix in hidden libcore API."
* commit '
ec6afcc69ae35a0b1f22f44a70fbe4ce5a17be41':
Track a typo fix in hidden libcore API.
Elliott Hughes [Thu, 17 Jan 2013 19:39:53 +0000 (11:39 -0800)]
am
ebf724b6: (-s ours) am
2d40f625: (-s ours) Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
* commit '
ebf724b6414bc92e5e034b31ef1a81d9beb05cd7':
DO NOT MERGE Fix build.
Elliott Hughes [Thu, 17 Jan 2013 19:34:38 +0000 (11:34 -0800)]
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.
Elliott Hughes [Thu, 17 Jan 2013 19:34:23 +0000 (11:34 -0800)]
am
2d40f625: (-s ours) Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
* commit '
2d40f625c457d93cd7fabb0ca8ea360519f40da9':
DO NOT MERGE Fix build.
Andy McFadden [Tue, 15 Jan 2013 20:26:04 +0000 (12:26 -0800)]
Fix code snippet
One of the examples was incorrect (both here and in the original).
http://b.android.com/42776
Change-Id: I2a218b724f50caf47d5185ef529ae8ab3104794f
Fabrice Di Meglio [Thu, 17 Jan 2013 18:57:40 +0000 (10:57 -0800)]
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
Elliott Hughes [Thu, 17 Jan 2013 18:32:00 +0000 (10:32 -0800)]
am
686fad5e: am
b1e16f11: Merge "Track a typo fix in hidden libcore API."
* commit '
686fad5e2367fe08afe6e219d460be994127fb5e':
Track a typo fix in hidden libcore API.
Elliott Hughes [Thu, 17 Jan 2013 18:28:43 +0000 (10:28 -0800)]
am
b1e16f11: Merge "Track a typo fix in hidden libcore API."
* commit '
b1e16f11ffd3a391be1a44a352c122b6dad1e8a5':
Track a typo fix in hidden libcore API.
Elliott Hughes [Thu, 17 Jan 2013 18:19:49 +0000 (18:19 +0000)]
Merge "Track a typo fix in hidden libcore API."
Elliott Hughes [Thu, 17 Jan 2013 17:24:47 +0000 (09:24 -0800)]
Track a typo fix in hidden libcore API.
Change-Id: I6fa3c2ef7f4d73bbf6557560e46c7c11bff74a32
Robert Greenwalt [Thu, 17 Jan 2013 17:08:33 +0000 (09:08 -0800)]
am
0f8d1553: Merge "Second pass tying into dns cache per interface"
* commit '
0f8d155363c361199a9d9aa5dcdbc4088990f893':
Second pass tying into dns cache per interface
Junichi Monma [Thu, 17 Jan 2013 17:08:30 +0000 (09:08 -0800)]
am
6d191ed9: Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
* commit '
6d191ed99491f209168e88f3d570e89c6836285b':
Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
Dianne Hackborn [Thu, 17 Jan 2013 17:08:27 +0000 (09:08 -0800)]
am
2125dd57: Merge "AppOps: fix nested op tracking, new API to get apps using permissions."
* commit '
2125dd57cc3c1c43da9793a2ee4bb8a7bf19f083':
AppOps: fix nested op tracking, new API to get apps using permissions.
Victoria Lease [Thu, 17 Jan 2013 17:08:22 +0000 (09:08 -0800)]
am
b2efa40b: Merge "Prevent OOM death for services under ServiceWatcher\'s care."
* commit '
b2efa40bc37bc83410ef38652f708ea7ef6ab845':
Prevent OOM death for services under ServiceWatcher's care.
Elliott Hughes [Thu, 17 Jan 2013 17:02:37 +0000 (17:02 +0000)]
Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
Robert Greenwalt [Thu, 17 Jan 2013 16:15:28 +0000 (16:15 +0000)]
Merge "Second pass tying into dns cache per interface"
Junichi Monma [Thu, 17 Jan 2013 07:13:22 +0000 (16:13 +0900)]
Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
bug id : b/
8023135
Change-Id: Ie9a69f480026302ff949fdf2b4089e4d95a38fb0
Dianne Hackborn [Thu, 17 Jan 2013 02:51:09 +0000 (02:51 +0000)]
Merge "AppOps: fix nested op tracking, new API to get apps using permissions."
Dianne Hackborn [Thu, 17 Jan 2013 01:56:46 +0000 (17:56 -0800)]
AppOps: fix nested op tracking, new API to get apps using
permissions.
Change-Id: I20c7bd58febc01d6911a90440867eaacd133c464
Dirk Dougherty [Thu, 17 Jan 2013 00:39:17 +0000 (16:39 -0800)]
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.
Dirk Dougherty [Thu, 17 Jan 2013 00:37:03 +0000 (16:37 -0800)]
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.
Victoria Lease [Thu, 17 Jan 2013 00:33:17 +0000 (00:33 +0000)]
Merge "Prevent OOM death for services under ServiceWatcher's care."
Winson Chung [Thu, 17 Jan 2013 00:31:22 +0000 (16:31 -0800)]
am
103bc334: Merge "Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)"
* commit '
103bc3342efe2a8a9a3a26f2e115bd1b58e0ed77':
Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)
Dirk Dougherty [Thu, 17 Jan 2013 00:30:09 +0000 (00:30 +0000)]
Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
Winson Chung [Thu, 17 Jan 2013 00:27:19 +0000 (00:27 +0000)]
Merge "Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)"
Justin Koh [Thu, 17 Jan 2013 00:25:38 +0000 (16:25 -0800)]
am
b16dcd14: (-s ours) am
73d94a30: (-s ours) am
ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
* commit '
b16dcd14b5d4bb44cdb4bdab04f2fa59bef3f524':
Remove doSingleCrunch call DO NOT MERGE
Justin Koh [Thu, 17 Jan 2013 00:23:32 +0000 (16:23 -0800)]
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
Victoria Lease [Wed, 16 Jan 2013 20:51:04 +0000 (12:51 -0800)]
Prevent OOM death for services under ServiceWatcher's care.
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03
Justin Koh [Thu, 17 Jan 2013 00:21:28 +0000 (16:21 -0800)]
am
ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
* commit '
ba1992f8e9e50ca58f007ff528d2f6d2c2b18223':
Remove doSingleCrunch call DO NOT MERGE
Amith Yamasani [Thu, 17 Jan 2013 00:13:34 +0000 (16:13 -0800)]
am
5ebefec5: Merge "Fix test build failure"
* commit '
5ebefec5bdb99a646e338997617d46e3ae0162ed':
Fix test build failure
Justin Koh [Thu, 17 Jan 2013 00:11:44 +0000 (00:11 +0000)]
Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
Amith Yamasani [Thu, 17 Jan 2013 00:10:16 +0000 (00:10 +0000)]
Merge "Fix test build failure"
Amith Yamasani [Thu, 17 Jan 2013 00:04:00 +0000 (16:04 -0800)]
Fix test build failure
Change-Id: Ic96c2490439a78af2fb92db49b25b67b56954a20
Dianne Hackborn [Wed, 16 Jan 2013 23:39:47 +0000 (15:39 -0800)]
Dianne Hackborn [Wed, 16 Jan 2013 23:35:39 +0000 (23:35 +0000)]
Merge "Fix build."
Dianne Hackborn [Wed, 16 Jan 2013 23:34:35 +0000 (15:34 -0800)]
Fix build.
Change-Id: I068539623b3b133793fc9b8188d876eca59a8281
Amith Yamasani [Wed, 16 Jan 2013 23:30:21 +0000 (15:30 -0800)]
am
d4fe37be: Merge "Rename bindService to bindServiceAsUser to follow convention."
* commit '
d4fe37bee7c7433f32c23cee100c6e05ba0f3b2b':
Rename bindService to bindServiceAsUser to follow convention.
Amith Yamasani [Wed, 16 Jan 2013 23:26:30 +0000 (23:26 +0000)]
Merge "Rename bindService to bindServiceAsUser to follow convention."
Jeff Sharkey [Wed, 16 Jan 2013 23:18:09 +0000 (15:18 -0800)]
am
d05efe72: Merge "Create directory on background thread."
* commit '
d05efe727b61e321a6c2720166988d52629c050c':
Create directory on background thread.
Jeff Sharkey [Wed, 16 Jan 2013 23:09:27 +0000 (23:09 +0000)]
Merge "Create directory on background thread."
Jeff Sharkey [Wed, 16 Jan 2013 23:07:37 +0000 (15:07 -0800)]
Create directory on background thread.
Bug:
7726949
Change-Id: I707431075055cddb8da2c2bca37e91a846938dce
Jeff Sharkey [Wed, 16 Jan 2013 23:03:26 +0000 (15:03 -0800)]
am
b34cbc1f: Merge "Create screenshot directory if missing."
* commit '
b34cbc1f663ab59a693abfb4dba0d66799fdd456':
Create screenshot directory if missing.
Winson Chung [Wed, 16 Jan 2013 22:59:18 +0000 (14:59 -0800)]
Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)
Change-Id: Icb71d28eb80105757026d7fac530db936b327500
Jeff Sharkey [Wed, 16 Jan 2013 23:00:56 +0000 (23:00 +0000)]
Merge "Create screenshot directory if missing."
Justin Koh [Wed, 16 Jan 2013 22:51:29 +0000 (14:51 -0800)]
Remove doSingleCrunch call DO NOT MERGE
Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev.
Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a
Jeff Sharkey [Wed, 16 Jan 2013 22:38:49 +0000 (14:38 -0800)]
Create screenshot directory if missing.
Also use File to build paths instead of String template.
Bug:
7726949
Change-Id: I9aa0e6a0890c5450fe11e8007f8f4cb2e3287256
Siva Velusamy [Wed, 16 Jan 2013 22:26:05 +0000 (14:26 -0800)]
am
281184fb: Merge "Support hierarchy viewer commands via DDM"
* commit '
281184fb86a1866b3e8f8a0d8b38a1aa934849dc':
Support hierarchy viewer commands via DDM
Siva Velusamy [Wed, 16 Jan 2013 22:23:39 +0000 (22:23 +0000)]
Merge "Support hierarchy viewer commands via DDM"
Amith Yamasani [Wed, 16 Jan 2013 20:30:11 +0000 (12:30 -0800)]
Rename bindService to bindServiceAsUser to follow convention.
This is for the multi-user version of bindService, not the original.
Change-Id: Ib2de35941196accf387b1a276a77e6f9af805ec0
Dianne Hackborn [Wed, 16 Jan 2013 20:14:53 +0000 (12:14 -0800)]
am
35654b61: More work on App Ops service.
* commit '
35654b61e8fe7bc85afcb076ddbb590d51c5865f':
More work on App Ops service.
Dianne Hackborn [Tue, 15 Jan 2013 01:38:02 +0000 (17:38 -0800)]
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
Elliott Hughes [Wed, 16 Jan 2013 19:10:36 +0000 (11:10 -0800)]
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
Scott Kennedy [Wed, 16 Jan 2013 18:20:48 +0000 (10:20 -0800)]
Scott Main [Wed, 16 Jan 2013 18:20:45 +0000 (10:20 -0800)]
am
35909a08: 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 '
35909a0879b72b1f253b4d5bf38ed0a691c73a95':
docs: put new devbytes playlist on the develop landing
Scott Main [Wed, 16 Jan 2013 18:20:38 +0000 (10:20 -0800)]
am
258d6d74: am
5c7c1468: am
29502977: am
de902da2: docs: put new devbytes playlist on the develop landing
* commit '
258d6d74dc31d27d7edc40f5238d3c9be32ed412':
docs: put new devbytes playlist on the develop landing
Scott Kennedy [Wed, 16 Jan 2013 18:18:02 +0000 (10:18 -0800)]
Scott Main [Wed, 16 Jan 2013 18:17:58 +0000 (10:17 -0800)]
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
Scott Main [Wed, 16 Jan 2013 18:17:53 +0000 (10:17 -0800)]
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