OSDN Git Service
Svetoslav Ganov [Wed, 12 Jun 2013 23:06:46 +0000 (23:06 +0000)]
Revert "Generate PDF from Canvas."
This reverts commit
923c633ccfda45312fec5a3484b6cc1308cc71ab
Change-Id: Ie49f593ec702c1ecf96a5cc1fafa680c1db08747
Svetoslav Ganov [Mon, 10 Jun 2013 15:47:27 +0000 (08:47 -0700)]
Generate PDF from Canvas.
This change adds simple APIs that enable an Android application
to generate a PDF document by drawing content on a canvas.
Change-Id: Iddcd126b3af37c73d99262f6b276caa07b998c1d
Alan Viverette [Wed, 12 Jun 2013 21:12:53 +0000 (21:12 +0000)]
Merge "Allow adding headers and footers to ListView after setAdapter()."
Alan Viverette [Wed, 12 Jun 2013 19:56:29 +0000 (12:56 -0700)]
Allow adding headers and footers to ListView after setAdapter().
Bug:
6110394
Change-Id: I0238ff91b6ae3159b2350d5210545425ac7340f3
Alan Viverette [Wed, 12 Jun 2013 19:49:12 +0000 (19:49 +0000)]
Merge "Add getters for ListView header & footer divider drawing attrs."
Alan Viverette [Wed, 12 Jun 2013 19:48:53 +0000 (19:48 +0000)]
Merge "Clean up FastScroller. Expand overlay to fit text content."
Dianne Hackborn [Wed, 12 Jun 2013 19:40:17 +0000 (19:40 +0000)]
Merge "Improve process tracking."
John Spurlock [Wed, 12 Jun 2013 18:51:35 +0000 (18:51 +0000)]
Merge "Organize the imports in systemui."
John Spurlock [Wed, 12 Jun 2013 16:41:00 +0000 (12:41 -0400)]
Organize the imports in systemui.
To follow android conventions, more importantly to remove the
unused.
Change-Id: I75881718e84360a579a3b02c26489ad250bc9227
Dianne Hackborn [Wed, 12 Jun 2013 00:10:32 +0000 (17:10 -0700)]
Improve process tracking.
We now keep track of when each process is running, batched
by the current memory status of the device. In addition,
the stats are organized by package first, and then processes
associated with each package inside of that. Finally, we
also keep track of the overall time spent in each memory
status.
This should start to actually get us to some information
we can reach some conclusions about. The total time spent
in each memory status gives us some indication of how much
we are running while memory is low; the new package organization
batched by memory status lets us see what packages have
what processes running when memory is low.
Change-Id: I389d62d39d115a846126cf354e4c20070d8f1180
John Spurlock [Wed, 12 Jun 2013 18:45:05 +0000 (18:45 +0000)]
Merge "Remove only file in systemui with windows line endings."
Dianne Hackborn [Wed, 12 Jun 2013 18:35:49 +0000 (18:35 +0000)]
Merge "ArrayMap is great, so how about ArraySet!"
John Spurlock [Wed, 12 Jun 2013 16:54:06 +0000 (12:54 -0400)]
Remove only file in systemui with windows line endings.
Change-Id: I7b0e8b58a7c14afa6d2e7c1ce97ebacc5ffbb538
The Android Open Source Project [Wed, 12 Jun 2013 14:25:57 +0000 (07:25 -0700)]
am
fabda589: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
fabda5894c2793b37650ce3bc1697effd86af88b':
Need to explicitly disable scan-always when turning off wifi
Let RemoteControlDisplay know more about playback position
Unhide MediaExtractor.getPsshInfo()
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
Torne (Richard Coles) [Wed, 12 Jun 2013 12:25:42 +0000 (12:25 +0000)]
Merge "WebViewChromium: don't use a separate class loader."
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
Alan Viverette [Wed, 12 Jun 2013 00:50:56 +0000 (17:50 -0700)]
Add getters for ListView header & footer divider drawing attrs.
Bug:
6104055
Change-Id: I874d631ec6fbb0e99790a3f37d00d589c1d63d34
Romain Guy [Wed, 12 Jun 2013 00:23:27 +0000 (00:23 +0000)]
Merge "Avoid 9patch cache lookups when possible"
Romain Guy [Tue, 11 Jun 2013 23:19:24 +0000 (16:19 -0700)]
Avoid 9patch cache lookups when possible
This optimization saves up to 0.3ms per frame on the Play Store's
front page, on a Nexus 4 device.
Change-Id: Iaa4ef33c6e3b37e175efd5b9eea9ef59b43f14f3
Dianne Hackborn [Wed, 12 Jun 2013 00:14:45 +0000 (00:14 +0000)]
Merge "Fix build."
Dianne Hackborn [Wed, 12 Jun 2013 00:13:52 +0000 (17:13 -0700)]
Fix build.
Change-Id: I166c744e0f6bf62ac06b4797b87e064e14d0b85e
Jeff Sharkey [Tue, 11 Jun 2013 23:52:17 +0000 (23:52 +0000)]
Merge "Explicit locale when formatting machine strings."
Dianne Hackborn [Tue, 11 Jun 2013 23:33:32 +0000 (23:33 +0000)]
Merge "Add new API to retrieve a dumpsys of a single package."
Igor Murashkin [Tue, 11 Jun 2013 22:59:05 +0000 (22:59 +0000)]
Merge "Fix build break due to javadoc linking error"
Glenn Kasten [Tue, 11 Jun 2013 22:41:14 +0000 (22:41 +0000)]
Merge "Fix build"
Christopher Tate [Tue, 11 Jun 2013 22:37:12 +0000 (15:37 -0700)]
am
1bc14ed9: am
76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
* commit '
1bc14ed9c3bb0fae28c2cdf9319b2f5f892409eb':
Need to explicitly disable scan-always when turning off wifi
The Android Open Source Project [Tue, 11 Jun 2013 22:37:06 +0000 (15:37 -0700)]
am
799f031a: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
799f031a64d3930b85b9232bac344b1f9f216717':
Import translations. DO NOT MERGE
Do not allow 0 or smaller periodicity for syncs. b/
9295383
Save Notification large icon to extras.
Workaround possible use after delete
Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
Don't orphan footers with transient state Bug #
8725945
Avoid logging sensitive data.
Glenn Kasten [Tue, 11 Jun 2013 22:36:06 +0000 (15:36 -0700)]
Fix build
Change-Id: Iacac057570e9fcfe850ee597c0a26b2d06ab7910
Igor Murashkin [Tue, 11 Jun 2013 22:25:20 +0000 (15:25 -0700)]
Fix build break due to javadoc linking error
Change-Id: I9da1cb03afef25c11844ec863200f7b5b009e77a
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"
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
Dianne Hackborn [Mon, 10 Jun 2013 22:59:15 +0000 (15:59 -0700)]
ArrayMap is great, so how about ArraySet!
Also a few little tweaks to the ArrayMap implementation. Note that
these are fairly parallel implementations; I looked at what I could
abstract out as a base class, but there isn't really all that much without
making the resulting code more general and thus slower. If we kept
the data structure for ArraySet the same as map, where the array has
two values per entry, then they could probably share a lot of code.
I couldn't really bring myself to do that at this point, though...
Change-Id: I9e0dd8baa8e1febcc1033ecef61623ad59ce4aae
Jeff Sharkey [Tue, 11 Jun 2013 21:13:09 +0000 (14:13 -0700)]
Explicit locale when formatting machine strings.
Bug:
9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
Dianne Hackborn [Tue, 11 Jun 2013 21:26:53 +0000 (14:26 -0700)]
Add new API to retrieve a dumpsys of a single package.
Adds a platform API, and pm command. Fixes some issues with
dumping per-package data in package manager, makes battery
stats able to dump per-package state.
Change-Id: I76ee6d059f0ba17f7a7061886792b1b716d46d2d
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
Torne (Richard Coles) [Tue, 4 Jun 2013 14:50:13 +0000 (15:50 +0100)]
WebViewChromium: don't use a separate class loader.
Use the ordinary system class loader to load the Chromium-based WebView
implementation classes now that the implementation .jar is part of the
boot class path. Instead of checking for the .jar file's existence, just
check to see if we can load the class to determine whether the new
WebView is available.
This also removes the check for Build.IS_DEBUGGABLE; the Chromium-based
WebView will now be available in user builds if enabled in the developer
options.
Change-Id: I06bae9b91656aa41b09c0e6f63f90736db993418
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
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
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
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
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
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