Jeff Tinker
1d7c218ba2
MediaDrm API: Add two exceptions to handle error path scenarios
...
bug: 8725707
Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
2013-04-30 12:39:04 -07:00
Chet Haase
5e650cef53
Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
2013-04-23 02:50:54 +00:00
Jean-Michel Trivi
ea236f19e6
Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev
2013-04-23 01:30:30 +00:00
Daniel Sandler
f78ff07f6e
Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev
2013-04-23 00:53:31 +00:00
Amith Yamasani
d52f2b1485
Merge "Listen for brightness dialog broadcasts from all users" into jb-mr2-dev
2013-04-23 00:46:43 +00:00
Dirk Dougherty
94aa1167a2
am 80177e0c: am c2340c4d: am ecf55180: am 04f3b81a: am c7523804: am 00cfba95: Doc change: update support urls.
...
* commit '80177e0cdb2e4178d9593f758a2bca352480e653':
Doc change: update support urls.
2013-04-22 17:11:01 -07:00
Dirk Dougherty
80177e0cdb
am c2340c4d: am ecf55180: am 04f3b81a: am c7523804: am 00cfba95: Doc change: update support urls.
...
* commit 'c2340c4dc7cf451a5d2ab5392801974dbbf3a414':
Doc change: update support urls.
2013-04-22 17:08:51 -07:00
Nick Pelly
edced26f16
Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
2013-04-23 00:07:19 +00:00
Dirk Dougherty
c2340c4dc7
am ecf55180: am 04f3b81a: am c7523804: am 00cfba95: Doc change: update support urls.
...
* commit 'ecf551805ec96e050a703beb9d4033bd2757fe2e':
Doc change: update support urls.
2013-04-22 17:06:40 -07:00
Dirk Dougherty
ecf551805e
am 04f3b81a: am c7523804: am 00cfba95: Doc change: update support urls.
...
* commit '04f3b81aad12d5d28db42db40545603c6b128c1f':
Doc change: update support urls.
2013-04-22 17:05:08 -07:00
Michael Wright
5fe6e4c4c9
Merge "Rewrite input handling for native applications" into jb-mr2-dev
2013-04-23 00:04:44 +00:00
Michael Wright
a44dd26a75
Rewrite input handling for native applications
...
Bug: 8473020
Change-Id: Ic4353d8924ab877bec21aff8c2dba9fe725bf906
2013-04-22 17:01:51 -07:00
Svetoslav
a61464d7ad
Merge "Making new node id APIs return strings." into jb-mr2-dev
2013-04-23 00:01:36 +00:00
Dirk Dougherty
04f3b81aad
am c7523804: am 00cfba95: Doc change: update support urls.
...
* commit 'c7523804c890cd7ed3b61f51b9f5d029320fd406':
Doc change: update support urls.
2013-04-22 17:01:21 -07:00
Dirk Dougherty
c7523804c8
am 00cfba95: Doc change: update support urls.
...
* commit '00cfba95ce5ea3c081b9d7353998f80a7c6edbc9':
Doc change: update support urls.
2013-04-22 16:59:34 -07:00
Jean-Michel Trivi
fb0b6a8179
Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
2013-04-22 23:41:04 +00:00
Dianne Hackborn
a4629b0b83
Merge "JB MR2 == API 18." into jb-mr2-dev
2013-04-22 23:37:37 +00:00
Dirk Dougherty
00cfba95ce
Doc change: update support urls.
...
Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f
2013-04-22 16:37:01 -07:00
Nick Pelly
bb392ba5f7
Add ContentValues & CursorWindow to framework.aidl
...
By adding these stubs, they will be automatically added to framework.aidl
in sdk builds.
This makes it easier for unbundled apps to pass these objects across
AIDL calls.
ContentValues & CursorWindow are already public Parcelables. It is an
oversight that they were not already in framework.aidl.
There are a lot of other public Parcelables that are missing from
framework.aidl. This just fixes two commonly requested ones.
Change-Id: If61e19b1206da1680413d9ea03de87a90b6d233e
2013-04-23 08:30:34 +10:00
Philip Milne
a7b2625d43
Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
2013-04-22 22:26:21 +00:00
Chris Craik
8d3f3c0617
Merge "Expand hardware accel doc" into jb-mr2-dev
2013-04-22 21:55:12 +00:00
Robert Greenwalt
d020294572
Merge "Listen for network disconnect." into jb-mr2-dev
2013-04-22 21:33:29 +00:00
Dirk Dougherty
3acb320fcb
am ab3b13eb: am e5d47b39: am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account.
...
* commit 'ab3b13eb332121cdf31370dbad8a7e49aac652a3':
Doc change: update payment detail for merch account.
2013-04-22 14:32:46 -07:00
Dirk Dougherty
ab3b13eb33
am e5d47b39: am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account.
...
* commit 'e5d47b39fd748ebfe8c7fe4da6849ba70faff69a':
Doc change: update payment detail for merch account.
2013-04-22 14:30:24 -07:00
Dirk Dougherty
e5d47b39fd
am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account.
...
* commit 'cdfeb09d65cb76cb23b965c1fac2bf22fcc80909':
Doc change: update payment detail for merch account.
2013-04-22 14:28:21 -07:00
Dirk Dougherty
cdfeb09d65
am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account.
...
* commit '10fc5e0528a7cad3f2eab0694ed471d29184ec18':
Doc change: update payment detail for merch account.
2013-04-22 14:27:00 -07:00
Dirk Dougherty
10fc5e0528
am cca23552: am 974af93d: Doc change: update payment detail for merch account.
...
* commit 'cca235525f14ba8845ef5385036e7913c23f7dd1':
Doc change: update payment detail for merch account.
2013-04-22 14:25:21 -07:00
Dirk Dougherty
cca235525f
am 974af93d: Doc change: update payment detail for merch account.
...
* commit '974af93de950b68616aed44985720e2978db5393':
Doc change: update payment detail for merch account.
2013-04-22 14:22:47 -07:00
Dirk Dougherty
974af93de9
Doc change: update payment detail for merch account.
...
Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
2013-04-22 14:17:36 -07:00
Jean-Michel Trivi
c3c4babf84
Opt-in mechanism for RemoteControlClient position anti-drift check
...
RemoteControlClient has an interface for the framework to query
the playback position. This mechanism is used to detect
when the estimated position drifts from the real position by
having the framework regularly poll (every 15s when playing at
1x) this interface and compare against the estimation.
But this mechanism:
- should only be used when IRemoteControlDisplay implementation
care about position display
- should not be used by default because the implementation of
the position query interface might involve network traffic
in some remote media player implementation for instance.
This CL implements an opt-in mechanism to be used by
implementators of IRemoteControlDisplay, to request the
anti-drift mechanism to be turned on.
bug 8120740
Change-Id: I1baa3e515546ac41e0ac9c3a41bfa3147ecf3d7f
2013-04-22 14:15:34 -07:00
Robert Greenwalt
1b0ca9dace
Listen for network disconnect.
...
VPN used to just watch the interface, but that is insufficient. There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.
Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.
bug:8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a
2013-04-22 14:13:51 -07:00
Dianne Hackborn
d2eeed635d
JB MR2 == API 18.
...
Change-Id: Ia62a81f8ebc79ae0e01b181f4ef47ef192c71592
2013-04-22 13:28:47 -07:00
Christopher Tate
7a4ddbaafa
Merge "Don't attempt native crash reporting for persistent apps" into jb-mr2-dev
2013-04-22 20:26:30 +00:00
kmccormick
47cccbd09d
am f9a152d8: am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
...
* commit 'f9a152d8fbf012f990afe02a4ef3d528853ca30b':
Doc update: Fix firewall text.
2013-04-22 13:16:44 -07:00
kmccormick
f9a152d8fb
am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
...
* commit '0415ea6ad9a42837339ec5afc43f3defabe58e38':
Doc update: Fix firewall text.
2013-04-22 13:15:23 -07:00
kmccormick
0415ea6ad9
am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
...
* commit '2aca8dbeaf0c08e59d75c78f5b237a9cd2691784':
Doc update: Fix firewall text.
2013-04-22 13:13:38 -07:00
Scott Main
3fadd4c256
am 8841569f: am b8ac12af: am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539
...
* commit '8841569fc835bb172e06dc3fba9597c643af8b31':
fix backup registration url external bug: 54539
2013-04-22 13:13:20 -07:00
Scott Main
8841569fc8
am b8ac12af: am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539
...
* commit 'b8ac12af56a3eb33be550ade27be62ff3d0689ed':
fix backup registration url external bug: 54539
2013-04-22 13:11:58 -07:00
kmccormick
2aca8dbeaf
am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
...
* commit 'b116885c42be983732a495bb84938d290211014f':
Doc update: Fix firewall text.
2013-04-22 13:11:53 -07:00
Scott Main
b8ac12af56
am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539
...
* commit '3da6ef399c5e3b42c0f5a8149b1f1d154556c1ff':
fix backup registration url external bug: 54539
2013-04-22 13:10:21 -07:00
kmccormick
b116885c42
am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
...
* commit 'ce534905a63f97766f487798fd61cb8414da04fe':
Doc update: Fix firewall text.
2013-04-22 13:10:04 -07:00
Scott Main
3da6ef399c
am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539
...
* commit 'd07bdb6fd165b31aa9e047095e18be7e76e74502':
fix backup registration url external bug: 54539
2013-04-22 13:08:33 -07:00
kmccormick
ce534905a6
Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
2013-04-22 20:08:11 +00:00
Scott Main
d07bdb6fd1
am 2779da87: fix backup registration url external bug: 54539
...
* commit '2779da87e2414709afe462339bb3cfde7feb2965':
fix backup registration url external bug: 54539
2013-04-22 13:06:41 -07:00
Scott Main
2779da87e2
fix backup registration url
...
external bug: 54539
Change-Id: I3d4e957d8b26c7462c7228a4e4755aee88d6895c
2013-04-22 13:03:00 -07:00
Baligh Uddin
b0579834e7
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-22 19:59:48 +00:00
Philip Milne
ca2e9e1122
Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
...
GridLayout is working as intended here. The bug is appears to be in RelativeLayout
(and possibly LinearLayout).
The value of RelativeLayout.DEFAULT_WIDTH = Integer.MAX_VALUE/2 is 0x3FFFFFFF has bits
set in the range that is used to flag certain conditions and states by the layout system.
In View we have:
MEASURED_SIZE_MASK = 0x00ffffff
MEASURED_STATE_MASK = 0xff000000;
MEASURED_STATE_TOO_SMALL = 0x01000000
This change fixes this bug, though it looks as if that a safer solution would be to not introduce
this constant and code path in the first place - as RelativeLayout's measurement algorithm operates
in the LTR case without it.
Change-Id: I01c51ae854620f08dd63047594486a3464c86f3a
2013-04-22 12:58:55 -07:00
Dianne Hackborn
3edf207a92
Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev
2013-04-22 19:49:24 +00:00
Svetoslav
9fa1ee563b
Making new node id APIs return strings.
...
The node id does not have to be decorated with spans like spannable
so it makes no sense to have these APIs use anything else but string.
bug:8657338
Change-Id: I2e7c31128ee9f2933bd0d58beac4ba31a498bb09
2013-04-22 12:43:07 -07:00
kmccormick
91290d59d5
Doc update: Fix firewall text.
...
Change-Id: I06c1c86f591dc82f7004b6317062580269230cda
2013-04-22 12:28:25 -07:00