OSDN Git Service
Nick Kralevich [Wed, 24 Apr 2013 00:06:58 +0000 (17:06 -0700)]
am
35587a0c: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator"
* commit '
35587a0c47c33a8eed7817dc705dbf502f7b5b60':
Don't set ADDR_COMPAT_LAYOUT on the emulator
Michael Wright [Tue, 23 Apr 2013 23:42:13 +0000 (16:42 -0700)]
am
51f7ca45: Merge "Fix keylayouts to use BACK instead of incorrect BUTTON_BACK." into jb-mr2-dev
* commit '
51f7ca4521c3508a233eefe97f53092213eacb60':
Fix keylayouts to use BACK instead of incorrect BUTTON_BACK.
Michael Wright [Tue, 23 Apr 2013 23:39:01 +0000 (23:39 +0000)]
Merge "Fix keylayouts to use BACK instead of incorrect BUTTON_BACK." into jb-mr2-dev
Nick Kralevich [Tue, 23 Apr 2013 23:33:52 +0000 (23:33 +0000)]
Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator"
Philip Milne [Tue, 23 Apr 2013 23:13:18 +0000 (16:13 -0700)]
am
a6d5109d: Merge "Fix for bug
8578258." into jb-mr2-dev
* commit '
a6d5109dd69791ba51e469c30d522dc27ab2c69c':
Fix for bug
8578258.
Philip Milne [Tue, 23 Apr 2013 23:11:06 +0000 (23:11 +0000)]
Merge "Fix for bug
8578258." into jb-mr2-dev
Michael Wright [Tue, 23 Apr 2013 21:46:07 +0000 (14:46 -0700)]
Fix keylayouts to use BACK instead of incorrect BUTTON_BACK.
Fix duplicate keys in a couple of the onza controllers. Also, add them to the
Makefile so they actually get included in the build.
Bug:
8292749
Change-Id: I8246155f84d0c3c75b21e37fb579227fda76e197
Matthew Xie [Tue, 23 Apr 2013 22:52:53 +0000 (15:52 -0700)]
am
b442d074: Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
* commit '
b442d07469aebc07d1d13b5b64b40aa152022e13':
Add hardware feature android.hardware.bluetooth.le
Matthew Xie [Tue, 23 Apr 2013 22:47:51 +0000 (22:47 +0000)]
Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
Nick Kralevich [Tue, 23 Apr 2013 22:30:45 +0000 (15:30 -0700)]
Don't set ADDR_COMPAT_LAYOUT on the emulator
Don't work around third party app bugs on the emulator.
Change-Id: I4440fcd56b72e3a74881ddec2a469f037a060525
Philip Milne [Tue, 23 Apr 2013 21:31:23 +0000 (14:31 -0700)]
Fix for bug
8578258.
The fix in:
https://googleplex-android-review.googlesource.com/#/c/300346/
worked but the constant used had an extra trailing zero - which was confusing
and put a 1 in the 'flag' space of the measurement spec.
The intended number was:
0x00800000
Unfortunately, this intended constant doesn't fix this bug.
The constant submitted in this fix is:
0x00010000
which is outside the 'flag' space of measurement specs and appears to steer clear of overflow
problems in the scenario of this bug.
As suggested in the submission above, it would be preferable to rework of the RTL code to avoid
the use of such a constant as it seems very unlikely indeed that any choice of integer can
avoid problems in all cases.
Change-Id: I0c6744257ef2aebe8dbc8c041a447f9b90ee4b84
Irfan Sheriff [Tue, 23 Apr 2013 21:59:58 +0000 (14:59 -0700)]
am
0aea616a: Merge "Keep device state always updated" into jb-mr2-dev
* commit '
0aea616acdb228b7a8c061977c0445174f60a1e1':
Keep device state always updated
Irfan Sheriff [Tue, 23 Apr 2013 21:57:53 +0000 (21:57 +0000)]
Merge "Keep device state always updated" into jb-mr2-dev
Raph Levien [Tue, 23 Apr 2013 21:21:44 +0000 (14:21 -0700)]
am
22a3344c: Merge "Fix for bug
8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
* commit '
22a3344cda1a3dcf4f719e0685c5d06155922c29':
Fix for bug
8695466 GPOS combining mark positioning broken before space
Raph Levien [Tue, 23 Apr 2013 21:19:19 +0000 (21:19 +0000)]
Merge "Fix for bug
8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
Irfan Sheriff [Tue, 23 Apr 2013 20:43:43 +0000 (13:43 -0700)]
Keep device state always updated
Tasker app showed up a bug where we can be out of sync with screen state
if we only received broadcasts when wifi is toggled on. Always receive
updates.
Bug:
8689583
Change-Id: Iad457c9768ed421765adb6a15d5f42ecf682da38
Raph Levien [Tue, 23 Apr 2013 19:42:16 +0000 (12:42 -0700)]
Fix for bug
8695466 GPOS combining mark positioning broken before space
This patch makes segmentation into script runs behave the same in RTL
as in LTR modes - so that inherited script characters are always
associated with the preceding run. Otherwise, for a sequence such as
u+0631 u+064d u+0020, it would get split after the first character,
which would lose the ability to correctly position the u+064d mark.
Change-Id: I3c12ba1b77d18334f55e707f518be1046e6b339b
Scott Main [Tue, 23 Apr 2013 19:43:57 +0000 (12:43 -0700)]
am
89a60814: am
2dd874ac: am
e0445881: am
51a452a9: am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
89a6081447fc5c454aad3aea02190a576d92ca1b':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:41:40 +0000 (12:41 -0700)]
am
2dd874ac: am
e0445881: am
51a452a9: am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
2dd874ace63566892a58f43bcf15399ae66c8d4b':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:39:18 +0000 (12:39 -0700)]
am
e0445881: am
51a452a9: am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
e04458816b296ea76fc16cf8a820969cf363051d':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:37:35 +0000 (12:37 -0700)]
am
51a452a9: am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
51a452a93bb170a65921aae9ae6bddbf8ce12bff':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:36:26 +0000 (12:36 -0700)]
am
4af72165: am
7653fbee: make Google IO image clickable
* commit '
4af72165092fb965ec9a97599f25538aa70242b1':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:34:30 +0000 (12:34 -0700)]
am
7653fbee: make Google IO image clickable
* commit '
7653fbee7e4eb5d25a5b561b8142bd1af8c2cd58':
make Google IO image clickable
Scott Main [Tue, 23 Apr 2013 19:32:24 +0000 (12:32 -0700)]
make Google IO image clickable
Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
Selim Gurun [Tue, 23 Apr 2013 19:31:20 +0000 (12:31 -0700)]
am
6981f11f: am
2253105c: am
cab09cfc: am
dc9efbbb: am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
6981f11f3080eaa4a6590005ad464474b0fc1a18':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:27:03 +0000 (12:27 -0700)]
am
2253105c: am
cab09cfc: am
dc9efbbb: am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
2253105c1ad6c93880b3ce1651cf54269711cff7':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:24:37 +0000 (12:24 -0700)]
am
cab09cfc: am
dc9efbbb: am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
cab09cfc7afb7e19698bed3d61fe0b200dad3e4a':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:23:14 +0000 (12:23 -0700)]
am
dc9efbbb: am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
dc9efbbb61a3e8da86c3e28f05d625a721a957fc':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:21:49 +0000 (12:21 -0700)]
am
a5f4e79f: am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
a5f4e79fad39b4a0f91673c5813b1740e82144f4':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:20:53 +0000 (12:20 -0700)]
am
22a946d3: am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
22a946d36af4ea69956531c89f0d0852497c3892':
DO NOT MERGE Fix issues during backport
Selim Gurun [Tue, 23 Apr 2013 19:18:47 +0000 (12:18 -0700)]
am
006119bf: Merge commit \'
8237dd82\' into manualmerge
* commit '
006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a':
DO NOT MERGE Fix issues during backport
Ian Rogers [Tue, 23 Apr 2013 19:04:25 +0000 (12:04 -0700)]
am
282a7e1b: Adding matching @deprecated.
* commit '
282a7e1b1db121c910f25b13081242a8c7611708':
Adding matching @deprecated.
Matthew Xie [Thu, 18 Apr 2013 22:25:59 +0000 (15:25 -0700)]
Add hardware feature android.hardware.bluetooth.le
The feature is used to differ platforms that support bluetooth low
engery radio
bug
8369273
Change-Id: Ibe23da73f7ecfa854bdb8b8bfc1a32b8e3aeee56
Ian Rogers [Fri, 19 Apr 2013 18:31:48 +0000 (11:31 -0700)]
Adding matching @deprecated.
Bug:
8657266
(Cherry-pick of
c2a3adbd56e763ef0ad045fd8c58a54e41d1639d)
Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c
Selim Gurun [Tue, 23 Apr 2013 18:08:37 +0000 (11:08 -0700)]
Merge commit '
8237dd82' into manualmerge
Bug:
6923539
Skipping the change. We already fixed this in master and jb-mr2-dev
in sha:
2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while
merging
8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was
DO NOT MERGE anyway.
Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f
Ian Rogers [Tue, 23 Apr 2013 16:15:58 +0000 (09:15 -0700)]
am
be4536d2: Merge "Adding matching @deprecated."
* commit '
be4536d214eedc3d12b50f0f30b47bba773b8dbc':
Adding matching @deprecated.
Ian Rogers [Tue, 23 Apr 2013 15:13:04 +0000 (15:13 +0000)]
Merge "Adding matching @deprecated."
Chet Haase [Tue, 23 Apr 2013 10:52:28 +0000 (03:52 -0700)]
am
5e650cef: Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
* commit '
5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9':
Expand invalidation rectangle when clipChildren == false
Jean-Michel Trivi [Tue, 23 Apr 2013 10:52:12 +0000 (03:52 -0700)]
am
ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev
* commit '
ea236f19e652942a7af384566c70cdd0c7f88c58':
Identify in logs launch of voice search from key events
Daniel Sandler [Tue, 23 Apr 2013 10:52:06 +0000 (03:52 -0700)]
am
f78ff07f: Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev
* commit '
f78ff07f6e688d11881658f743ef63076fcc550c':
Fix concurrency issues when parceling StatusBarNotifications.
Amith Yamasani [Tue, 23 Apr 2013 10:52:04 +0000 (03:52 -0700)]
am
d52f2b14: Merge "Listen for brightness dialog broadcasts from all users" into jb-mr2-dev
* commit '
d52f2b14852c057fd8d94cebb7ddf8900ba1d232':
Listen for brightness dialog broadcasts from all users
Dirk Dougherty [Tue, 23 Apr 2013 10:51:58 +0000 (03:51 -0700)]
am
94aa1167: am
80177e0c: am
c2340c4d: am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
94aa1167a20560d455cf9458349c081c45531393':
Doc change: update support urls.
Nick Pelly [Tue, 23 Apr 2013 10:51:56 +0000 (03:51 -0700)]
am
edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
* commit '
edced26f162b0232338064e569fe651b8c805f93':
Add ContentValues & CursorWindow to framework.aidl
Michael Wright [Tue, 23 Apr 2013 10:51:53 +0000 (03:51 -0700)]
am
5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-mr2-dev
* commit '
5fe6e4c4c9de523fa9e74902473996ce5ee8b298':
Rewrite input handling for native applications
Svetoslav [Tue, 23 Apr 2013 10:51:50 +0000 (03:51 -0700)]
am
a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev
* commit '
a61464d7adc26c291a5f9de48c9aff8b76a56b1f':
Making new node id APIs return strings.
Jean-Michel Trivi [Tue, 23 Apr 2013 10:51:42 +0000 (03:51 -0700)]
am
fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
* commit '
fb0b6a817903b42dfc192dc8fa71f5dede024379':
Opt-in mechanism for RemoteControlClient position anti-drift check
Dianne Hackborn [Tue, 23 Apr 2013 10:51:40 +0000 (03:51 -0700)]
am
a4629b0b: Merge "JB MR2 == API 18." into jb-mr2-dev
* commit '
a4629b0b833f78481ca51baa44b0303ebe647a7c':
JB MR2 == API 18.
Philip Milne [Tue, 23 Apr 2013 10:51:29 +0000 (03:51 -0700)]
am
a7b2625d: Merge "Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
* commit '
a7b2625d43a8e83e3fb47ca261efad6e3f6fcde9':
Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets
Chris Craik [Tue, 23 Apr 2013 10:51:18 +0000 (03:51 -0700)]
am
8d3f3c06: Merge "Expand hardware accel doc" into jb-mr2-dev
* commit '
8d3f3c061709eefe202e0ff7a612fcdf8cfeeb63':
Expand hardware accel doc
Robert Greenwalt [Tue, 23 Apr 2013 10:51:08 +0000 (03:51 -0700)]
am
d0202945: Merge "Listen for network disconnect." into jb-mr2-dev
* commit '
d020294572f591007de1fe0aa9e4927dae72c0c9':
Listen for network disconnect.
Dirk Dougherty [Tue, 23 Apr 2013 10:51:05 +0000 (03:51 -0700)]
am
3acb320f: am
ab3b13eb: am
e5d47b39: am
cdfeb09d: am
10fc5e05: am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
3acb320fcb6ee03aec64220b09283a3c4efa4bb5':
Doc change: update payment detail for merch account.
Christopher Tate [Tue, 23 Apr 2013 10:50:46 +0000 (03:50 -0700)]
am
7a4ddbaa: Merge "Don\'t attempt native crash reporting for persistent apps" into jb-mr2-dev
* commit '
7a4ddbaafa9e11e190764ca0314f56651dfcb0d9':
Don't attempt native crash reporting for persistent apps
kmccormick [Tue, 23 Apr 2013 10:50:44 +0000 (03:50 -0700)]
am
47cccbd0: am
f9a152d8: am
0415ea6a: am
2aca8dbe: am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
47cccbd09d4fe2f408bf88c39faa7530d202c233':
Doc update: Fix firewall text.
Scott Main [Tue, 23 Apr 2013 10:50:42 +0000 (03:50 -0700)]
am
3fadd4c2: am
8841569f: am
b8ac12af: am
3da6ef39: am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
3fadd4c256f2f83b44cd023d4f6c95af8aeaadc0':
fix backup registration url external bug: 54539
Baligh Uddin [Tue, 23 Apr 2013 10:50:38 +0000 (03:50 -0700)]
am
b0579834: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
b0579834e7af8239b10b7f2ec8b09e62f9ad51e1':
Import translations. DO NOT MERGE
Dianne Hackborn [Tue, 23 Apr 2013 10:50:33 +0000 (03:50 -0700)]
am
3edf207a: Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev
* commit '
3edf207a922c24df349e6f9ffadb2bdc5b18d3c2':
Assign final resource IDs for JB MR2.
Scott Main [Tue, 23 Apr 2013 10:50:26 +0000 (03:50 -0700)]
am
9753ef1e: am
35ac5b08: am
abb6f472: am
24a3899c: am
1aba107d: am
c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '
9753ef1e7db65a3245c4a3c619b0778fd5e5a2de':
delete unused download page and add a couple search tags
Zhentao Sun [Tue, 23 Apr 2013 10:50:20 +0000 (03:50 -0700)]
am
c5fc9988: Made it easier to disable overlay mechanism of location components.
* commit '
c5fc9988f11acc58229fb6ae80d346277318ada4':
Made it easier to disable overlay mechanism of location components.
Chet Haase [Tue, 23 Apr 2013 02:50:54 +0000 (02:50 +0000)]
Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev
Jean-Michel Trivi [Tue, 23 Apr 2013 01:30:29 +0000 (01:30 +0000)]
Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev
Daniel Sandler [Tue, 23 Apr 2013 00:53:31 +0000 (00:53 +0000)]
Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev
Amith Yamasani [Tue, 23 Apr 2013 00:46:42 +0000 (00:46 +0000)]
Merge "Listen for brightness dialog broadcasts from all users" into jb-mr2-dev
Dirk Dougherty [Tue, 23 Apr 2013 00:11:01 +0000 (17:11 -0700)]
am
80177e0c: am
c2340c4d: am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
80177e0cdb2e4178d9593f758a2bca352480e653':
Doc change: update support urls.
Dirk Dougherty [Tue, 23 Apr 2013 00:08:51 +0000 (17:08 -0700)]
am
c2340c4d: am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
c2340c4dc7cf451a5d2ab5392801974dbbf3a414':
Doc change: update support urls.
Nick Pelly [Tue, 23 Apr 2013 00:07:18 +0000 (00:07 +0000)]
Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev
Dirk Dougherty [Tue, 23 Apr 2013 00:06:40 +0000 (17:06 -0700)]
am
ecf55180: am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
ecf551805ec96e050a703beb9d4033bd2757fe2e':
Doc change: update support urls.
Dirk Dougherty [Tue, 23 Apr 2013 00:05:08 +0000 (17:05 -0700)]
am
04f3b81a: am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
04f3b81aad12d5d28db42db40545603c6b128c1f':
Doc change: update support urls.
Michael Wright [Tue, 23 Apr 2013 00:04:21 +0000 (00:04 +0000)]
Merge "Rewrite input handling for native applications" into jb-mr2-dev
Michael Wright [Thu, 11 Apr 2013 04:12:00 +0000 (21:12 -0700)]
Rewrite input handling for native applications
Bug:
8473020
Change-Id: Ic4353d8924ab877bec21aff8c2dba9fe725bf906
Svetoslav [Tue, 23 Apr 2013 00:01:36 +0000 (00:01 +0000)]
Merge "Making new node id APIs return strings." into jb-mr2-dev
Dirk Dougherty [Tue, 23 Apr 2013 00:01:21 +0000 (17:01 -0700)]
am
c7523804: am
00cfba95: Doc change: update support urls.
* commit '
c7523804c890cd7ed3b61f51b9f5d029320fd406':
Doc change: update support urls.
Dirk Dougherty [Mon, 22 Apr 2013 23:59:34 +0000 (16:59 -0700)]
am
00cfba95: Doc change: update support urls.
* commit '
00cfba95ce5ea3c081b9d7353998f80a7c6edbc9':
Doc change: update support urls.
Jean-Michel Trivi [Mon, 22 Apr 2013 23:41:04 +0000 (23:41 +0000)]
Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev
Dianne Hackborn [Mon, 22 Apr 2013 23:37:37 +0000 (23:37 +0000)]
Merge "JB MR2 == API 18." into jb-mr2-dev
Dirk Dougherty [Mon, 22 Apr 2013 21:45:30 +0000 (14:45 -0700)]
Doc change: update support urls.
Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f
Nick Pelly [Mon, 22 Apr 2013 05:52:03 +0000 (15:52 +1000)]
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
Philip Milne [Mon, 22 Apr 2013 22:26:21 +0000 (22:26 +0000)]
Merge "Fix for bug
8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
Chris Craik [Mon, 22 Apr 2013 21:55:12 +0000 (21:55 +0000)]
Merge "Expand hardware accel doc" into jb-mr2-dev
Robert Greenwalt [Mon, 22 Apr 2013 21:33:28 +0000 (21:33 +0000)]
Merge "Listen for network disconnect." into jb-mr2-dev
Dirk Dougherty [Mon, 22 Apr 2013 21:32:46 +0000 (14:32 -0700)]
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.
Dirk Dougherty [Mon, 22 Apr 2013 21:30:24 +0000 (14:30 -0700)]
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.
Dirk Dougherty [Mon, 22 Apr 2013 21:28:21 +0000 (14:28 -0700)]
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.
Dirk Dougherty [Mon, 22 Apr 2013 21:27:00 +0000 (14:27 -0700)]
am
10fc5e05: am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
10fc5e0528a7cad3f2eab0694ed471d29184ec18':
Doc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 21:25:21 +0000 (14:25 -0700)]
am
cca23552: am
974af93d: Doc change: update payment detail for merch account.
* commit '
cca235525f14ba8845ef5385036e7913c23f7dd1':
Doc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 21:22:47 +0000 (14:22 -0700)]
am
974af93d: Doc change: update payment detail for merch account.
* commit '
974af93de950b68616aed44985720e2978db5393':
Doc change: update payment detail for merch account.
Dirk Dougherty [Mon, 22 Apr 2013 20:03:11 +0000 (13:03 -0700)]
Doc change: update payment detail for merch account.
Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
Jean-Michel Trivi [Fri, 19 Apr 2013 15:56:50 +0000 (08:56 -0700)]
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
Robert Greenwalt [Mon, 22 Apr 2013 18:13:02 +0000 (11:13 -0700)]
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
Dianne Hackborn [Mon, 22 Apr 2013 20:04:28 +0000 (13:04 -0700)]
JB MR2 == API 18.
Change-Id: Ia62a81f8ebc79ae0e01b181f4ef47ef192c71592
Christopher Tate [Mon, 22 Apr 2013 20:26:29 +0000 (20:26 +0000)]
Merge "Don't attempt native crash reporting for persistent apps" into jb-mr2-dev
kmccormick [Mon, 22 Apr 2013 20:16:44 +0000 (13:16 -0700)]
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.
kmccormick [Mon, 22 Apr 2013 20:15:23 +0000 (13:15 -0700)]
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.
kmccormick [Mon, 22 Apr 2013 20:13:38 +0000 (13:13 -0700)]
am
2aca8dbe: am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
2aca8dbeaf0c08e59d75c78f5b237a9cd2691784':
Doc update: Fix firewall text.
Scott Main [Mon, 22 Apr 2013 20:13:20 +0000 (13:13 -0700)]
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
Scott Main [Mon, 22 Apr 2013 20:11:58 +0000 (13:11 -0700)]
am
b8ac12af: am
3da6ef39: am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
b8ac12af56a3eb33be550ade27be62ff3d0689ed':
fix backup registration url external bug: 54539
kmccormick [Mon, 22 Apr 2013 20:11:53 +0000 (13:11 -0700)]
am
b116885c: am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
b116885c42be983732a495bb84938d290211014f':
Doc update: Fix firewall text.
Scott Main [Mon, 22 Apr 2013 20:10:21 +0000 (13:10 -0700)]
am
3da6ef39: am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
3da6ef399c5e3b42c0f5a8149b1f1d154556c1ff':
fix backup registration url external bug: 54539
kmccormick [Mon, 22 Apr 2013 20:10:04 +0000 (13:10 -0700)]
am
ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '
ce534905a63f97766f487798fd61cb8414da04fe':
Doc update: Fix firewall text.
Scott Main [Mon, 22 Apr 2013 20:08:33 +0000 (13:08 -0700)]
am
d07bdb6f: am
2779da87: fix backup registration url external bug: 54539
* commit '
d07bdb6fd165b31aa9e047095e18be7e76e74502':
fix backup registration url external bug: 54539
kmccormick [Mon, 22 Apr 2013 20:08:10 +0000 (20:08 +0000)]
Merge "Doc update: Fix firewall text." into jb-mr1.1-docs