OSDN Git Service
Primiano Tucci [Thu, 5 Sep 2013 11:01:51 +0000 (12:01 +0100)]
Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
See: b/
10629847
Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
Narayan Kamath [Mon, 9 Sep 2013 17:23:27 +0000 (18:23 +0100)]
Allow SSL caches to be installed directly on SSLContexts.
This allows clients to enable ssl session caching without
having to use SSLCertificateSocketFactory.
Change-Id: Id63b8b31f51c96e73beefe9ecc5fd0cf0a1852c6
Jeff Sharkey [Wed, 11 Sep 2013 04:23:08 +0000 (21:23 -0700)]
am
a339f2e5: am
1434a407: Merge "More tweaks to match UX spec." into klp-dev
* commit '
a339f2e5bbcfa94e9ba2cee9734a699816f3a413':
More tweaks to match UX spec.
Jeff Sharkey [Wed, 11 Sep 2013 04:20:46 +0000 (21:20 -0700)]
am
1434a407: Merge "More tweaks to match UX spec." into klp-dev
* commit '
1434a4075d4582d932023b1720b2a1213e6ea282':
More tweaks to match UX spec.
Jeff Sharkey [Wed, 11 Sep 2013 04:18:13 +0000 (04:18 +0000)]
Merge "More tweaks to match UX spec." into klp-dev
Jeff Sharkey [Wed, 11 Sep 2013 00:56:39 +0000 (17:56 -0700)]
More tweaks to match UX spec.
Fixed text colors to match spec. Behold The Greyening! Centered
loader spinner in grid mode. Show multiple lines in status messages.
Add string descriptions. Fix bug where toggling size setting didn't
kick a UI rebind.
Bug:
10510022
Change-Id: Icb41ebeb4de0fed8c04fc6cf5213af1587b72641
Tor Norbye [Wed, 11 Sep 2013 01:24:02 +0000 (01:24 +0000)]
Merge "Add @NotNull, @Nullable, and @IntDef/@StringDef annotations"
Jeff Brown [Wed, 11 Sep 2013 00:40:36 +0000 (17:40 -0700)]
am
cf667ad7: am
2f1ef77c: Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev
* commit '
cf667ad7d77559cde0416e2f97a60827acf5e73d':
WirelessChargerDetector: Work around bad sensor timestamps.
Jeff Brown [Wed, 11 Sep 2013 00:38:31 +0000 (17:38 -0700)]
am
2f1ef77c: Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev
* commit '
2f1ef77c07da2ed7168f75551dd632026b20f8cc':
WirelessChargerDetector: Work around bad sensor timestamps.
Jeff Brown [Wed, 11 Sep 2013 00:35:39 +0000 (00:35 +0000)]
Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev
Jeff Brown [Wed, 11 Sep 2013 00:13:28 +0000 (17:13 -0700)]
WirelessChargerDetector: Work around bad sensor timestamps.
It turns out that on some devices the sensor event timestamp
may be non-monotonic. This may cause the detector to hold
a wakelock indefinitely if the time jumps backwards. These
timestamps are not well tested in general so there may be
other artifacts as well. Use elapsed realtime instead.
Bug:
9926451
Change-Id: Idb0b316e22b23aac86837bd25b953daf49f9b758
Jeff Sharkey [Wed, 11 Sep 2013 00:15:34 +0000 (17:15 -0700)]
am
fa907baf: am
042bd400: Merge "Include system packages in packages.list." into klp-dev
* commit '
fa907baf5eaaf3efe4259a40b4ea4305881b0450':
Include system packages in packages.list.
Jeff Sharkey [Wed, 11 Sep 2013 00:12:30 +0000 (17:12 -0700)]
am
042bd400: Merge "Include system packages in packages.list." into klp-dev
* commit '
042bd400547dda7dce4a526fb3b68303fa934229':
Include system packages in packages.list.
Amith Yamasani [Wed, 11 Sep 2013 00:08:45 +0000 (17:08 -0700)]
am
485d9afe: am
a0a47c73: Merge "Backup and restore ringtone and notification ringtone" into klp-dev
* commit '
485d9afe60c2e42ccccd95d7934c24c5c8b2c995':
Backup and restore ringtone and notification ringtone
Jeff Sharkey [Wed, 11 Sep 2013 00:07:42 +0000 (00:07 +0000)]
Merge "Include system packages in packages.list." into klp-dev
Amith Yamasani [Wed, 11 Sep 2013 00:05:45 +0000 (17:05 -0700)]
am
a0a47c73: Merge "Backup and restore ringtone and notification ringtone" into klp-dev
* commit '
a0a47c737951db52af4943f5737da48d30adc6fe':
Backup and restore ringtone and notification ringtone
Jeff Sharkey [Wed, 11 Sep 2013 00:05:07 +0000 (17:05 -0700)]
am
bd56a17d: am
af4d039f: Merge "More UX work for thumbnails, search, management." into klp-dev
* commit '
bd56a17df26a3c7f4e32ca3be08fbf28f625dffa':
More UX work for thumbnails, search, management.
Amith Yamasani [Wed, 11 Sep 2013 00:03:50 +0000 (00:03 +0000)]
Merge "Backup and restore ringtone and notification ringtone" into klp-dev
Jeff Sharkey [Wed, 11 Sep 2013 00:02:11 +0000 (17:02 -0700)]
am
af4d039f: Merge "More UX work for thumbnails, search, management." into klp-dev
* commit '
af4d039fb3a45d4a74683a69ee48071b8338a13d':
More UX work for thumbnails, search, management.
Jeff Sharkey [Tue, 10 Sep 2013 23:59:43 +0000 (23:59 +0000)]
Merge "More UX work for thumbnails, search, management." into klp-dev
Jeff Brown [Tue, 10 Sep 2013 23:58:06 +0000 (16:58 -0700)]
am
9993f8ff: am
dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev
* commit '
9993f8ff24718553c05872d9f13f4114701b3428':
Propagate input ANR reason to activity manager log.
Jeff Sharkey [Tue, 10 Sep 2013 23:57:24 +0000 (16:57 -0700)]
Include system packages in packages.list.
This provides group membership to the FUSE daemon, since system
packages like NFC and Bluetooth hold sdcard_rw.
Bug:
10610659
Change-Id: I7428e999cfa4087ffe220b9d8bd80827191ab997
Jeff Brown [Tue, 10 Sep 2013 23:55:25 +0000 (16:55 -0700)]
am
dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev
* commit '
dc6fd0a20a095ac0fb544184d8a4258e80b4a14d':
Propagate input ANR reason to activity manager log.
Jeff Brown [Tue, 10 Sep 2013 23:52:53 +0000 (23:52 +0000)]
Merge "Propagate input ANR reason to activity manager log." into klp-dev
Jeff Brown [Tue, 10 Sep 2013 23:44:24 +0000 (16:44 -0700)]
Propagate input ANR reason to activity manager log.
Make it a little easier to diagnose input dispatch timeouts by
providing the detailed reason as the ANR annotation in the log.
Bug:
10689184
Change-Id: Ie18fd9ad066b0673d1f57c030e027ad0085f4650
Jeff Brown [Tue, 10 Sep 2013 23:41:25 +0000 (23:41 +0000)]
Merge "Fix crash when Looper used after quit."
Jeff Sharkey [Tue, 10 Sep 2013 19:04:26 +0000 (12:04 -0700)]
More UX work for thumbnails, search, management.
Hide non-finished downloads from normal picker UI, but keep them
around in management mode. Uses a Uri query parameter and a hidden
API on DocumentsProvider.
Scale thumbnails to fit viewport, always show MIME icon while waiting
on thumbnails, and crossfade between them. Cancel thumbnail tasks
when views are recycled.
Filter directories out of search results for now. Also leave sort
ordering from backend intact, since it's custom ranking. Fix
SearchView interaction to dismiss properly and restore across
orientation and drawer state changes.
Hide most actions when drawer is open. Invalidate RootInfo cache
when locale changes. Apply sort ordering when showing recent create
directories. Hide recent summary string when icon is enough for user
to disambiguate.
Bug:
10667184,
10665663
Change-Id: I331d3272a08c497f88dc659d9e112231cb35aa69
Yorke Lee [Tue, 10 Sep 2013 23:33:34 +0000 (16:33 -0700)]
am
2f38d460: am
4459f498: Merge "Update javadocs for number presentation" into klp-dev
* commit '
2f38d460f38efc2cadc6dce0f924fa1523123200':
Update javadocs for number presentation
Yorke Lee [Tue, 10 Sep 2013 23:30:37 +0000 (16:30 -0700)]
am
4459f498: Merge "Update javadocs for number presentation" into klp-dev
* commit '
4459f49869d85a4c88cfa311a9a2af45ecc8d056':
Update javadocs for number presentation
Yorke Lee [Tue, 10 Sep 2013 23:25:14 +0000 (23:25 +0000)]
Merge "Update javadocs for number presentation" into klp-dev
Alan Viverette [Tue, 10 Sep 2013 23:03:42 +0000 (23:03 +0000)]
Merge "Add public attr for fragmentBreadCrumbStyle, apply in constructor"
Yorke Lee [Tue, 10 Sep 2013 21:39:24 +0000 (14:39 -0700)]
Update javadocs for number presentation
Bug:
10461762
Change-Id: Idfd19fb5f522569afa775ce95e0ba975324a0ee2
Craig Mautner [Tue, 10 Sep 2013 22:17:23 +0000 (15:17 -0700)]
am
88cfdae6: am
cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev
* commit '
88cfdae667bd85931c1bf81781a54472a8fe3ac7':
When waiting for activity to finish don't reset
Craig Mautner [Tue, 10 Sep 2013 22:14:42 +0000 (15:14 -0700)]
am
cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev
* commit '
cdd82540f2f98e7b4374fdd81e771eb217a27573':
When waiting for activity to finish don't reset
Craig Mautner [Tue, 10 Sep 2013 22:11:57 +0000 (22:11 +0000)]
Merge "When waiting for activity to finish don't reset" into klp-dev
Alan Viverette [Tue, 10 Sep 2013 22:04:10 +0000 (15:04 -0700)]
Add public attr for fragmentBreadCrumbStyle, apply in constructor
BUG:
10680808
Change-Id: I7c22c1ff0b91892e62ea6bf6a311d33df6f13d78
John Reck [Tue, 10 Sep 2013 21:08:12 +0000 (14:08 -0700)]
am
53760b4a: am
874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev
* commit '
53760b4a97fb2f88e94da73d647ff80221b3c454':
Fix scissor for functor invocation
John Reck [Tue, 10 Sep 2013 21:05:32 +0000 (14:05 -0700)]
am
874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev
* commit '
874ae2adf8c24c4b9d68f781239a95ad047e212a':
Fix scissor for functor invocation
John Reck [Tue, 10 Sep 2013 21:03:48 +0000 (21:03 +0000)]
Merge "Fix scissor for functor invocation" into klp-dev
Tim Murray [Tue, 10 Sep 2013 21:03:39 +0000 (14:03 -0700)]
am
19c727bb: am
895a4375: Merge "Fix FontRenderer bug." into klp-dev
* commit '
19c727bbc6371924bfd2f85e804b5b6b093a8413':
Fix FontRenderer bug.
Tim Murray [Tue, 10 Sep 2013 21:01:53 +0000 (14:01 -0700)]
am
895a4375: Merge "Fix FontRenderer bug." into klp-dev
* commit '
895a43751fcf4f33e5437963d75d05c2cd754520':
Fix FontRenderer bug.
Tim Murray [Tue, 10 Sep 2013 21:00:37 +0000 (21:00 +0000)]
Merge "Fix FontRenderer bug." into klp-dev
Tim Murray [Tue, 10 Sep 2013 20:46:49 +0000 (13:46 -0700)]
Fix FontRenderer bug.
bug
10691313
Change-Id: Icd5341a3c2066e337911f040ddc935c48c8d7cd1
John Reck [Tue, 10 Sep 2013 20:12:09 +0000 (13:12 -0700)]
Fix scissor for functor invocation
Bug:
10677765
enableScissor() must precede setScissorFromClip() as
otherwise setScissorFromClip() doesn't do anything.
Also make sure to call setScissorFromClip() if
enableScissor() returns true as enableScissor() calls
resetScissor() if the scissor state has changed.
Change-Id: I9226b20bb256c92066aae344e4e6407540b6eae9
David Braun [Tue, 10 Sep 2013 20:38:12 +0000 (13:38 -0700)]
am
4cd9612c: am
b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
* commit '
4cd9612c3268277581589b34cc49ed04c93873b2':
Factor out read/write SMS settings seperate from send/receive.
David Braun [Tue, 10 Sep 2013 20:35:42 +0000 (13:35 -0700)]
am
b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
* commit '
b776122a8aa9fd082fa8aaa216c8a589d709c4c9':
Factor out read/write SMS settings seperate from send/receive.
Jason Monk [Tue, 10 Sep 2013 20:34:32 +0000 (13:34 -0700)]
am
b28da848: am
e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev
* commit '
b28da8489619bafcc0206d3e3b725af91134a6b4':
Verify inputs to PAC resolving.
David Braun [Tue, 10 Sep 2013 20:33:27 +0000 (20:33 +0000)]
Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
Jason Monk [Tue, 10 Sep 2013 20:32:08 +0000 (13:32 -0700)]
am
e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev
* commit '
e6b4163f38c18072ef89ec593d4647c581dd9a8a':
Verify inputs to PAC resolving.
Jason Monk [Tue, 10 Sep 2013 20:27:23 +0000 (20:27 +0000)]
Merge "Verify inputs to PAC resolving." into klp-dev
David Braun [Tue, 10 Sep 2013 20:14:46 +0000 (13:14 -0700)]
Factor out read/write SMS settings seperate from send/receive.
Change-Id: I161782b1508be433c910ec13c0b18e728bf7d2ba
Alan Viverette [Tue, 10 Sep 2013 20:10:29 +0000 (13:10 -0700)]
am
d54529c4: am
23819e7e: Merge "Make ListView\'s illegal state exception more helpful" into klp-dev
* commit '
d54529c43545faa10cac4e34e9b8d623de121e2e':
Make ListView's illegal state exception more helpful
Alan Viverette [Tue, 10 Sep 2013 20:08:07 +0000 (13:08 -0700)]
am
23819e7e: Merge "Make ListView\'s illegal state exception more helpful" into klp-dev
* commit '
23819e7e5d3b5e2c5d4b47b1a8133bc950e1eb82':
Make ListView's illegal state exception more helpful
Alan Viverette [Tue, 10 Sep 2013 20:05:59 +0000 (20:05 +0000)]
Merge "Make ListView's illegal state exception more helpful" into klp-dev
Zhijun He [Tue, 10 Sep 2013 19:48:13 +0000 (12:48 -0700)]
am
487a8fc9: am
82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev
* commit '
487a8fc9d487a68159c57b4de896ba7be88f1c2b':
MediaMuxer: Add setLocation API
Zhijun He [Tue, 10 Sep 2013 19:43:59 +0000 (12:43 -0700)]
am
82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev
* commit '
82d11f8e94e38e434cb6bc5e3e8d87250956fa1c':
MediaMuxer: Add setLocation API
Zhijun He [Tue, 10 Sep 2013 19:41:10 +0000 (19:41 +0000)]
Merge "MediaMuxer: Add setLocation API" into klp-dev
Igor Murashkin [Tue, 10 Sep 2013 19:34:48 +0000 (12:34 -0700)]
am
900e04c1: am
50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev
* commit '
900e04c1a2e0529a9a99be12222efccd5f74e306':
camera2: Don't NPE in onStatusChanged
Igor Murashkin [Tue, 10 Sep 2013 19:31:47 +0000 (12:31 -0700)]
am
50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev
* commit '
50209368626d53b1f8a4a6fdf50d280c7cf65a65':
camera2: Don't NPE in onStatusChanged
Igor Murashkin [Tue, 10 Sep 2013 19:29:27 +0000 (19:29 +0000)]
Merge "camera2: Don't NPE in onStatusChanged" into klp-dev
Kenny Root [Tue, 10 Sep 2013 18:58:35 +0000 (11:58 -0700)]
am
3ae0ffe9: am
0611f477: am
90e42717: Merge changes I5d2be3c5,I9017256b
* commit '
3ae0ffe9c65fc8aee4ce46a5c7fb30747bd4c2fa':
Add argument to binder call to check key types
Use hostname verifier directly instead of instance
Kenny Root [Tue, 10 Sep 2013 18:54:32 +0000 (11:54 -0700)]
am
0611f477: am
90e42717: Merge changes I5d2be3c5,I9017256b
* commit '
0611f47721e32e5386884881b055fde6eec5e3c0':
Add argument to binder call to check key types
Use hostname verifier directly instead of instance
Kenny Root [Tue, 10 Sep 2013 18:52:16 +0000 (11:52 -0700)]
am
90e42717: Merge changes I5d2be3c5,I9017256b
* commit '
90e42717e590e2f7d2fb7270daae589a97271c63':
Add argument to binder call to check key types
Use hostname verifier directly instead of instance
Kenny Root [Tue, 10 Sep 2013 18:50:02 +0000 (18:50 +0000)]
Merge changes I5d2be3c5,I9017256b
* changes:
Add argument to binder call to check key types
Use hostname verifier directly instead of instance
Chet Haase [Tue, 10 Sep 2013 18:49:40 +0000 (11:49 -0700)]
am
9f7136e9: am
59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev
* commit '
9f7136e9632a2fa4b8f8b5eaae300b5b104d7807':
Fix for transition layout suppression
Kenny Root [Thu, 5 Sep 2013 20:03:16 +0000 (13:03 -0700)]
Add argument to binder call to check key types
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.
(cherry picked from commit
b91773bce1126d28a93f73fbef18f3a79245f24e)
Bug:
10600582
Change-Id: I5d2be3c514ff7404a90df76dc263484c5f226e6f
Adam Powell [Tue, 10 Sep 2013 18:49:37 +0000 (11:49 -0700)]
am
218b1163: am
6a221b3f: Fix some bizarre Spinner behavior
* commit '
218b116344688053d3856a8ea8abc3dc241bcee1':
Fix some bizarre Spinner behavior
Chet Haase [Tue, 10 Sep 2013 18:47:15 +0000 (11:47 -0700)]
am
59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev
* commit '
59b7a4ec9ce6e9af3afc5a3e66c7e2f36bd74ab7':
Fix for transition layout suppression
Adam Powell [Tue, 10 Sep 2013 18:47:12 +0000 (11:47 -0700)]
am
6a221b3f: Fix some bizarre Spinner behavior
* commit '
6a221b3f85fbe7cbfbd11b9eeb672baca27faec2':
Fix some bizarre Spinner behavior
Chet Haase [Tue, 10 Sep 2013 18:44:21 +0000 (18:44 +0000)]
Merge "Fix for transition layout suppression" into klp-dev
Adam Powell [Tue, 10 Sep 2013 18:38:52 +0000 (11:38 -0700)]
Fix some bizarre Spinner behavior
* Make sure the recycler is cleared when the adapter is changed.
Bug
10689596
* Don't add views to measure the baseline.
Bug
10690353
Change-Id: I841dc05652eef3319721631f96332f7900d1a631
Chet Haase [Tue, 10 Sep 2013 18:30:22 +0000 (11:30 -0700)]
Fix for transition layout suppression
The ChangeBounds transition causes its target view parents to suppress
layout for the duration of the transition. This is done to avoid artifacts
caused by running layout while layout bounds are being animated between
different scene values.
In order to react correctly to new transition/scene information (such as
running a new transition while another is already running), the transition
system calls pause() on all running transitions to allow layout (among other
things) to work correctly, then resume() after this is finished. This works
in general, but pause/resume do not take account of child transitions that
have already played and ended. ChangeBounds, uses pause/resume to
restore normal layout and re-enable layout suppression. This means that
when resume() is called on a ChangeBounds transition that has already
ended, that transition will leave the parent in a suppressed-layout
state, basically forever. This can cause artifacts like we're seeing in
recent ActionBar changes where the account spinner is never repopulated because
layout is never allowed to run.
The fix is to note when a transition ends and noop future calls to pause/resume.
Issue #
10648936 Transitions don't work with new ActionBar functionality
Change-Id: Id9d41c0352b2270d46cfd5ad4dba130767bbf303
Alan Viverette [Tue, 10 Sep 2013 18:22:53 +0000 (11:22 -0700)]
Make ListView's illegal state exception more helpful
Change-Id: I3d3205d32c6992c184a218248ba72ebf6c45a2d1
Amith Yamasani [Fri, 6 Sep 2013 20:54:28 +0000 (13:54 -0700)]
Backup and restore ringtone and notification ringtone
Use the new content provider API to canonicalize Uris.
If the provider doesn't support it, don't save the value,
unless it's a silent ringtone.
Bug:
10130785
Change-Id: Id08bb2812b9b2a7036a25801d1997661b0017629
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit
928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug:
9984058
Change-Id: I9017256b3b5d137aeb5a6f455868af7bdfec7885
Vinit Deshapnde [Tue, 10 Sep 2013 17:38:02 +0000 (10:38 -0700)]
am
f7bea433: am
ba85b970: Merge "Set country code on P2p interfaces as well" into klp-dev
* commit '
f7bea43325e0ffe04f3a7f729cb141f690c58d2a':
Set country code on P2p interfaces as well
Vinit Deshapnde [Tue, 10 Sep 2013 17:35:18 +0000 (10:35 -0700)]
am
ba85b970: Merge "Set country code on P2p interfaces as well" into klp-dev
* commit '
ba85b970f3ae7fd58c9a631e64bff0d05b787b9b':
Set country code on P2p interfaces as well
Vinit Deshapnde [Tue, 10 Sep 2013 17:32:52 +0000 (17:32 +0000)]
Merge "Set country code on P2p interfaces as well" into klp-dev
Yuhao Zheng [Tue, 10 Sep 2013 17:16:50 +0000 (10:16 -0700)]
am
41c55361: am
e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev
* commit '
41c55361d1a68d5d41cc2ff5b1b486b0ed0109fc':
Add a hidden API to toggle airplane mode.
Yuhao Zheng [Tue, 10 Sep 2013 17:13:22 +0000 (10:13 -0700)]
am
e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev
* commit '
e91a3f5229405b39a3ba59aa0a3e44527eef063e':
Add a hidden API to toggle airplane mode.
Martijn Coenen [Tue, 10 Sep 2013 17:13:14 +0000 (10:13 -0700)]
am
6343075f: am
9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev
* commit '
6343075fbf1fef40d421d060b807e8cbc08849cf':
Remove legacy HCE APIs.
Yuhao Zheng [Tue, 10 Sep 2013 17:12:00 +0000 (17:12 +0000)]
Merge "Add a hidden API to toggle airplane mode." into klp-dev
Martijn Coenen [Tue, 10 Sep 2013 17:07:38 +0000 (10:07 -0700)]
am
9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev
* commit '
9720d5e11c5175503b383bd903c68d2408d2bb80':
Remove legacy HCE APIs.
Martijn Coenen [Tue, 10 Sep 2013 17:04:31 +0000 (17:04 +0000)]
Merge "Remove legacy HCE APIs." into klp-dev
Yuhao Zheng [Tue, 10 Sep 2013 00:00:04 +0000 (17:00 -0700)]
Add a hidden API to toggle airplane mode.
Added a hidden API under ConnectivityManager to toggle airplane mode.
This may be a temp solution for b/
10653570.
bug:
10653570
Change-Id: I0b2b42230073289eb8dc6891317d62b84e26c133
Glenn Kasten [Tue, 10 Sep 2013 16:42:15 +0000 (09:42 -0700)]
am
10779b12: am
d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev
* commit '
10779b12eec870f428345d192f200dd0a7ad40bc':
AudioTrack.getTimestamp() return type is now boolean
Glenn Kasten [Tue, 10 Sep 2013 16:39:18 +0000 (09:39 -0700)]
am
d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev
* commit '
d9f4e0cf2c2466d9e05f8562e55d342934f7ed0d':
AudioTrack.getTimestamp() return type is now boolean
Glenn Kasten [Tue, 10 Sep 2013 16:36:23 +0000 (16:36 +0000)]
Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev
John Reck [Tue, 10 Sep 2013 16:31:04 +0000 (09:31 -0700)]
am
8eb3ece8: am
1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev
* commit '
8eb3ece8eeaea4dc06c5b3854d8fd9efea4ef5fc':
Remove FD optimization case for decodeStream
John Reck [Tue, 10 Sep 2013 16:29:12 +0000 (09:29 -0700)]
am
1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev
* commit '
1d2daa7809b58c226410c0060d7837de0a29888a':
Remove FD optimization case for decodeStream
John Reck [Tue, 10 Sep 2013 16:25:14 +0000 (16:25 +0000)]
Merge "Remove FD optimization case for decodeStream" into klp-dev
Marco Nelissen [Tue, 10 Sep 2013 16:14:56 +0000 (09:14 -0700)]
am
488e925f: am
8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev
* commit '
488e925ff96e661e3d61e85939f7bda26a319c1d':
Use correct timescale for "date taken" field
Marco Nelissen [Tue, 10 Sep 2013 16:12:05 +0000 (09:12 -0700)]
am
8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev
* commit '
8716c08151378f7488a0f129fe43a0b3d4dc499d':
Use correct timescale for "date taken" field
Marco Nelissen [Tue, 10 Sep 2013 16:09:16 +0000 (16:09 +0000)]
Merge "Use correct timescale for "date taken" field" into klp-dev
Amith Yamasani [Tue, 10 Sep 2013 16:02:43 +0000 (09:02 -0700)]
am
23d6b7b3: am
618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev
* commit '
23d6b7b36096eef53f819ee5eee0aba3beecde67':
Don't leave space for summary text if it's an empty string
Amith Yamasani [Tue, 10 Sep 2013 16:01:09 +0000 (09:01 -0700)]
am
618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev
* commit '
618f8cc5dbb6dff03ad3270d6b948b1ef90c5dd6':
Don't leave space for summary text if it's an empty string
Amith Yamasani [Tue, 10 Sep 2013 15:59:37 +0000 (15:59 +0000)]
Merge "Don't leave space for summary text if it's an empty string" into klp-dev
Zhijun He [Mon, 9 Sep 2013 22:47:06 +0000 (15:47 -0700)]
MediaMuxer: Add setLocation API
This API could be used for camera recording when MediaMuxer is used to write
output media file.
Bug:
10594784
Change-Id: Ide2d6e1d87b246100a5def49bfb8646dc984a512
Craig Mautner [Fri, 6 Sep 2013 18:59:38 +0000 (11:59 -0700)]
When waiting for activity to finish don't reset
In cases where the client is waiting for an activity to launch
(startActivityMayWait()) it is a bad idea to clear
ActivityRecord.displayStartTime when going into the pause state. If
displayStartTime is cleared before the activity is displayed,
the client will never be released.
This fix keeps pause from clearing displayStartTime if any client
is waiting for the activity to be displayed.
Fixes bug
10095558. But not a permanent fix, startActivityMayWait()
should not be called by any production code.
Change-Id: I7cbdcb04256f4a26233867c52aedd3bc4151adc3
Stephen Hines [Tue, 10 Sep 2013 05:26:58 +0000 (22:26 -0700)]
am
9b448989: am
e3d0f022: Merge "Don\'t set Allocation mSize when we have no Type." into klp-dev
* commit '
9b4489897974db2a7a6d9e19b4de2817bbb4755a':
Don't set Allocation mSize when we have no Type.