Matthew Xie
b442d07469
Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
2013-04-23 22:47:52 +00:00
Philip Milne
3c647d23e5
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
2013-04-23 15:28:18 -07:00
Irfan Sheriff
0aea616acd
Merge "Keep device state always updated" into jb-mr2-dev
2013-04-23 21:57:53 +00:00
Wink Saville
51f456f553
Support WiFi only device at runtime.
...
To date WiFi only devices were defined by the list of networkAttributes
in config.xml overriden in on a per-device basis. This change is the
simplest change needed to determine this at runtime and therefore allowing
a single build to support the two different configurations.
Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91
2013-04-23 14:26:51 -07:00
Raph Levien
22a3344cda
Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
2013-04-23 21:19:20 +00:00
Irfan Sheriff
e68d858b0f
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
2013-04-23 13:43:43 -07:00
Raph Levien
9d47db23ff
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
2013-04-23 12:51:27 -07:00
Scott Main
89a6081447
am 2dd874ac: am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit '2dd874ace63566892a58f43bcf15399ae66c8d4b':
make Google IO image clickable
2013-04-23 12:41:40 -07:00
Scott Main
2dd874ace6
am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit 'e04458816b296ea76fc16cf8a820969cf363051d':
make Google IO image clickable
2013-04-23 12:39:18 -07:00
Scott Main
e04458816b
am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit '51a452a93bb170a65921aae9ae6bddbf8ce12bff':
make Google IO image clickable
2013-04-23 12:37:35 -07:00
Scott Main
51a452a93b
am 4af72165: am 7653fbee: make Google IO image clickable
...
* commit '4af72165092fb965ec9a97599f25538aa70242b1':
make Google IO image clickable
2013-04-23 12:36:26 -07:00
Scott Main
4af7216509
am 7653fbee: make Google IO image clickable
...
* commit '7653fbee7e4eb5d25a5b561b8142bd1af8c2cd58':
make Google IO image clickable
2013-04-23 12:34:30 -07:00
Scott Main
7653fbee7e
make Google IO image clickable
...
Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
2013-04-23 12:32:24 -07:00
Selim Gurun
6981f11f30
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
2013-04-23 12:27:03 -07:00
Selim Gurun
2253105c1a
am cab09cfc: am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit 'cab09cfc7afb7e19698bed3d61fe0b200dad3e4a':
DO NOT MERGE Fix issues during backport
2013-04-23 12:24:37 -07:00
Selim Gurun
cab09cfc7a
am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit 'dc9efbbb61a3e8da86c3e28f05d625a721a957fc':
DO NOT MERGE Fix issues during backport
2013-04-23 12:23:14 -07:00
Selim Gurun
dc9efbbb61
am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit 'a5f4e79fad39b4a0f91673c5813b1740e82144f4':
DO NOT MERGE Fix issues during backport
2013-04-23 12:21:49 -07:00
Selim Gurun
a5f4e79fad
am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit '22a946d36af4ea69956531c89f0d0852497c3892':
DO NOT MERGE Fix issues during backport
2013-04-23 12:20:53 -07:00
Selim Gurun
22a946d36a
am 006119bf: Merge commit \'8237dd82\' into manualmerge
...
* commit '006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a':
DO NOT MERGE Fix issues during backport
2013-04-23 12:18:47 -07:00
Matthew Xie
a722772b28
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
2013-04-23 11:53:41 -07:00
Ian Rogers
282a7e1b1d
Adding matching @deprecated.
...
Bug: 8657266
(Cherry-pick of c2a3adbd56e763ef0ad045fd8c58a54e41d1639d)
Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c
2013-04-23 11:36:28 -07:00
Selim Gurun
006119bf2c
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
2013-04-23 11:19:12 -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