OSDN Git Service
The Android Open Source Project [Thu, 13 Jun 2013 01:04:15 +0000 (18:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Icee761e7873b6c14395d33c06ad53f5bff480839
Dirk Dougherty [Thu, 13 Jun 2013 00:45:53 +0000 (17:45 -0700)]
am
95793530: am
2b336ce4: am
94e207b9: am
3574bef4: am
47f5c410: am
57bb89f0: Doc change: Add docs for GP Purchase Status API.
* commit '
9579353081f4857c6a9672675dca22182b588e31':
Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:43:07 +0000 (17:43 -0700)]
am
2b336ce4: am
94e207b9: am
3574bef4: am
47f5c410: am
57bb89f0: Doc change: Add docs for GP Purchase Status API.
* commit '
2b336ce4d8f740715a5b2f2cc8fb07a99300ce73':
Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:40:06 +0000 (17:40 -0700)]
am
94e207b9: am
3574bef4: am
47f5c410: am
57bb89f0: Doc change: Add docs for GP Purchase Status API.
* commit '
94e207b95799125dcc6ea65eb68697a6568579a3':
Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:37:26 +0000 (17:37 -0700)]
am
3574bef4: am
47f5c410: am
57bb89f0: Doc change: Add docs for GP Purchase Status API.
* commit '
3574bef4625402a99224a9c1051b295ed9fa0645':
Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:35:17 +0000 (17:35 -0700)]
am
47f5c410: am
57bb89f0: Doc change: Add docs for GP Purchase Status API.
* commit '
47f5c4102d096c56f9ebc71bdb351b58cfb8de42':
Doc change: Add docs for GP Purchase Status API.
Dirk Dougherty [Thu, 13 Jun 2013 00:33:37 +0000 (17:33 -0700)]
am
57bb89f0: Doc change: Add docs for GP Purchase Status API.
* commit '
57bb89f0b267140ae7f50e31ec0e3023e8836639':
Doc change: Add docs for GP Purchase Status API.
Jeff Brown [Thu, 13 Jun 2013 00:02:43 +0000 (17:02 -0700)]
am
a37c3f18: Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev
* commit '
a37c3f18e64f45d19a019ab47429413481fded9f':
Fix logspam when battery sysfs file not available.
Jeff Brown [Wed, 12 Jun 2013 23:59:01 +0000 (23:59 +0000)]
Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev
Baligh Uddin [Wed, 12 Jun 2013 17:38:17 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6b8f9443618863dbe34ca26e5832bee11ccc014
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Jun 2013 16:52:55 +0000 (09:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I41cb7ffb3961af387e425a6a80726e1213ae10f1
Auto-generated-cl: translation import
Wink Saville [Mon, 10 Jun 2013 17:10:42 +0000 (10:10 -0700)]
Allow carrier provisioning to turn toggle radio power.
Previously CarrierProvisioning toggle airplane mode, but now that's
available only by the system.
Bug:
9356811
Change-Id: I5167f8614c07bafb688983a360a008f76403b2b8
Winson Chung [Tue, 4 Jun 2013 21:25:28 +0000 (14:25 -0700)]
Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug
9270309)
Change-Id: I6cfb8e0c586fad7360a07f98e1280a954f62e5e1
Wink Saville [Wed, 12 Jun 2013 23:16:45 +0000 (16:16 -0700)]
am
30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
* commit '
30af45f47fd71feee0f9e5f8e049ba0380bc7793':
Allow carrier provisioning to turn toggle radio power.
Wink Saville [Wed, 12 Jun 2013 23:13:06 +0000 (23:13 +0000)]
Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
Dirk Dougherty [Wed, 12 Jun 2013 03:10:54 +0000 (20:10 -0700)]
Doc change: Add docs for GP Purchase Status API.
Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00
Jeff Brown [Wed, 12 Jun 2013 22:57:38 +0000 (15:57 -0700)]
Fix logspam when battery sysfs file not available.
This was a regression caused by a recent change to use String8
instead of char*. We missed the implicit null check here.
Bug:
9377604
Change-Id: I7eff138096622c47b5d45678010373dc82138384
Baligh Uddin [Wed, 12 Jun 2013 20:17:49 +0000 (13:17 -0700)]
am
909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
909b6db6a327c2102bbcaa56720428319d0d4e94':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 20:17:47 +0000 (13:17 -0700)]
am
96acc0e5: Import translations. DO NOT MERGE
* commit '
96acc0e5f16ef575e306eb8217484a5f3471f917':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Jun 2013 20:16:34 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 12 Jun 2013 17:38:17 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6b8f9443618863dbe34ca26e5832bee11ccc014
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Jun 2013 16:52:55 +0000 (09:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I41cb7ffb3961af387e425a6a80726e1213ae10f1
Auto-generated-cl: translation import
The Android Open Source Project [Wed, 12 Jun 2013 14:23:31 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Ife328fef3a7cc1a88562fd88a85daa626b19c930
The Android Automerger [Wed, 12 Jun 2013 12:55:58 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Christopher Tate [Mon, 10 Jun 2013 23:55:02 +0000 (16:55 -0700)]
Need to explicitly disable scan-always when turning off wifi
... when you want wifi to be really most sincerely off, because
settings restore is about to rewrite the conf file.
Bug
9032154
Change-Id: I6a3a34ac3f14ec43aa9d9cc0159fca6168ccd0a2
Jean-Michel Trivi [Fri, 7 Jun 2013 22:48:22 +0000 (15:48 -0700)]
Let RemoteControlDisplay know more about playback position
The BT stack needs to differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.
Bug
9294855
Change-Id: I05cba82a073e6e0aaea1d8bbf9cc8c99da715f58
Marco Nelissen [Mon, 10 Jun 2013 22:06:28 +0000 (15:06 -0700)]
Unhide MediaExtractor.getPsshInfo()
b/
9373882
Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
Christopher Tate [Tue, 11 Jun 2013 22:07:00 +0000 (15:07 -0700)]
am
76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
* commit '
76b76666f5c28751db6ed8791fd54ec430d4361a':
Need to explicitly disable scan-always when turning off wifi
Christopher Tate [Tue, 11 Jun 2013 22:04:38 +0000 (22:04 +0000)]
Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
The Android Open Source Project [Tue, 11 Jun 2013 21:56:51 +0000 (14:56 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I7100db02d39d7d91bb3c2b8eea070a48a8f7c139
Daniel Sandler [Tue, 11 Jun 2013 21:11:29 +0000 (14:11 -0700)]
am
cd5b3310: Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev
* commit '
cd5b3310e23b918fe7f49352e28f7d1b69ca859c':
Add LTE overlays for signal strength indicators.
Zhihai Xu [Tue, 11 Jun 2013 21:11:19 +0000 (14:11 -0700)]
am
bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev
* commit '
bcc6ae88f97caa7591a7507a90ec1152ee7cab7a':
Let RemoteControlDisplay know more about playback position
Scott Main [Tue, 11 Jun 2013 21:10:29 +0000 (14:10 -0700)]
am
276c72b7: am
8f678878: am
6e15b52e: am
7728e1d6: replace obsolete links. bug:
9380063
* commit '
276c72b714f0dc1b5aa49cf78924cd2af09b4c8b':
replace obsolete links. bug:
9380063
Marco Nelissen [Tue, 11 Jun 2013 21:10:26 +0000 (14:10 -0700)]
am
37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev
* commit '
374904621a79eb12416da4a26be515ae9a2d243a':
Unhide MediaExtractor.getPsshInfo()
Scott Main [Tue, 11 Jun 2013 21:10:18 +0000 (14:10 -0700)]
am
8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug:
9359960" into jb-mr2-dev
* commit '
8fb120b67d785dc5ab0ebdb8efd7988da1a94365':
add ViewGroup's layoutMode attribute to public resources bug:
9359960
Scott Main [Tue, 11 Jun 2013 21:10:16 +0000 (14:10 -0700)]
am
938e8b67: am
d731c902: am
f0380a26: am
343f581d: Merge "fix typo and clarify class references in database lesson bug:
9372560" into jb-mr1.1-ub-dev
* commit '
938e8b67c2c9d0e4c797a317a10148be42aa80ec':
fix typo and clarify class references in database lesson bug:
9372560
Baligh Uddin [Tue, 11 Jun 2013 21:10:03 +0000 (14:10 -0700)]
am
ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
ebb17713dac153a0efdbb9ec102b8a6a99242f5f':
Import translations. DO NOT MERGE
Ashish Sharma [Tue, 11 Jun 2013 21:09:56 +0000 (14:09 -0700)]
am
58100fb8: Merge "Do not allow 0 or smaller periodicity for syncs. b/
9295383" into jb-mr2-dev
* commit '
58100fb813f4a68386757fc80244dbb756ea35d5':
Do not allow 0 or smaller periodicity for syncs. b/
9295383
John Spurlock [Tue, 11 Jun 2013 21:09:53 +0000 (14:09 -0700)]
am
a9221987: Merge "Save Notification large icon to extras." into jb-mr2-dev
* commit '
a9221987c047a9a05da9cc4f3446a0d581494a85':
Save Notification large icon to extras.
Scott Main [Tue, 11 Jun 2013 21:09:47 +0000 (14:09 -0700)]
am
fe7c2220: Merge "add NA message for any "signature" level permissions" into jb-mr2-dev
* commit '
fe7c2220a129d3bea753f14f111b4f6e335de237':
add NA message for any "signature" level permissions
Chris Craik [Tue, 11 Jun 2013 21:09:41 +0000 (14:09 -0700)]
am
cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev
* commit '
cb5d644fb8956962b6a89f8d384b16819af5fdf9':
Workaround possible use after delete
Daniel Sandler [Tue, 11 Jun 2013 21:09:38 +0000 (14:09 -0700)]
am
4e5694aa: Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev
* commit '
4e5694aaa7e03723e248c0d1e47e5a322c403a90':
Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
Daniel Sandler [Tue, 11 Jun 2013 20:57:39 +0000 (20:57 +0000)]
Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev
Zhihai Xu [Tue, 11 Jun 2013 19:38:58 +0000 (19:38 +0000)]
Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev
Scott Main [Tue, 11 Jun 2013 15:03:22 +0000 (08:03 -0700)]
am
8f678878: am
6e15b52e: am
7728e1d6: replace obsolete links. bug:
9380063
* commit '
8f6788786bdd36e26b6219b94ce7288115e020af':
replace obsolete links. bug:
9380063
Scott Main [Tue, 11 Jun 2013 15:01:13 +0000 (08:01 -0700)]
am
6e15b52e: am
7728e1d6: replace obsolete links. bug:
9380063
* commit '
6e15b52e712d4c1836a06c579452ce872c1dfd91':
replace obsolete links. bug:
9380063
Scott Main [Tue, 11 Jun 2013 14:59:18 +0000 (07:59 -0700)]
am
7728e1d6: replace obsolete links. bug:
9380063
* commit '
7728e1d6543df2758687b4b62b9c626d1c3e59dd':
replace obsolete links. bug:
9380063
Scott Main [Tue, 11 Jun 2013 14:54:31 +0000 (07:54 -0700)]
replace obsolete links.
bug:
9380063
Change-Id: Ib40ce359bfd5f44494c5b378e768d73011c29636
The Android Automerger [Tue, 11 Jun 2013 12:55:18 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Marco Nelissen [Tue, 11 Jun 2013 04:01:46 +0000 (04:01 +0000)]
Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev
Christopher Tate [Mon, 10 Jun 2013 23:55:02 +0000 (16:55 -0700)]
Need to explicitly disable scan-always when turning off wifi
... when you want wifi to be really most sincerely off, because
settings restore is about to rewrite the conf file.
Bug
9032154
Change-Id: I6a3a34ac3f14ec43aa9d9cc0159fca6168ccd0a2
Scott Main [Mon, 10 Jun 2013 23:54:10 +0000 (23:54 +0000)]
Merge "add ViewGroup's layoutMode attribute to public resources bug:
9359960" into jb-mr2-dev
Scott Main [Mon, 10 Jun 2013 23:19:13 +0000 (16:19 -0700)]
am
d731c902: am
f0380a26: am
343f581d: Merge "fix typo and clarify class references in database lesson bug:
9372560" into jb-mr1.1-ub-dev
* commit '
d731c902408b0a86deb8fce04b8391bec756f498':
fix typo and clarify class references in database lesson bug:
9372560
Scott Main [Mon, 10 Jun 2013 23:17:45 +0000 (16:17 -0700)]
am
f0380a26: am
343f581d: Merge "fix typo and clarify class references in database lesson bug:
9372560" into jb-mr1.1-ub-dev
* commit '
f0380a267c8ae9c351d5799752fe5fdb9b210800':
fix typo and clarify class references in database lesson bug:
9372560
Scott Main [Mon, 10 Jun 2013 23:16:33 +0000 (16:16 -0700)]
am
343f581d: Merge "fix typo and clarify class references in database lesson bug:
9372560" into jb-mr1.1-ub-dev
* commit '
343f581de20c9a7ddeb69271e6c1e19c2f417b19':
fix typo and clarify class references in database lesson bug:
9372560
Scott Main [Mon, 10 Jun 2013 23:14:32 +0000 (23:14 +0000)]
Merge "fix typo and clarify class references in database lesson bug:
9372560" into jb-mr1.1-ub-dev
Baligh Uddin [Mon, 10 Jun 2013 14:52:12 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa894cf0f19b3e153c980a9a48a92beb361124ec
Auto-generated-cl: translation import
Ashish Sharma [Mon, 10 Jun 2013 18:25:51 +0000 (11:25 -0700)]
Do not allow 0 or smaller periodicity for syncs.
b/
9295383
Change-Id: I5f758f4a033d74e42a04b214a6b70b94d394280d
(cherry picked from commit
4970974d74a2986a333e645a5c141ef5f9a753cc)
John Spurlock [Mon, 10 Jun 2013 15:45:17 +0000 (11:45 -0400)]
Save Notification large icon to extras.
This piece of semantic info was defined, cleared properly on
lightenPayload, but never saved.
Change-Id: Ib2c5372a57d2a01617e401231c150260d22b05d6
Chris Craik [Mon, 10 Jun 2013 18:28:51 +0000 (11:28 -0700)]
Workaround possible use after delete
bug:
9321162
Change-Id: Ic35af5b5925da56e9a143e6b33658831038f3b72
Daniel Sandler [Mon, 10 Jun 2013 16:06:51 +0000 (12:06 -0400)]
Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
The specific bug is this: SIM PIN unlock attempt toasts are
sent from com.android.settings/.IccLockSettings which runs
as the phone process; NoMan wasn't having any of that and
was blocking the toasts.
With this change we treat SYSTEM_UID and PHONE_UID the same
for all security checks, and furthermore we guarantee that
all notifications and toasts from those UIDs will be
permitted.
Bug:
9098802
Change-Id: Idc788527aa2cb38e015fe92773766a514167999e
Romain Guy [Fri, 7 Jun 2013 22:36:49 +0000 (15:36 -0700)]
Don't orphan footers with transient state
Bug #
8725945
Selecting text in an EditText causes the View to have transient
state. This would in turn cause the View to be removed from its
ListView parent. When removed, the EditText would lose its
AttachInfo, causing all sorts of problems. Headers and footers
must not be removed, only detached. This is the part of the fix
in AbsListView.
Fixing AbsListView triggered a second bug: when a View is removed
from the Window manager, it would keep its parent assigned, thus
making it impossible to add it again to the window manager. When
a ViewRootImpl goes through doDie(), it must set its content view's
parent to null to properly cleanup.
Change-Id: I0489daa74f8f7fcf85526f0928f8925ec30d4f42
Jeff Sharkey [Fri, 7 Jun 2013 22:09:15 +0000 (15:09 -0700)]
Avoid logging sensitive data.
When building commands to send across NativeDaemonConnector, scrub
sensitive arguments to prevent them from being logged.
Bug:
8609800
Change-Id: I84b16791749264a010f7e59f9918f68d71bac6b9
Marco Nelissen [Mon, 10 Jun 2013 22:06:28 +0000 (15:06 -0700)]
Unhide MediaExtractor.getPsshInfo()
b/
9373882
Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
Scott Main [Mon, 10 Jun 2013 21:30:35 +0000 (14:30 -0700)]
add ViewGroup's layoutMode attribute to public resources
bug:
9359960
Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
Baligh Uddin [Mon, 10 Jun 2013 21:07:18 +0000 (21:07 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Scott Main [Mon, 10 Jun 2013 20:49:53 +0000 (13:49 -0700)]
fix typo and clarify class references in database lesson
bug:
9372560
Change-Id: I703c4196a026cb0b1469ee55491ee674868768ca
Ashish Sharma [Mon, 10 Jun 2013 20:15:59 +0000 (20:15 +0000)]
Merge "Do not allow 0 or smaller periodicity for syncs. b/
9295383" into jb-mr2-dev
John Spurlock [Mon, 10 Jun 2013 20:11:19 +0000 (20:11 +0000)]
Merge "Save Notification large icon to extras." into jb-mr2-dev
Scott Main [Mon, 10 Jun 2013 19:21:16 +0000 (19:21 +0000)]
Merge "add NA message for any "signature" level permissions" into jb-mr2-dev
Ashish Sharma [Mon, 10 Jun 2013 18:25:51 +0000 (11:25 -0700)]
Do not allow 0 or smaller periodicity for syncs.
b/
9295383
Change-Id: I5f758f4a033d74e42a04b214a6b70b94d394280d
(cherry picked from commit
4970974d74a2986a333e645a5c141ef5f9a753cc)
Chris Craik [Mon, 10 Jun 2013 19:12:18 +0000 (19:12 +0000)]
Merge "Workaround possible use after delete" into jb-mr2-dev
Scott Main [Mon, 10 Jun 2013 18:05:55 +0000 (11:05 -0700)]
add NA message for any "signature" level permissions
Change-Id: If76e9e3b7ffc5d97422321db312a03869c407f08
Daniel Sandler [Mon, 10 Jun 2013 18:31:51 +0000 (18:31 +0000)]
Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev
Chris Craik [Mon, 10 Jun 2013 18:28:51 +0000 (11:28 -0700)]
Workaround possible use after delete
bug:
9321162
Change-Id: Ic35af5b5925da56e9a143e6b33658831038f3b72
Romain Guy [Mon, 10 Jun 2013 17:26:57 +0000 (10:26 -0700)]
am
8d8fc469: Merge "Don\'t orphan footers with transient state Bug #
8725945" into jb-mr2-dev
* commit '
8d8fc469952ffe3feb45e52388f2129f8dd5e40c':
Don't orphan footers with transient state Bug #
8725945
Romain Guy [Mon, 10 Jun 2013 17:23:24 +0000 (17:23 +0000)]
Merge "Don't orphan footers with transient state Bug #
8725945" into jb-mr2-dev
Wink Saville [Mon, 10 Jun 2013 17:10:42 +0000 (10:10 -0700)]
Allow carrier provisioning to turn toggle radio power.
Previously CarrierProvisioning toggle airplane mode, but now that's
available only by the system.
Bug:
9356811
Change-Id: I5167f8614c07bafb688983a360a008f76403b2b8
Daniel Sandler [Mon, 10 Jun 2013 16:06:51 +0000 (12:06 -0400)]
Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
The specific bug is this: SIM PIN unlock attempt toasts are
sent from com.android.settings/.IccLockSettings which runs
as the phone process; NoMan wasn't having any of that and
was blocking the toasts.
With this change we treat SYSTEM_UID and PHONE_UID the same
for all security checks, and furthermore we guarantee that
all notifications and toasts from those UIDs will be
permitted.
Bug:
9098802
Change-Id: Idc788527aa2cb38e015fe92773766a514167999e
John Spurlock [Mon, 10 Jun 2013 15:45:17 +0000 (11:45 -0400)]
Save Notification large icon to extras.
This piece of semantic info was defined, cleared properly on
lightenPayload, but never saved.
Change-Id: Ib2c5372a57d2a01617e401231c150260d22b05d6
The Android Open Source Project [Mon, 10 Jun 2013 15:13:45 +0000 (08:13 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I40b8952e805164e6d984273872241dc6be2ad80a
Baligh Uddin [Mon, 10 Jun 2013 14:52:12 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa894cf0f19b3e153c980a9a48a92beb361124ec
Auto-generated-cl: translation import
The Android Automerger [Mon, 10 Jun 2013 12:55:18 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jeff Sharkey [Mon, 10 Jun 2013 02:07:48 +0000 (19:07 -0700)]
am
56cd646a: Avoid logging sensitive data.
* commit '
56cd646abeae51e806791f82ab0995fe047b1fe4':
Avoid logging sensitive data.
The Android Automerger [Sun, 9 Jun 2013 12:55:38 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jean-Michel Trivi [Fri, 7 Jun 2013 22:48:22 +0000 (15:48 -0700)]
Let RemoteControlDisplay know more about playback position
The BT stack needs to differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.
Bug
9294855
Change-Id: I05cba82a073e6e0aaea1d8bbf9cc8c99da715f58
Romain Guy [Fri, 7 Jun 2013 22:36:49 +0000 (15:36 -0700)]
Don't orphan footers with transient state
Bug #
8725945
Selecting text in an EditText causes the View to have transient
state. This would in turn cause the View to be removed from its
ListView parent. When removed, the EditText would lose its
AttachInfo, causing all sorts of problems. Headers and footers
must not be removed, only detached. This is the part of the fix
in AbsListView.
Fixing AbsListView triggered a second bug: when a View is removed
from the Window manager, it would keep its parent assigned, thus
making it impossible to add it again to the window manager. When
a ViewRootImpl goes through doDie(), it must set its content view's
parent to null to properly cleanup.
Change-Id: I0489daa74f8f7fcf85526f0928f8925ec30d4f42
Jeff Sharkey [Fri, 7 Jun 2013 22:09:15 +0000 (15:09 -0700)]
Avoid logging sensitive data.
When building commands to send across NativeDaemonConnector, scrub
sensitive arguments to prevent them from being logged.
Bug:
8609800
Change-Id: I84b16791749264a010f7e59f9918f68d71bac6b9
Adam Powell [Fri, 7 Jun 2013 18:52:36 +0000 (11:52 -0700)]
am
d3cb6bcf: am
8152c794: Merge "Fix incorrect fragment animation used for hiding fragments"
* commit '
d3cb6bcf0f63317d1078a2f897d4824ba91402a6':
Fix incorrect fragment animation used for hiding fragments
Adam Powell [Fri, 7 Jun 2013 18:49:32 +0000 (11:49 -0700)]
am
8152c794: Merge "Fix incorrect fragment animation used for hiding fragments"
* commit '
8152c7940a10f11a9edb16ae1daeca8a6fe2e6bb':
Fix incorrect fragment animation used for hiding fragments
Adam Powell [Fri, 7 Jun 2013 18:46:18 +0000 (18:46 +0000)]
Merge "Fix incorrect fragment animation used for hiding fragments"
Adam Powell [Fri, 7 Jun 2013 17:16:08 +0000 (10:16 -0700)]
Fix incorrect fragment animation used for hiding fragments
Mirror of support lib patch
https://android-review.googlesource.com/#/c/60032/ into
frameworks/base.
Change-Id: I8d1cb2e217721336674b8e3e2ef8722a8d9baefd
Scott Main [Fri, 7 Jun 2013 16:44:18 +0000 (09:44 -0700)]
am
00d17f7a: add attributes to accessibility service info
* commit '
00d17f7aab54ef055d35da603dab5a7bae751876':
add attributes to accessibility service info
Scott Main [Fri, 7 Jun 2013 01:37:59 +0000 (18:37 -0700)]
add attributes to accessibility service info
Change-Id: I3651544164f718003b8eb1235a7d723f1bcee5be
Daniel Sandler [Thu, 6 Jun 2013 20:15:43 +0000 (16:15 -0400)]
Add LTE overlays for signal strength indicators.
Note that operators that wish to show "4G" instead of "LTE"
on these networks can set config_show4GForLTE to true.
Bug:
9265513
Bug:
9265217
Change-Id: If7f3580da7266b0d0c62639e30684393d4e03392
Scott Main [Fri, 7 Jun 2013 00:55:15 +0000 (17:55 -0700)]
am
b8e4d95c: am
a7ba45ec: am
7381c7e5: am
b2b216e7: add links to a couple intellij docs for Eclipse users
* commit '
b8e4d95c22e0f44aee5cb3001262b5154bf90cb7':
add links to a couple intellij docs for Eclipse users
Scott Main [Fri, 7 Jun 2013 00:51:20 +0000 (17:51 -0700)]
am
a7ba45ec: am
7381c7e5: am
b2b216e7: add links to a couple intellij docs for Eclipse users
* commit '
a7ba45ec7cbaaa1dbfcd6601bb42abd5ea39547f':
add links to a couple intellij docs for Eclipse users
Scott Main [Thu, 6 Jun 2013 22:40:05 +0000 (15:40 -0700)]
am
7381c7e5: am
b2b216e7: add links to a couple intellij docs for Eclipse users
* commit '
7381c7e54b8dfb91b6fac5c7e00a62738c849135':
add links to a couple intellij docs for Eclipse users
Scott Main [Thu, 6 Jun 2013 22:38:16 +0000 (15:38 -0700)]
am
b2b216e7: add links to a couple intellij docs for Eclipse users
* commit '
b2b216e79880884f7ebbea6ee997fc88edc229fc':
add links to a couple intellij docs for Eclipse users
Scott Main [Thu, 6 Jun 2013 22:22:30 +0000 (15:22 -0700)]
add links to a couple intellij docs for Eclipse users
Change-Id: I6f373c62781e9d4b6b296d92242f4296b1fe6fe4