OSDN Git Service
Svetoslav [Thu, 25 Apr 2013 21:49:00 +0000 (21:49 +0000)]
Merge "Lockscreen widgets not always announced." into jb-mr2-dev
Jeff Sharkey [Thu, 25 Apr 2013 21:43:27 +0000 (21:43 +0000)]
Merge "Avoid leaking Surface native object." into jb-mr2-dev
Michael Wright [Thu, 25 Apr 2013 21:43:03 +0000 (21:43 +0000)]
Merge "Fixed javadoc in input related classes" into jb-mr2-dev
Igor Murashkin [Thu, 25 Apr 2013 21:32:25 +0000 (21:32 +0000)]
Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev
Daniel Sandler [Thu, 25 Apr 2013 21:16:56 +0000 (21:16 +0000)]
Merge "Fix build." into jb-mr2-dev
Daniel Sandler [Thu, 25 Apr 2013 21:13:53 +0000 (17:13 -0400)]
Fix build.
Change-Id: I2e41f312f51c3fd72ed63bc544b4fa815c2c3ba4
Daniel Sandler [Thu, 25 Apr 2013 21:03:54 +0000 (21:03 +0000)]
Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev
Daniel Sandler [Thu, 25 Apr 2013 20:38:41 +0000 (16:38 -0400)]
API: getPkg() -> getPackageName()
Bug:
8656860
Change-Id: If3062b9fc00270e5f0ecfe67e593b9a28c6bccdd
Svetoslav [Thu, 25 Apr 2013 20:25:06 +0000 (13:25 -0700)]
Lockscreen widgets not always announced.
1. The accessibility events for switching a widget were dispatched
before we update the important for accessibility property. We
were lucky to get events in some cases since the pages in the
pager had alpha grater than zero, i.e. the page was already
set as important for accessibility, due to a running animation.
2. Accessibility focus clear event not fired if we give focus to
another view. The old focus was correctly cleared just the
events were not dispatched.
bug:
8599670
Change-Id: Ia2647d77eaa4e10fbaf3a047dc9ea5b728f9c3c3
Daniel Sandler [Thu, 25 Apr 2013 20:16:48 +0000 (20:16 +0000)]
Merge "API cleanup: NotificationListener" into jb-mr2-dev
Jeff Sharkey [Thu, 25 Apr 2013 18:34:23 +0000 (11:34 -0700)]
Avoid leaking Surface native object.
Bug:
8721827
Change-Id: I8d6192b8eb47911fcf4964de399c7dba94ed9286
Daniel Sandler [Thu, 25 Apr 2013 19:44:16 +0000 (15:44 -0400)]
API cleanup: NotificationListener
- Wrap all public member variables in getters and make
slots private
- Rename clear* methods to cancel* to be more consistent
with existing public Notification API
Bug:
8656860
Change-Id: I84f7e71fbb627f859352a93089c6a531b44dac95
Daniel Sandler [Thu, 25 Apr 2013 19:41:10 +0000 (19:41 +0000)]
Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-dev
Amith Yamasani [Thu, 25 Apr 2013 18:06:02 +0000 (18:06 +0000)]
Merge "Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet." into jb-mr2-dev
Ben Gruver [Thu, 25 Apr 2013 17:40:41 +0000 (17:40 +0000)]
Merge "Ensure the intent firewall dir exists before starting the FileObserver" into jb-mr2-dev
Amith Yamasani [Thu, 25 Apr 2013 04:37:36 +0000 (21:37 -0700)]
Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.
Bug:
8704663
Change-Id: Ia9931e3844305c8f84c127506ffedf3a17eeb80d
Michael Wright [Thu, 25 Apr 2013 03:41:20 +0000 (20:41 -0700)]
Fixed javadoc in input related classes
Change-Id: Ie415f812a0f473488d74119dab18296a488db6b9
Michael Wright [Thu, 25 Apr 2013 03:22:51 +0000 (03:22 +0000)]
Merge "Mirror LTRIGGER / RTRIGGER as BRAKE / GAS for compatibility" into jb-mr2-dev
Daniel Sandler [Wed, 24 Apr 2013 19:34:57 +0000 (15:34 -0400)]
New NotificationListener API: getActiveNotifications()
This allows a listener service to catch up on the current
state of the notification panel at any time, including at
startup.
Bug:
8656860
Change-Id: I1a3d665d84576e17870929a63dda334afc696010
Michael Wright [Thu, 25 Apr 2013 03:05:10 +0000 (20:05 -0700)]
Mirror LTRIGGER / RTRIGGER as BRAKE / GAS for compatibility
Bug:
8590913
Change-Id: If2918a67ecdd946ed850acc002ca021e150ec39d
Dirk Dougherty [Thu, 25 Apr 2013 02:50:46 +0000 (19:50 -0700)]
am
022131d0: am
c9f01f0a: am
4a22f9a7: am
2a31f996: am
bdf19c62: am
29743661: Doc change: fix typo in tablet guidelines.
* commit '
022131d06cc745fddd6877cfffd6d6eb73465e72':
Doc change: fix typo in tablet guidelines.
Dirk Dougherty [Thu, 25 Apr 2013 02:48:49 +0000 (19:48 -0700)]
am
c9f01f0a: am
4a22f9a7: am
2a31f996: am
bdf19c62: am
29743661: Doc change: fix typo in tablet guidelines.
* commit '
c9f01f0a80809d6911fce0dbb7692b787f36eb67':
Doc change: fix typo in tablet guidelines.
Dirk Dougherty [Thu, 25 Apr 2013 02:46:16 +0000 (19:46 -0700)]
am
4a22f9a7: am
2a31f996: am
bdf19c62: am
29743661: Doc change: fix typo in tablet guidelines.
* commit '
4a22f9a7bb782d7b9aeb432b6fefda20057b8e11':
Doc change: fix typo in tablet guidelines.
Dirk Dougherty [Thu, 25 Apr 2013 02:44:20 +0000 (19:44 -0700)]
am
2a31f996: am
bdf19c62: am
29743661: Doc change: fix typo in tablet guidelines.
* commit '
2a31f99680ec8bbf9acde86da5e7a595a9e4c089':
Doc change: fix typo in tablet guidelines.
Dirk Dougherty [Thu, 25 Apr 2013 02:42:49 +0000 (19:42 -0700)]
am
bdf19c62: am
29743661: Doc change: fix typo in tablet guidelines.
* commit '
bdf19c62d841163f5c3434f3533e003f58816e0e':
Doc change: fix typo in tablet guidelines.
Dirk Dougherty [Thu, 25 Apr 2013 02:40:02 +0000 (19:40 -0700)]
am
29743661: Doc change: fix typo in tablet guidelines.
* commit '
29743661734d8e2b7b3c33e635557c3f2ef9d8a0':
Doc change: fix typo in tablet guidelines.
Dirk Dougherty [Thu, 25 Apr 2013 02:33:46 +0000 (19:33 -0700)]
Doc change: fix typo in tablet guidelines.
Change-Id: I8e947fd20783ed12d46807733c4a87ba61211e41
Svetoslav [Thu, 25 Apr 2013 01:44:42 +0000 (01:44 +0000)]
Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
Matthew Xie [Thu, 25 Apr 2013 01:42:14 +0000 (01:42 +0000)]
Merge "Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN" into jb-mr2-dev
Matthew Xie [Thu, 25 Apr 2013 00:51:37 +0000 (17:51 -0700)]
Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN
bug
8667898
Change-Id: Iaff19fe72b16a96a6cf2f5b9140e369098567d2b
kmccormick [Wed, 24 Apr 2013 23:19:14 +0000 (16:19 -0700)]
am
036cb2e4: (-s ours) am
3e06ca57: am
7b5d34f0: am
2a4ea0fc: am
fd61958f: Doc Update: bug fix in SensorEvent ref
* commit '
036cb2e4bf4bca4d32aa021fb5bb748684317043':
Doc Update: bug fix in SensorEvent ref
kmccormick [Wed, 24 Apr 2013 23:02:26 +0000 (16:02 -0700)]
am
3e06ca57: am
7b5d34f0: am
2a4ea0fc: am
fd61958f: Doc Update: bug fix in SensorEvent ref
* commit '
3e06ca574270b146b833a4f00eae82578e9cc115':
Doc Update: bug fix in SensorEvent ref
kmccormick [Wed, 24 Apr 2013 23:00:21 +0000 (16:00 -0700)]
am
7b5d34f0: am
2a4ea0fc: am
fd61958f: Doc Update: bug fix in SensorEvent ref
* commit '
7b5d34f0a7b2d3e059a9f410a60367ef379fc502':
Doc Update: bug fix in SensorEvent ref
kmccormick [Wed, 24 Apr 2013 22:59:05 +0000 (15:59 -0700)]
am
2a4ea0fc: am
fd61958f: Doc Update: bug fix in SensorEvent ref
* commit '
2a4ea0fc0d93bb94b1ff7e731af519cc41ef77e8':
Doc Update: bug fix in SensorEvent ref
kmccormick [Wed, 24 Apr 2013 22:57:25 +0000 (15:57 -0700)]
am
fd61958f: Doc Update: bug fix in SensorEvent ref
* commit '
fd61958f75212a70bffebd79ad0876b7ad785f55':
Doc Update: bug fix in SensorEvent ref
kmccormick [Wed, 24 Apr 2013 22:42:57 +0000 (15:42 -0700)]
Doc Update: bug fix in SensorEvent ref
"Bug:
6349093"
Change-Id: Ibd4911b6c3f17fd2cd18042665efa428231c61ab
Igor Murashkin [Tue, 23 Apr 2013 21:32:19 +0000 (14:32 -0700)]
Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED
This system-only permission allows a service to disable the transmit LED
when a camera is in use.
Bug:
8554573
Change-Id: I64f7e3fcdc8ded8be3904650bd0c91d3b8f10dd4
Svetoslav [Wed, 24 Apr 2013 21:51:29 +0000 (14:51 -0700)]
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
Since the enable touch exploration capability is dynamically granted by
the user for apps targeting pre-JellybeanMR2 API level, we have to properly
update the accessibility service info for that service and also avoid
caching copies of the service info.
bug:
8633951
Change-Id: I83dd1c852706ec55d40cda7209ad842889fb970a
Chet Haase [Wed, 24 Apr 2013 21:54:37 +0000 (21:54 +0000)]
Merge "Document behavior and usage of ViewGroup.bringChildToFront()" into jb-mr2-dev
Amith Yamasani [Wed, 24 Apr 2013 21:52:50 +0000 (21:52 +0000)]
Merge "Rename limited user to restricted profile" into jb-mr2-dev
Amith Yamasani [Wed, 24 Apr 2013 20:27:25 +0000 (13:27 -0700)]
Rename limited user to restricted profile
Bug:
8705996
Change-Id: Ia6c44928a7922d60bfa32c4da9934d5993bd4ee8
Chet Haase [Tue, 23 Apr 2013 13:55:04 +0000 (06:55 -0700)]
Document behavior and usage of ViewGroup.bringChildToFront()
A call to ViewGroup.bringChildToFront() or View.bringToFront()
(which delegates to the parent's bringChildToFront() method) needs
to be followed by a call to requestLayout() and invalidate() on the
parent container in order for the changes to
actually happen. That is, the order of the child views would change, but
the parent container would not run layout or even invalidation without
being told to, so there would be no visible change until something else
caused a layout and invalidation to occur.
This change clarifies this requirement in the javadocs.
Issue #
8667065 bringtoTop does not work
Change-Id: Ibe41a6318dddf9fb79382e1c9fd1d21ab4510976
Dirk Dougherty [Wed, 24 Apr 2013 19:19:51 +0000 (12:19 -0700)]
am
d9c9dd32: am
21e93bc8: am
182c06ff: am
0a413d75: am
c0edc45f: am
dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
* commit '
d9c9dd323d7e15460986e2dbb3a36aeb49e263df':
Doc change: Add tablet optimization tips info/link.
Dirk Dougherty [Wed, 24 Apr 2013 19:18:39 +0000 (12:18 -0700)]
am
21e93bc8: am
182c06ff: am
0a413d75: am
c0edc45f: am
dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
* commit '
21e93bc845dab184370d9a650ec9794a6571a091':
Doc change: Add tablet optimization tips info/link.
Dirk Dougherty [Wed, 24 Apr 2013 19:16:56 +0000 (12:16 -0700)]
am
182c06ff: am
0a413d75: am
c0edc45f: am
dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
* commit '
182c06fffeec8162635df35765cd2504847c17e0':
Doc change: Add tablet optimization tips info/link.
Dirk Dougherty [Wed, 24 Apr 2013 19:14:36 +0000 (12:14 -0700)]
am
0a413d75: am
c0edc45f: am
dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
* commit '
0a413d7572c5d06331d901a66e1686bc7c99a4ac':
Doc change: Add tablet optimization tips info/link.
Dirk Dougherty [Wed, 24 Apr 2013 19:12:37 +0000 (12:12 -0700)]
am
c0edc45f: am
dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
* commit '
c0edc45fd20832b52e8d0f91632f616da585b7dd':
Doc change: Add tablet optimization tips info/link.
Dirk Dougherty [Wed, 24 Apr 2013 19:10:34 +0000 (12:10 -0700)]
am
dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
* commit '
dacaad4ab21bfe8d6de74d60d2ce881d2a276a9d':
Doc change: Add tablet optimization tips info/link.
Dirk Dougherty [Wed, 24 Apr 2013 19:08:42 +0000 (19:08 +0000)]
Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev
Dirk Dougherty [Mon, 22 Apr 2013 19:12:44 +0000 (12:12 -0700)]
Doc change: Add tablet optimization tips info/link.
Change-Id: Iee793b5fbb39e551c0df39ba4aeac40b55fb16d6
Baligh Uddin [Wed, 24 Apr 2013 17:48:14 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Wink Saville [Wed, 24 Apr 2013 15:44:07 +0000 (15:44 +0000)]
Merge "Support WiFi only device at runtime." into jb-mr2-dev
Baligh Uddin [Wed, 24 Apr 2013 15:19:16 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81a54db8c9cf388b0f381f8a72ad79ff3dc801dc
Auto-generated-cl: translation import
Jim Miller [Wed, 24 Apr 2013 01:34:46 +0000 (18:34 -0700)]
Fix the build.
This fixes a bad merge in LockSettingsService.
Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa
Svetoslav [Wed, 24 Apr 2013 01:05:38 +0000 (01:05 +0000)]
Merge "Fixing bugs exposed when moving accessibility CTS tests to UiAutomation." into jb-mr2-dev
Jim Miller [Wed, 24 Apr 2013 01:04:10 +0000 (01:04 +0000)]
Merge "Fix bug where owner info wasn't being updated properly." into jb-mr2-dev
Svetoslav [Tue, 23 Apr 2013 01:34:02 +0000 (18:34 -0700)]
Fixing bugs exposed when moving accessibility CTS tests to UiAutomation.
1. UiAutomation#executeAndWaitForEvent method was invoking the passed
runnable while holding the lock which may lead to a deadlock. For
example: a runnable that calls getActivity() gets us into a state
like this.
2. UI automation services did not get all capabilities such a
service can have. Now a UI test service gets all of them.
3. When UiAutomation was exiting for event fired as a result of a
performed action, it was checking whether the received evnet time
is strictly before the time of executing the command that should
fire the event. However, if the execution is fast enough, i.e.
less than one millisecond, then the event time and the execution
time are the same. This was leading to a missed signal in rare
cases.
4. AccessibilityNodeInfoCache was not clearing the relevant state
for accessibility focus clearing event.
5. Accessibility text traversal in TextView was partially using text
and partially content description - broken. Now we are using the
text since for text view and content desc for other views. In other
words, we are using the most precise text we have.
6. AccessibilityManagerService was not granting capabilities of a
UiAutomation service - plainly wrong.
CTS change:https://googleplex-android-review.googlesource.com/#/c/300693/
bug:
8695422
bug:
8657560
Change-Id: I9afc5c3c69eb51f1c01930959232f44681b15e86
Jim Miller [Tue, 23 Apr 2013 00:17:03 +0000 (17:17 -0700)]
Fix bug where owner info wasn't being updated properly.
There was a bug where older platforms only stored the 'enabled'
value if the checkbox in Settings was toggled at least once. This
caused the checkbox to be checked off when upgrading the device.
The code now mimicks the old behavior by detecting a non-empty
info string and setting 'enabled' appropriately.
Fixes bug
8659048
Change-Id: If2431d54f168a0aab286628165dd3f6b4a0d5cf8
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
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:47:51 +0000 (22:47 +0000)]
Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
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:57:53 +0000 (21:57 +0000)]
Merge "Keep device state always updated" into jb-mr2-dev
Wink Saville [Tue, 23 Apr 2013 21:26:51 +0000 (14:26 -0700)]
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
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: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: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
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
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