OSDN Git Service
Yorke Lee [Mon, 27 Apr 2015 19:56:58 +0000 (19:56 +0000)]
Merge "Add utility method isDefaultOrSystemDialer" into mnc-dev
Yorke Lee [Mon, 27 Apr 2015 18:18:38 +0000 (11:18 -0700)]
Add utility method isDefaultOrSystemDialer
Will be used by various system components to determine if a
given package name is a privileged Dialer
Bug:
20333102
Bug:
20304411
Change-Id: I1e5bcbde8ee9a5dc6936b118b1b78f32d97737a6
Chris Craik [Mon, 27 Apr 2015 19:28:01 +0000 (19:28 +0000)]
Merge "Anti-alias by default" into mnc-dev
Chris Craik [Mon, 27 Apr 2015 19:28:44 +0000 (19:28 +0000)]
Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev
Dan Stoza [Mon, 27 Apr 2015 18:52:03 +0000 (18:52 +0000)]
Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev
Dan Stoza [Mon, 27 Apr 2015 18:31:12 +0000 (11:31 -0700)]
ImageWriter: Change detach to sp<GraphicBuffer>
Changes the call to IGBP::detachNextBuffer to return an
sp<GraphicBuffer> instead of an ANativeWindowBuffer*.
Bug:
20092217
Change-Id: I59d6acef7120de5040c6710aeecfa1633ec7f736
Chris Craik [Tue, 21 Apr 2015 22:13:29 +0000 (15:13 -0700)]
Promote RenderProperties with an alpha to have a RenderLayer
bug:
20254728
Change-Id: I0bd1d440fe46683b291d4c8ab07a630c34b2eadc
Chris Craik [Fri, 24 Apr 2015 17:46:46 +0000 (10:46 -0700)]
Anti-alias by default
Change-Id: I19434717dd3af4fdcffbfcca2ffbb485dfebe644
Adam Powell [Mon, 27 Apr 2015 18:03:07 +0000 (18:03 +0000)]
Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
Svet Ganov [Mon, 27 Apr 2015 17:50:00 +0000 (17:50 +0000)]
Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev
Arunesh Mishra [Mon, 27 Apr 2015 17:49:48 +0000 (17:49 +0000)]
Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
Svet Ganov [Mon, 27 Apr 2015 16:33:40 +0000 (09:33 -0700)]
DO NOT MERGE Do not clean up global/system settings on package unintalls.
Legacy apps can write their own entries in the system settings and
when they get uninstalled these are hanging around forever polluting
the settings table. We keep track of which settings an app added and
when the app is uninstalled we drop its custom entries. The trouble
was that we did the same thing for global and secure settings with
no explicit list of platform defined settings. Hence, if say a test
signed by the platform certificate touches platform defined global
or secure settings and is then uninstalled, we would drop the platform
defined entries portentially crippling the system.
bug:
20113160
Change-Id: Ia21694f6326ad4a1795c4666027b366e26c05a23
(cherry picked from commit
b128540dc741c424d4f652419686882b7a3bfa06)
Scott Rowe [Mon, 27 Apr 2015 17:48:38 +0000 (17:48 +0000)]
am
7f2e8cdc: am
63604283: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
7f2e8cdc521d3f47ce5e22e8589569dd486c1aa8':
Andrew Solovay [Mon, 27 Apr 2015 17:48:32 +0000 (17:48 +0000)]
am
ec472abf: am
44199d26: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
ec472abfa22ecbd42f295fb17bd9414386c6a065':
Andrew Solovay [Mon, 27 Apr 2015 17:48:27 +0000 (17:48 +0000)]
am
bd719d7b: am
19bc81db: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
bd719d7ba94b87ec89cbdbfde74f007bb1047d2b':
Quddus Chong [Mon, 27 Apr 2015 17:48:21 +0000 (17:48 +0000)]
am
5edfdac4: am
a76a3dd3: (-s ours) am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
5edfdac4b8264e3c94673eaede8f17a3568b8496':
Arunesh Mishra [Mon, 27 Apr 2015 16:39:00 +0000 (09:39 -0700)]
Add near-ultrasound properties to AudioManager.java
Change-Id: I582275aa5f2a2ca55d4028e81ff3e79cf7c793cc
Julia Reynolds [Mon, 27 Apr 2015 17:29:21 +0000 (17:29 +0000)]
Merge "Allow device initializers to set a preferred setup activity." into mnc-dev
Adam Powell [Fri, 24 Apr 2015 00:19:37 +0000 (17:19 -0700)]
Wire up caller chooser targets for ChooserActivity
Add the caller-supplied ChooserTargets from EXTRA_CHOOSER_TARGETS in
the default ChooserActivity. These appear before other options.
Change-Id: Ic4d23ae9ecdfd0cc8a5ac077696d7334a8f844a6
Benjamin Franz [Mon, 27 Apr 2015 17:03:16 +0000 (17:03 +0000)]
Merge "Introduce disable2 into StatusBarManager" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 17:02:14 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 17:00:00 +0000 (10:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25475f80c0d13df9f72b8504b0468eee5203d521
Auto-generated-cl: translation import
Julia Reynolds [Mon, 20 Apr 2015 20:42:54 +0000 (16:42 -0400)]
Allow device initializers to set a preferred setup activity.
This activity will launch by default on device reboot or user switch
during user initialization, even if there are higher priority 'home'
activities.
Bug:
20223050
Change-Id: I335aeb010a1ae5db07a4343d26e160c74bd299e1
Benjamin Franz [Thu, 23 Apr 2015 16:19:48 +0000 (17:19 +0100)]
Introduce disable2 into StatusBarManager
We ran out of space for new disable flags, so need to introduce a
disable2 API into StatusBarManager and update all the underlying code
to support the second set of flags.
Bug:
20331928
Change-Id: I5009b393133c576b37d7e2bae0df97cb8c41a065
Scott Rowe [Mon, 27 Apr 2015 16:33:01 +0000 (16:33 +0000)]
am
63604283: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
6360428359bd1a4db1c9a569d8f9e1af8baf29fb':
Andrew Solovay [Mon, 27 Apr 2015 16:32:56 +0000 (16:32 +0000)]
am
44199d26: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
44199d26d2305b45086695acb1c851aae7328706':
Andrew Solovay [Mon, 27 Apr 2015 16:32:50 +0000 (16:32 +0000)]
am
19bc81db: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
19bc81dbbaeef90f1417d78a18a96120b8d81762':
Quddus Chong [Mon, 27 Apr 2015 16:32:44 +0000 (16:32 +0000)]
am
a76a3dd3: (-s ours) am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
a76a3dd3a90451e78672ccd52b004e6948bf21b7':
Geoff Mendal [Mon, 27 Apr 2015 14:35:58 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 14:33:21 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d4844ba446d75b4596a0213579fb94395df3d92
Auto-generated-cl: translation import
Geoff Mendal [Mon, 27 Apr 2015 14:18:39 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I614f77f977e342c3b374da72501c1b8de0a7abf3
Auto-generated-cl: translation import
Keisuke Kuroyanagi [Wed, 22 Apr 2015 12:27:08 +0000 (21:27 +0900)]
Fix: Selection handles are wrongly shown.
Selection handles were always shown when selection action
mode is started at first time. When the action mode is
started without a selection, only insertion handle must be
shown.
Bug:
20264980
Bug:
20407551
Change-Id: I630804e007f795d28f87e3fa6cba0de5bf588c78
Quddus Chong [Mon, 27 Apr 2015 08:16:18 +0000 (08:16 +0000)]
am
41df3b4b: am
ab52769b: am
789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
41df3b4b4f3601567003cbbc742dbb748b4f01fe':
Luan Nguyen [Mon, 27 Apr 2015 08:16:13 +0000 (08:16 +0000)]
Luan Nguyen [Mon, 27 Apr 2015 08:16:07 +0000 (08:16 +0000)]
am
bcfee811: am
bed3f49b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
bcfee8112a386f06b94d319bf3e477c36766e295':
Quddus Chong [Mon, 27 Apr 2015 08:16:01 +0000 (08:16 +0000)]
am
c141efed: am
9c8f8117: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
c141efed1b6edc496c65a056264748cee102f2d9':
Ryosuke Matsuuchi [Mon, 27 Apr 2015 08:15:55 +0000 (08:15 +0000)]
am
ed6c8ff1: am
3cd98ab6: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
ed6c8ff17f61b547f4f2a85776e514f8ab5a5241':
Dirk Dougherty [Mon, 27 Apr 2015 08:15:50 +0000 (08:15 +0000)]
am
7f2bdf88: am
d668578f: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
7f2bdf885d0b72fa6e4c21953d0a0ca5d53ebbd1':
Rich Slogar [Mon, 27 Apr 2015 08:15:43 +0000 (08:15 +0000)]
am
74c57402: am
03389e7e: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
74c574027c409cd071476559de1a66515d7b8fa2':
Rich Slogar [Mon, 27 Apr 2015 08:15:37 +0000 (08:15 +0000)]
am
4b79a147: am
5fb293b2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
4b79a1477db467561cf6af874eb1770f355a9a5b':
Quddus Chong [Mon, 27 Apr 2015 07:49:29 +0000 (07:49 +0000)]
am
ab52769b: am
789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
ab52769be2d2dc33a520459194f1e007f03970e4':
Luan Nguyen [Mon, 27 Apr 2015 07:49:23 +0000 (07:49 +0000)]
am
4f50a2b1: am
33ac358a: docs: Add Wear Capability training
* commit '
4f50a2b173e31accd8f1fbdde7e9b038914746e7':
Luan Nguyen [Mon, 27 Apr 2015 07:49:16 +0000 (07:49 +0000)]
am
bed3f49b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
bed3f49b5547642c76901d848c08163463ab4fbe':
Quddus Chong [Mon, 27 Apr 2015 07:49:10 +0000 (07:49 +0000)]
am
9c8f8117: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
9c8f8117c1ed2fbf2181011116287b5f6c6dbe9d':
Ryosuke Matsuuchi [Mon, 27 Apr 2015 07:49:03 +0000 (07:49 +0000)]
am
3cd98ab6: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
3cd98ab63cf4bee489de9077e62c93a13f9e66b2':
Dirk Dougherty [Mon, 27 Apr 2015 07:48:52 +0000 (07:48 +0000)]
am
d668578f: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
d668578f6f7a5623bc88afa1e39bb19ede91879e':
Rich Slogar [Mon, 27 Apr 2015 07:48:44 +0000 (07:48 +0000)]
am
03389e7e: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
03389e7e4a74a92b6bcae5474e9b2c887ac2d335':
Rich Slogar [Mon, 27 Apr 2015 07:48:37 +0000 (07:48 +0000)]
am
5fb293b2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
5fb293b27d71cc1b8949179c30d43fc057ae05fb':
Geoff Mendal [Mon, 27 Apr 2015 01:52:36 +0000 (01:52 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 01:47:08 +0000 (18:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I88ab579013a6824872195c6c7714055462d63340
Auto-generated-cl: translation import
Geoff Mendal [Mon, 27 Apr 2015 01:43:32 +0000 (01:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 01:32:53 +0000 (18:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id361b7e87a85cb100addc326bc74ce7db4ba10f2
Auto-generated-cl: translation import
Geoff Mendal [Mon, 27 Apr 2015 01:29:43 +0000 (18:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9acb57cbfcf1d50e6380c6c5ee091fe49912f43e
Auto-generated-cl: translation import
Scott Rowe [Sun, 26 Apr 2015 22:08:07 +0000 (22:08 +0000)]
am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
02e4f2fbe6e0511789d42d5942548158d2dd154f':
docs: Supported media protocols, codecs, formats for Android TV
Andrew Solovay [Sun, 26 Apr 2015 22:07:52 +0000 (22:07 +0000)]
am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
5b3152cffcd90441ca4cacdf5596e9bb3428af08':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Sun, 26 Apr 2015 22:07:44 +0000 (22:07 +0000)]
am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
docs: Update to doc on listening for restrictions-changed intent
Quddus Chong [Sun, 26 Apr 2015 22:07:38 +0000 (22:07 +0000)]
am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
f0936e2fb0e9f013f6079e7a733a41d42d49c3f3':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Sun, 26 Apr 2015 22:00:29 +0000 (22:00 +0000)]
am
789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
789c59711e55be981ed2093228ded0c588e74ba0':
docs: Added What's New section for GMS v7.3 (Parmesan).
Luan Nguyen [Sun, 26 Apr 2015 19:15:52 +0000 (19:15 +0000)]
am
33ac358a: docs: Add Wear Capability training
* commit '
33ac358a5a4199549d11ba1931243e7dc8a7ab85':
docs: Add Wear Capability training
Luan Nguyen [Sun, 26 Apr 2015 19:15:46 +0000 (19:15 +0000)]
am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
docs: Add Channel API summary for Wear.
Quddus Chong [Sun, 26 Apr 2015 19:15:39 +0000 (19:15 +0000)]
am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
900831f303beb4a67a871d969ac822d8b6d36460':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Ryosuke Matsuuchi [Sun, 26 Apr 2015 19:15:26 +0000 (19:15 +0000)]
am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
0d2f280310458d23618edf6550818f8f9cfa6b47':
doc: Add Korean version of DAC/distribute/ page.
Dirk Dougherty [Sun, 26 Apr 2015 19:15:20 +0000 (19:15 +0000)]
am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
Doc change: distribute landing page.
Rich Slogar [Sun, 26 Apr 2015 19:15:12 +0000 (19:15 +0000)]
am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
docs: studio remove gradle tasks dialog
Rich Slogar [Sun, 26 Apr 2015 19:15:04 +0000 (19:15 +0000)]
am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
efe861a4a7081da795fe6a0843308ca7cef26277':
docs: hierarchyviewer updates
Dirk Dougherty [Sat, 25 Apr 2015 22:05:38 +0000 (22:05 +0000)]
am
2a8ef256: am
495227aa: Doc change: update dff image.
* commit '
2a8ef2563042e2db93960ace529a2986c289d3dc':
Doc change: update dff image.
Nick Kralevich [Sat, 25 Apr 2015 22:05:25 +0000 (22:05 +0000)]
am
05ad674a: am
00e165ae: am
e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '
05ad674aa888e3f9217de0e5c3176161dd8e31aa':
fix compiler error under FORTIFY_SOURCE=2
Dirk Dougherty [Sat, 25 Apr 2015 21:59:35 +0000 (21:59 +0000)]
am
495227aa: Doc change: update dff image.
* commit '
495227aab706fa6daf7f7b0b4ca741fef82c9d1d':
Doc change: update dff image.
Nick Kralevich [Sat, 25 Apr 2015 21:56:56 +0000 (21:56 +0000)]
am
00e165ae: am
e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '
00e165aed3d53b147b153003b3b9fd3c129ff3c4':
fix compiler error under FORTIFY_SOURCE=2
Dirk Dougherty [Sat, 25 Apr 2015 21:49:40 +0000 (14:49 -0700)]
Doc change: update dff image.
Bug-id:
20251587
Change-Id: I25d59c8a66c548a13e699c25e79cd4a23d2cd330
Nick Kralevich [Sat, 25 Apr 2015 21:41:52 +0000 (21:41 +0000)]
am
e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '
e8101c047cffc69245493d96f2f2ec36728682f1':
fix compiler error under FORTIFY_SOURCE=2
Nick Kralevich [Sat, 25 Apr 2015 21:22:31 +0000 (21:22 +0000)]
Merge "fix compiler error under FORTIFY_SOURCE=2"
Andreas Gampe [Sat, 25 Apr 2015 20:16:09 +0000 (20:16 +0000)]
Merge "Frameworks/base: Fix a constructor"
Geoff Mendal [Sat, 25 Apr 2015 09:28:09 +0000 (09:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 25 Apr 2015 09:16:31 +0000 (09:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 25 Apr 2015 09:12:37 +0000 (09:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 25 Apr 2015 08:55:11 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b40f02313d2014862d8eafd30cdff02255c9564
Auto-generated-cl: translation import
Geoff Mendal [Sat, 25 Apr 2015 07:23:36 +0000 (00:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8f27460d1cbdb97a9843a21d531f0b03ab72505
Auto-generated-cl: translation import
Geoff Mendal [Sat, 25 Apr 2015 06:58:45 +0000 (23:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic375b06aab79b9b7d17754eba4dd9d182a669734
Auto-generated-cl: translation import
Geoff Mendal [Sat, 25 Apr 2015 06:44:04 +0000 (23:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I79db3fdb8e2c5e86259a6c5cefe5e0790a07bc92
Auto-generated-cl: translation import
Nick Kralevich [Sat, 25 Apr 2015 03:25:50 +0000 (20:25 -0700)]
fix compiler error under FORTIFY_SOURCE=2
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
ftruncate(fd, mFooterStart);
^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1
Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
Selim Cinek [Sat, 25 Apr 2015 02:12:51 +0000 (02:12 +0000)]
Merge "Improve the falsing logic for unlock motion"
Selim Cinek [Sat, 25 Apr 2015 01:54:30 +0000 (18:54 -0700)]
Improve the falsing logic for unlock motion
Bug:
20563134
Change-Id: I628829915ad2cc7f1df5d0c971def44f6eacdae4
Etan Cohen [Sat, 25 Apr 2015 01:44:26 +0000 (01:44 +0000)]
Merge "Doc fix - incorrect format (included argument) for function reference."
Etan Cohen [Sat, 25 Apr 2015 01:43:41 +0000 (18:43 -0700)]
Doc fix - incorrect format (included argument) for function reference.
Change-Id: I2cdf7b4f078b1ab0556fcc3fad5287f86641c396
Aravind Akella [Sat, 25 Apr 2015 01:40:25 +0000 (01:40 +0000)]
Merge "Add hidden SensorManager APIs for injecting sensor data."
Andy Hung [Sat, 25 Apr 2015 01:28:41 +0000 (01:28 +0000)]
Merge "Hide stretch mode from PlaybackSettings"
Adam Lesinski [Sat, 25 Apr 2015 01:20:59 +0000 (01:20 +0000)]
Merge "Properly mangle file names"
Julia Reynolds [Sat, 25 Apr 2015 01:09:24 +0000 (01:09 +0000)]
Merge "Only skip unrecognized tags."
Etan Cohen [Sat, 25 Apr 2015 01:08:10 +0000 (01:08 +0000)]
Merge "Fix documentation - non-public API."
Etan Cohen [Sat, 25 Apr 2015 01:06:59 +0000 (18:06 -0700)]
Fix documentation - non-public API.
Change-Id: I418bf47b197936b2f50b231425312d5b6d272df8
Jeff Sharkey [Sat, 25 Apr 2015 01:03:06 +0000 (01:03 +0000)]
Merge "Migrate primary external storage."
Jeff Sharkey [Fri, 24 Apr 2015 23:10:32 +0000 (16:10 -0700)]
Migrate primary external storage.
Wire up through MountService to call down into vold. Watch for
unsolicited events that report progress, including special value "82"
that signals that copy has finished. We use this value to persist
the volumeUuid in case of unexpected reboot, since it indicates the
new volume is ready.
Wire progress updates through existing callback pipeline.
Update the volume mounting code to match against the persisted UUID
when selecting the primary external storage.
Bug:
19993667
Change-Id: Id46957610fb43517bbfbc368f29b7d430664590d
Etan Cohen [Sat, 25 Apr 2015 00:49:40 +0000 (00:49 +0000)]
Merge changes from topic 'mwd-merge-042415'
* changes:
Rename removeVideoCallListener to unregisterCallback
Bluetooth document fix: remove reference from open API to hidden entities
Fix build due to merge of
7595842 and renaming due to
8eb87f0
Merge commit '
052a0da' into merge2
Merge commit '
db1dbb8' into merge2
Merge commit '
7e5e791' into merge2
Merge commit '
170102d' into merge2
Merge commit '
4cb5d80' into merge2
Merge commit '
83cda00' into merge2
Merge commit '
c91bc62' into merge2
Merge commit '
cffc360' into merge2
Merge commit '
7f61051' into merge2
Merge commit '
167c3a7' into merge2
Merge commit '
4467b98' into merge2
Merge commit '
25a217c' into merge2
Merge commit '
04b18ec' into merge2
Merge commit '
7595842' into merge2
Merge commit '
2bbd2b6' into merge2
Merge commit '
4890351' into merge2
Merge commit '
cd405fe' into merge2
Merge commit '
6ddbb5e' into merge2
Merge commit '
de93575' into merge2
Merge commit '
9561e74' into merge2
Ruben Brunk [Sat, 25 Apr 2015 00:48:25 +0000 (00:48 +0000)]
Merge "camera: Start/stop preview before clearing surface."
Andy Hung [Sat, 25 Apr 2015 00:32:57 +0000 (17:32 -0700)]
Hide stretch mode from PlaybackSettings
Different timestretch modes won't be ready for M.
Change-Id: I4fe5ceee5bdf90cb735eb415185812603b5c68a8
Jim Miller [Sat, 25 Apr 2015 00:25:53 +0000 (00:25 +0000)]
Merge "Don't use a WeakReference for fingerprint notification object."
Adrian Roos [Sat, 25 Apr 2015 00:18:21 +0000 (00:18 +0000)]
Merge "Smooth transitions between SHOW_WHEN_LOCKED activities"
Andy Hung [Sat, 25 Apr 2015 00:18:12 +0000 (00:18 +0000)]
Merge "Move channel index computation to native AudioTrack JNI"
Adrian Roos [Fri, 24 Apr 2015 23:03:47 +0000 (16:03 -0700)]
Smooth transitions between SHOW_WHEN_LOCKED activities
Bug:
12536117
Change-Id: Ia5f96e49587661440ae31fba17c42b2e3a9557fb