OSDN Git Service
Glenn Kasten [Tue, 11 Jun 2013 22:36:06 +0000 (15:36 -0700)]
Fix build
Change-Id: Iacac057570e9fcfe850ee597c0a26b2d06ab7910
Ken Sumrall [Tue, 11 Jun 2013 22:07:27 +0000 (22:07 +0000)]
Merge "Don't wait for the MountService to be ready when encrypting"
Daniel Sandler [Tue, 11 Jun 2013 21:13:58 +0000 (14:13 -0700)]
am
4a9fcaf4: am
cd5b3310: Merge "Add LTE overlays for signal strength indicators." into jb-mr2-dev
* commit '
4a9fcaf49f6da3f28334bb8e5eddea51c0b6fc59':
Add LTE overlays for signal strength indicators.
Zhihai Xu [Tue, 11 Jun 2013 21:13:56 +0000 (14:13 -0700)]
am
36e90664: am
bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev
* commit '
36e90664c7b74bd90b56b17afb407729f7949108':
Let RemoteControlDisplay know more about playback position
Scott Main [Tue, 11 Jun 2013 21:13:53 +0000 (14:13 -0700)]
am
994c7b47: am
276c72b7: am
8f678878: am
6e15b52e: am
7728e1d6: replace obsolete links. bug:
9380063
* commit '
994c7b4768b661f86542a1096b199f772e8a94a2':
replace obsolete links. bug:
9380063
Marco Nelissen [Tue, 11 Jun 2013 21:13:51 +0000 (14:13 -0700)]
am
3826e8bd: am
37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev
* commit '
3826e8bd6e30dbda90f330e4b3facbccc8c4bb9e':
Unhide MediaExtractor.getPsshInfo()
Scott Main [Tue, 11 Jun 2013 21:13:48 +0000 (14:13 -0700)]
am
be173f6a: am
8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug:
9359960" into jb-mr2-dev
* commit '
be173f6a16619ed82469bda7cf0df7c3763d3c81':
add ViewGroup's layoutMode attribute to public resources bug:
9359960
Scott Main [Tue, 11 Jun 2013 21:13:46 +0000 (14:13 -0700)]
am
2ccb564d: 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 '
2ccb564d8066972847d8a5e4b8820c72638134b1':
fix typo and clarify class references in database lesson bug:
9372560
Baligh Uddin [Tue, 11 Jun 2013 21:13:43 +0000 (14:13 -0700)]
am
26560925: (-s ours) am
ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
26560925f7326f8144d5b58419adb6b24bb9a0fd':
Import translations. DO NOT MERGE
Ashish Sharma [Tue, 11 Jun 2013 21:13:40 +0000 (14:13 -0700)]
am
c8aa0b49: am
58100fb8: Merge "Do not allow 0 or smaller periodicity for syncs. b/
9295383" into jb-mr2-dev
* commit '
c8aa0b49a6aa766c905e7da516c24af1c34710e3':
Do not allow 0 or smaller periodicity for syncs. b/
9295383
John Spurlock [Tue, 11 Jun 2013 21:13:37 +0000 (14:13 -0700)]
am
46ae4122: am
a9221987: Merge "Save Notification large icon to extras." into jb-mr2-dev
* commit '
46ae41221f18235f72c7de47ca124254a89dc1f4':
Save Notification large icon to extras.
Scott Main [Tue, 11 Jun 2013 21:13:35 +0000 (14:13 -0700)]
am
26bc073d: am
fe7c2220: Merge "add NA message for any "signature" level permissions" into jb-mr2-dev
* commit '
26bc073dfa32c8122ce194cfc39e2dfc44370fcd':
add NA message for any "signature" level permissions
Chris Craik [Tue, 11 Jun 2013 21:13:32 +0000 (14:13 -0700)]
am
8cb26c09: am
cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev
* commit '
8cb26c099dc6357340141c9d81a1131ee404ae41':
Workaround possible use after delete
Daniel Sandler [Tue, 11 Jun 2013 21:13:28 +0000 (14:13 -0700)]
am
0a2ff8db: am
4e5694aa: Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev
* commit '
0a2ff8db4339261d701ad542ac770fb92bf2127b':
Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
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
Igor Murashkin [Tue, 11 Jun 2013 20:45:18 +0000 (20:45 +0000)]
Merge "camera: Add Java binder proxies for some existing binder interfaces"
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
Igor Murashkin [Fri, 31 May 2013 23:43:48 +0000 (16:43 -0700)]
camera: Add Java binder proxies for some existing binder interfaces
Note that anything not in the AIDL interfaces, will NOT be magically
compatible if you just add it there. It probably requires a change in
frameworks/av/camera as well.
Bug:
9213377
Change-Id: I91d3efb755ed2e3ace139f83573f86efdccccd06
Dmitry Shmidt [Mon, 10 Jun 2013 21:37:08 +0000 (14:37 -0700)]
softap: Match new config format
Change-Id: Ic83a73678149aa56069c4a13d87e38de66243aa3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Amith Yamasani [Tue, 11 Jun 2013 17:47:44 +0000 (17:47 +0000)]
Merge "Hide "Take bugreport" for secondary users"
John Spurlock [Tue, 11 Jun 2013 17:20:41 +0000 (17:20 +0000)]
Merge "Log errors found in notification listener callbacks."
Baligh Uddin [Tue, 11 Jun 2013 15:33:07 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 11 Jun 2013 15:31:32 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Marco Nelissen [Tue, 11 Jun 2013 04:01:46 +0000 (04:01 +0000)]
Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev
Romain Guy [Tue, 11 Jun 2013 01:26:23 +0000 (01:26 +0000)]
Merge "Make constants final"
Romain Guy [Tue, 11 Jun 2013 00:03:47 +0000 (17:03 -0700)]
Make constants final
Change-Id: Ifd54e55011ab63a10ddf851529ce4779447133e0
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
Adam Powell [Mon, 10 Jun 2013 23:28:35 +0000 (16:28 -0700)]
Add View methods isAttachedToWindow and hasLayout
isAttachedToWindow does what it says on the label and provides a
standard, public API for checking a view's attachment state. This
removes the need for tracking this out of band in response to
onAttachedToWindow/onDetachedFromWindow in custom view
implementations.
hasLayout returns true whenever the view has been through at least one
call to layout() since the last time it was attached to or detached
from a window. This allows for standard checks in code that needs to
behave differently if first layout has not completed yet, such as
whether or not to no-op an animation in order to set up initial state.
Change-Id: I8dab70dcd5a22a32e260ed50987ccdaa4100072b
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
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
Chet Haase [Mon, 10 Jun 2013 21:07:41 +0000 (21:07 +0000)]
Merge "Add dynamic scene creation/transition capability"
Baligh Uddin [Mon, 10 Jun 2013 21:07:18 +0000 (21:07 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Chet Haase [Mon, 10 Jun 2013 20:00:06 +0000 (13:00 -0700)]
Add dynamic scene creation/transition capability
Add TransitionManager.beginDelayedTransition() to handle starting a transition
on the next frame for a given scene root based on all changes that
take place between the first call to that method and the next animation frame.
Issue #
9321937 Transitions: consider batching up multiple scene actions
Change-Id: I3fc92b6b4ec5ff42b1e678bcfd385703e32eba2a
Craig Mautner [Mon, 10 Jun 2013 20:57:17 +0000 (20:57 +0000)]
Merge "Don't change task type for launcher activities."
Craig Mautner [Mon, 10 Jun 2013 20:54:49 +0000 (13:54 -0700)]
Don't change task type for launcher activities.
When the launcher starts a new activity don't let it change the task
type. This would cause the stacks to get confused.
Fixes bug
9323103.
Change-Id: Ie1d9c3bf85461827c7255e68003f11ed5a38f63b
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
Amith Yamasani [Mon, 10 Jun 2013 20:43:10 +0000 (13:43 -0700)]
Hide "Take bugreport" for secondary users
In QuickSettings and GlobalActions.
Bug:
9304471
Change-Id: Ia3118b3258b1f6983c47e96168b7b875b6fc798b
John Spurlock [Mon, 10 Jun 2013 20:39:19 +0000 (20:39 +0000)]
Merge "Save Notification large icon to extras."
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
Svetoslav [Mon, 10 Jun 2013 19:55:39 +0000 (19:55 +0000)]
Merge "Notification for changed subtree in accessibility mode not fired properly."
Svetoslav [Mon, 10 Jun 2013 19:51:09 +0000 (12:51 -0700)]
Notification for changed subtree in accessibility mode not fired properly.
We fire notifications that the a view subtree changed for accessibility.
In some cases the notifications were fired if accessibility is not
enabled. This is now fixed. Also the runnable for making the recurring
subtree change was not dequeued if it was pending but we received a
request which we decided to run immediately.
bug:
9337912
Change-Id: I27401b3d11f81c653e8761a704ee530263b08c3a
Craig Mautner [Mon, 10 Jun 2013 19:21:27 +0000 (19:21 +0000)]
Merge "Dismiss immediately to maintain consistent state."
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
John Spurlock [Mon, 10 Jun 2013 19:16:22 +0000 (15:16 -0400)]
Log errors found in notification listener callbacks.
Otherwise, exceptions thrown inside listener callbacks are
not logged at all.
Change-Id: Iaef28e06abc4d6caf66051725e14a17ac954173e
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
Ashish Sharma [Mon, 10 Jun 2013 19:05:27 +0000 (19:05 +0000)]
Merge "Do not allow 0 or smaller periodicity for syncs. b/
9295383"
Scott Main [Mon, 10 Jun 2013 18:05:55 +0000 (11:05 -0700)]
add NA message for any "signature" level permissions
Change-Id: If76e9e3b7ffc5d97422321db312a03869c407f08
Craig Mautner [Mon, 10 Jun 2013 18:27:26 +0000 (11:27 -0700)]
Dismiss immediately to maintain consistent state.
Fix bug introduced by deferring nulling of mParent.
In dismissDialog the removal was being put on a queue while the
state of the Dialog was being updated immediately. This meant that
if a show() was called before the remove was executed it would try
and add the DecorView a second time. Boom!
Fixes bug
9370301.
Change-Id: I576d1e207c786bc2e21dfd40cb94f2b63a020fe2
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
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
Romain Guy [Mon, 10 Jun 2013 18:12:09 +0000 (11:12 -0700)]
am
7a6e1297: am
8d8fc469: Merge "Don\'t orphan footers with transient state Bug #
8725945" into jb-mr2-dev
* commit '
7a6e129759672f0c1b0ce462d389c0f469e7348f':
Don't orphan footers with transient state Bug #
8725945
The Android Open Source Project [Mon, 10 Jun 2013 18:11:55 +0000 (11:11 -0700)]
am
b72a2204: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
b72a2204113804855d4e64c8e8f5f1d1598c7f50':
Kenny Root [Mon, 10 Jun 2013 18:09:28 +0000 (11:09 -0700)]
resolved conflicts for merge of
e96a8207 to master
Change-Id: I90801b35ed0c00078a47faadc7fbb05d2e5fe381
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
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
John Spurlock [Mon, 10 Jun 2013 15:37:08 +0000 (11:37 -0400)]
Save Notification large icon to extras.
This piece of semantic info was defined, cleared properly on
lightenPayload, but never saved.
Change-Id: I41fb5f836f9afe2be5407f292bd6b5e02dfc9cb3
Baligh Uddin [Mon, 10 Jun 2013 15:24:15 +0000 (08:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieae6313e43826f41d8a1ebef998ff4495184d1d1
Auto-generated-cl: translation import
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 15:06:05 +0000 (08:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0218059fd7c9f3f680110d4da707408fc6dcfc9c
Auto-generated-cl: translation import
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
Dianne Hackborn [Fri, 7 Jun 2013 20:25:29 +0000 (13:25 -0700)]
Initial super-primitive process tracker.
The goal of this is to keep track of what app processes
are doing, to determine who is being abusive, when the system
is getting into memory constrained situations, and help the
user determine how to resolve this.
Right now it doesn't really do any of that, just keeps track
of how long every process has been running since boot.
Also update the activity manager to use "cached" as the terminology
for what it used to interchangeably call hidden and background
processes, and switch ProcessMap over to using ArrayMap.
Change-Id: I270b0006aab1f38e17b7d9b65728679173c343f2
Romain Guy [Fri, 7 Jun 2013 21:54:47 +0000 (21:54 +0000)]
Merge "Fix the build"
Romain Guy [Fri, 7 Jun 2013 21:54:01 +0000 (14:54 -0700)]
Fix the build
Change-Id: I506b24e2228d49badc513fdd839671ba50bb2faf
Eino-Ville Talvala [Wed, 12 Dec 2012 21:29:45 +0000 (13:29 -0800)]
Initial commit of new camera API, mostly just the interface.
- New core API classes in android.hardware.photography
- android.media.Image and android.media.ImageReader classes for
application access to direct hardware image buffers.
- Additions to android.graphics.ImageFormat to describe new image
types needed by new camera API.
- Some documentation included; very little implementation.
Bug:
9111736
Change-Id: I0680f35944d1cb8845b7dc0c67edc8c0f0864573
Craig Mautner [Fri, 7 Jun 2013 21:25:42 +0000 (21:25 +0000)]
Merge "Finish InputEvents."
Romain Guy [Fri, 7 Jun 2013 20:14:58 +0000 (20:14 +0000)]
Merge "Remove unnecessary Rect, better reuse of NinePatch objects"
Romain Guy [Fri, 7 Jun 2013 19:17:11 +0000 (12:17 -0700)]
Remove unnecessary Rect, better reuse of NinePatch objects
Cloning drawables (which happens a lot) was creating copies of NinePatch
objects, which would cause the hardware renderer to generate more meshes
than necessary. Also avoid keeping a String we don't need (it was interned
but still.) Last but not least, remove 1 RectF per NinePatch in the system.
Change-Id: If4dbfa0c30892c9b00d68875e334fd5c2bde8b94
Adam Powell [Fri, 7 Jun 2013 18:56:56 +0000 (11:56 -0700)]
am
87c79d64: am
d3cb6bcf: am
8152c794: Merge "Fix incorrect fragment animation used for hiding fragments"
* commit '
87c79d64abeb65468a49729f23c97c7e3b9d7e49':
Fix incorrect fragment animation used for hiding fragments
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