OSDN Git Service
Jean-Michel Trivi [Sat, 23 May 2015 01:29:26 +0000 (01:29 +0000)]
am
ed77bc09: Merge "More android.media.AudioFormat javadoc" into mnc-dev
* commit '
ed77bc09879784a56c60f215f267adc100213ed2':
More android.media.AudioFormat javadoc
Jean-Michel Trivi [Sat, 23 May 2015 01:19:01 +0000 (01:19 +0000)]
Merge "More android.media.AudioFormat javadoc" into mnc-dev
Jean-Michel Trivi [Thu, 21 May 2015 22:51:15 +0000 (15:51 -0700)]
More android.media.AudioFormat javadoc
More doc about AudioFormat constants, use of the builder,
sample rate, channel masks (position vs index, examples)
Bug
20921159
Change-Id: Ie60c2f3558b8b6008c6d9fb646ad9f6de396859d
Dianne Hackborn [Sat, 23 May 2015 00:44:55 +0000 (00:44 +0000)]
am
dd5ee4b8: Merge "Revert "resolved conflicts for merge of
47249f2a to mnc-dev"" into mnc-dev
* commit '
dd5ee4b89083ec9b50b8c9739274136b0c74abb5':
Revert "resolved conflicts for merge of
47249f2a to mnc-dev"
Dianne Hackborn [Sat, 23 May 2015 00:34:34 +0000 (00:34 +0000)]
Merge "Revert "resolved conflicts for merge of
47249f2a to mnc-dev"" into mnc-dev
Simranjit Singh Kohli [Sat, 23 May 2015 00:33:32 +0000 (00:33 +0000)]
am
aefdaa5c: Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev
* commit '
aefdaa5cbd2a68aa6c8e7d229b897237562cebcb':
[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
Dirk Dougherty [Sat, 23 May 2015 00:33:26 +0000 (00:33 +0000)]
am
8f51279d: am
c56a8313: am
b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit '
8f51279d50fab3270e1c13dc65c4e38a3a735ef6':
Doc change: updates for preview.
Joe Fernandez [Sat, 23 May 2015 00:33:21 +0000 (00:33 +0000)]
am
8cdd693a: am
93cc5190: am
b373f49a: docs: NDK table of contents fixes
* commit '
8cdd693ae1ed41ae175df79f77492743444a8d24':
docs: NDK table of contents fixes
Simranjit Singh Kohli [Sat, 23 May 2015 00:20:38 +0000 (00:20 +0000)]
Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into mnc-dev
Dirk Dougherty [Sat, 23 May 2015 00:19:53 +0000 (00:19 +0000)]
am
c56a8313: am
b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit '
c56a8313760243740b684fef4ae71d791a885b4d':
Doc change: updates for preview.
Joe Fernandez [Sat, 23 May 2015 00:19:48 +0000 (00:19 +0000)]
am
93cc5190: am
b373f49a: docs: NDK table of contents fixes
* commit '
93cc51908c6d57d43f5a2ae98a850aaa67ac6b64':
docs: NDK table of contents fixes
Simranjit Singh Kohli [Fri, 22 May 2015 21:00:32 +0000 (14:00 -0700)]
[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]
Fixing lots of bugs related to the ChooseAccount Activities.
1. Fix jank which is seen when no accounts are present on the device.
2. After addition of the account, return to the user.
3. Don't crash when the user provides null to allowableAccountTypes.
4. Updated documentation of AccountManager#newChooseAccountIntent.
5. Fix NPE.
Bug:
13104800
Bug:
17926560
Bug:
9626001
Change-Id: I0d1913e46560cfb458526a7c930a38049602d8f1
Amith Yamasani [Sat, 23 May 2015 00:12:56 +0000 (00:12 +0000)]
am
7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev
* commit '
7870550a1b6e1110bf461633970e439d0243a868':
Add getPermissionGrantState method in device policy
Dirk Dougherty [Sat, 23 May 2015 00:08:42 +0000 (00:08 +0000)]
am
b1410bc3: Merge "Doc change: updates for preview." into mnc-preview-docs
* commit '
b1410bc306195dc807f223bc5955780275fc6468':
Doc change: updates for preview.
Joe Fernandez [Sat, 23 May 2015 00:08:36 +0000 (00:08 +0000)]
am
b373f49a: docs: NDK table of contents fixes
* commit '
b373f49a85fcbe82993940416ce04e0a1fb1e340':
docs: NDK table of contents fixes
Amith Yamasani [Sat, 23 May 2015 00:05:46 +0000 (00:05 +0000)]
Merge "Add getPermissionGrantState method in device policy" into mnc-dev
Dirk Dougherty [Fri, 22 May 2015 23:59:16 +0000 (23:59 +0000)]
Merge "Doc change: updates for preview." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 23:58:14 +0000 (16:58 -0700)]
Doc change: updates for preview.
Change-Id: Ie741785ae4b21373fa49dbd7f725cab1f812891a
Joe Fernandez [Fri, 22 May 2015 19:27:04 +0000 (12:27 -0700)]
docs: NDK table of contents fixes
- fixing the encoding of the left navigation files for
- Guides
- References
- Samples
- Downloads
Change-Id: Ic3a45ff661f1c8e5784e833047764fecc6445cae
Yin-Chia Yeh [Fri, 22 May 2015 23:48:23 +0000 (23:48 +0000)]
am
5cf9d8ac: Merge "Camera: update available LSC map mode key type" into mnc-dev
* commit '
5cf9d8ac94f4a3e00ef32c382950a9cd5e8fd4a7':
Camera: update available LSC map mode key type
Dirk Dougherty [Fri, 22 May 2015 23:42:08 +0000 (23:42 +0000)]
am
e511bab4: am
09ffc01d: am
61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
* commit '
e511bab48d6d0b1684c8c29af0aae43cec6c57ed':
Doc change: updates for preview content.
Yin-Chia Yeh [Fri, 22 May 2015 23:40:31 +0000 (23:40 +0000)]
Merge "Camera: update available LSC map mode key type" into mnc-dev
Yin-Chia Yeh [Fri, 22 May 2015 23:37:27 +0000 (16:37 -0700)]
Camera: update available LSC map mode key type
Bug:
21403373
Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64
Dianne Hackborn [Fri, 22 May 2015 23:34:44 +0000 (16:34 -0700)]
Revert "resolved conflicts for merge of
47249f2a to mnc-dev"
This reverts commit
c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to
8562b08f04c1309cf40db1e749d612b6824f1d12.
Dirk Dougherty [Fri, 22 May 2015 23:29:29 +0000 (23:29 +0000)]
am
09ffc01d: am
61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
* commit '
09ffc01dd3bfd21410d4d620ca8f8c40d4688a86':
Doc change: updates for preview content.
Dirk Dougherty [Fri, 22 May 2015 23:14:47 +0000 (23:14 +0000)]
am
61e6be64: Merge "Doc change: updates for preview content." into mnc-preview-docs
* commit '
61e6be640b1e5d6ae4cacf0a2e62a7f66f42202c':
Doc change: updates for preview content.
Dirk Dougherty [Fri, 22 May 2015 23:05:13 +0000 (23:05 +0000)]
Merge "Doc change: updates for preview content." into mnc-preview-docs
Dirk Dougherty [Fri, 22 May 2015 17:23:10 +0000 (10:23 -0700)]
Doc change: updates for preview content.
Change-Id: Ife06f0e5b3ef6950d5d6fe452940c8dd87ed89ea
David Friedman [Fri, 22 May 2015 22:57:20 +0000 (22:57 +0000)]
am
4cb03fa0: am
eed8e782: am
dd4dc4a0: resolved conflicts for merge of
7044ee16 to mnc-preview-docs
* commit '
4cb03fa059d0145e81e624fddc4b57cb471bd786':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 22:45:35 +0000 (22:45 +0000)]
am
eed8e782: am
dd4dc4a0: resolved conflicts for merge of
7044ee16 to mnc-preview-docs
* commit '
eed8e782ec22a11957c563e79010794571d43be9':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 22:32:19 +0000 (22:32 +0000)]
am
dd4dc4a0: resolved conflicts for merge of
7044ee16 to mnc-preview-docs
* commit '
dd4dc4a0bec72cbfae8a3b27c72d75e90d38c79b':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 22:23:12 +0000 (15:23 -0700)]
resolved conflicts for merge of
7044ee16 to mnc-preview-docs
Change-Id: Ia0d831660d7744f34c68dba62e19a11c83ec2ee7
Adrian Roos [Fri, 22 May 2015 21:52:29 +0000 (21:52 +0000)]
am
fab33408: Merge "No longer trigger immersive cling on panic" into mnc-dev
* commit '
fab334081eee36d6d75fc19cf686ca9e20246c16':
No longer trigger immersive cling on panic
Adrian Roos [Fri, 22 May 2015 21:52:24 +0000 (21:52 +0000)]
am
d02ec598: Merge "Request transient bars after panic" into mnc-dev
* commit '
d02ec5989dd93df1d6ab45ad9f280730553f11e6':
Request transient bars after panic
Adrian Roos [Fri, 22 May 2015 21:38:22 +0000 (21:38 +0000)]
Merge "No longer trigger immersive cling on panic" into mnc-dev
Adrian Roos [Fri, 22 May 2015 21:37:56 +0000 (21:37 +0000)]
Merge "Request transient bars after panic" into mnc-dev
Yin-Chia Yeh [Fri, 22 May 2015 21:10:54 +0000 (21:10 +0000)]
am
9fbdc874: Merge "Camera2: update FpsRange requirement" into mnc-dev
* commit '
9fbdc87422efe54f075ce8c40d460a3a56449ed6':
Camera2: update FpsRange requirement
Yin-Chia Yeh [Fri, 22 May 2015 20:57:06 +0000 (20:57 +0000)]
Merge "Camera2: update FpsRange requirement" into mnc-dev
Amith Yamasani [Fri, 22 May 2015 20:00:51 +0000 (13:00 -0700)]
Add getPermissionGrantState method in device policy
This is to have a way to query what permission state was set by
the profile owner.
Bug:
21356830
Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c
Chih-Hung Hsieh [Fri, 22 May 2015 20:55:48 +0000 (20:55 +0000)]
am
9e276bc1: Merge "Suppress benign clang warning." into mnc-dev
* commit '
9e276bc1a2c87caeffbcc97f121ad600313f8396':
Suppress benign clang warning.
Yin-Chia Yeh [Thu, 21 May 2015 18:27:06 +0000 (11:27 -0700)]
Camera2: update FpsRange requirement
Codegen doc update only.
Bug:
13639914
Change-Id: Id8a4a237c409725831a65b4f134422cd261cad52
Chih-Hung Hsieh [Fri, 22 May 2015 20:38:24 +0000 (20:38 +0000)]
Merge "Suppress benign clang warning." into mnc-dev
Chien-Yu Chen [Fri, 22 May 2015 20:37:58 +0000 (20:37 +0000)]
am
9e07ffdb: Merge "ImageReader: Register estimated native allocation" into mnc-dev
* commit '
9e07ffdbfbd85ba5431d5145a98df9e688de7b41':
ImageReader: Register estimated native allocation
Griff Hazen [Fri, 22 May 2015 20:37:53 +0000 (20:37 +0000)]
am
ed3236e0: (-s ours) am
d2632a83: (-s ours) am
8f585128: (-s ours) am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
ed3236e07176ba02c7549da4794f680fc468455c':
Griff Hazen [Fri, 22 May 2015 20:37:49 +0000 (20:37 +0000)]
am
4b591a64: (-s ours) am
cc6029b8: (-s ours) am
dc085ed2: (-s ours) am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
4b591a64d52a1d8444f961d65b034777affbdfcb':
Chien-Yu Chen [Fri, 22 May 2015 20:33:25 +0000 (20:33 +0000)]
Merge "ImageReader: Register estimated native allocation" into mnc-dev
Jeff Tinker [Fri, 22 May 2015 20:23:33 +0000 (20:23 +0000)]
am
08cfe2a5: Doc update for MediaDrm\'s OnExpirationUpdate method
* commit '
08cfe2a5fcb3ec68b14966233511cb7d6d15e543':
Doc update for MediaDrm's OnExpirationUpdate method
Selim Cinek [Fri, 22 May 2015 20:23:29 +0000 (20:23 +0000)]
am
3dcd4c89: Merge "Fixed a flash when launching keyguard affordances" into mnc-dev
* commit '
3dcd4c8948a990dfb98b035198c076b07d115720':
Fixed a flash when launching keyguard affordances
Griff Hazen [Fri, 22 May 2015 20:23:00 +0000 (20:23 +0000)]
am
d2632a83: (-s ours) am
8f585128: (-s ours) am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
d2632a83668001065e6de9d38cc7166f309a2ca3':
Griff Hazen [Fri, 22 May 2015 20:22:55 +0000 (20:22 +0000)]
am
cc6029b8: (-s ours) am
dc085ed2: (-s ours) am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
cc6029b82bb83faf237e3f718a5479db0c53d839':
Jeff Tinker [Fri, 22 May 2015 18:53:54 +0000 (11:53 -0700)]
Doc update for MediaDrm's OnExpirationUpdate method
Based on EME spec clarification that expiration time
of 0 means unlimited.
bug:
21393975
Change-Id: I96e50fb4300724f52aad2ca39c8495ad1aa78222
Selim Cinek [Fri, 22 May 2015 20:16:44 +0000 (20:16 +0000)]
Merge "Fixed a flash when launching keyguard affordances" into mnc-dev
Griff Hazen [Fri, 22 May 2015 20:07:11 +0000 (20:07 +0000)]
am
8f585128: (-s ours) am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
8f585128f5ce28219f4f56bef27caac139bbfbd7':
Griff Hazen [Fri, 22 May 2015 20:07:06 +0000 (20:07 +0000)]
am
dc085ed2: (-s ours) am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
dc085ed27a70296d4b4d30ba414b39b6f5a8eb9f':
Adam Powell [Fri, 22 May 2015 20:04:49 +0000 (20:04 +0000)]
am
94518a4c: Merge "Restore app expectations around drawable visibility change timing" into mnc-dev
* commit '
94518a4c35801fb0b4c0c8bdf2975225fce14d78':
Restore app expectations around drawable visibility change timing
David Friedman [Fri, 22 May 2015 19:50:14 +0000 (19:50 +0000)]
am
e23031c9: Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
* commit '
e23031c974c9b051ba639f9ad68f891e2ae87da3':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
Adam Powell [Fri, 22 May 2015 19:48:53 +0000 (19:48 +0000)]
Merge "Restore app expectations around drawable visibility change timing" into mnc-dev
Selim Cinek [Fri, 22 May 2015 19:38:44 +0000 (12:38 -0700)]
Fixed a flash when launching keyguard affordances
When media artwork was present the screen would briefly
show the artwork and the scrim when launching the affordances
on the keyguard.
Bug:
21379150
Change-Id: Ica36e7f7ef11beef9b2351af4cf43ab4e20151ac
Chih-Hung Hsieh [Fri, 22 May 2015 19:28:03 +0000 (12:28 -0700)]
Suppress benign clang warning.
To unblock continuous clang/llvm builds.
BUG:
21337624
Change-Id: I38e5d11fd3c44f50430a3a8519c5071674b3df9f
Dianne Hackborn [Fri, 22 May 2015 19:04:43 +0000 (19:04 +0000)]
am
fa4d547d: Merge "Improve reporting to apps of transaction too large failures." into mnc-dev
* commit '
fa4d547d5813a8f5c298efd089890b5b502df76d':
Improve reporting to apps of transaction too large failures.
Dianne Hackborn [Fri, 22 May 2015 18:52:40 +0000 (18:52 +0000)]
Merge "Improve reporting to apps of transaction too large failures." into mnc-dev
Chien-Yu Chen [Fri, 22 May 2015 00:59:22 +0000 (17:59 -0700)]
ImageReader: Register estimated native allocation
Estimate the native allocation and register it so it can be
accounted for during GC.
Bug:
20299272
Change-Id: I43af3058b6fe9a41e5e7e119e390ed079402c4b8
Adam Powell [Thu, 21 May 2015 01:26:35 +0000 (18:26 -0700)]
Restore app expectations around drawable visibility change timing
When we update drawable visibility has changed to be part of
View.onVisibilityChanged instead of an overload of
setVisibility. While this covers more cases that we were previously
missing, it also means that we now set drawable visibility from the
View constructor via the call chain view.setFlags to
view.onVisibilityChanged to drawable.setVisibility, resulting in us
passing a 'this' pointer all over before the object is fully
initialized. (i.e. a Bad Thing.)
In general we've gotten away with playing fast and loose with this
sort of thing as a part of view inflation - calling various non-final
setters that may invoke callbacks as needed rather than initializing
view fields directly. Unfortunately it also means that we can cause a
lot of hard to trace bugs and in the long run we should try to clean
up as much of it as we can.
In this case, some apps were expecting inflation to have finished
completely before any drawable visibility changed. If a view's
visibility changes but it's not attached to a window, does it make a
callback?
The fix: no. We won't dispatch onVisibilityChanged to detached views,
but we will dispatch it when a view becomes attached.
Also fix a bug where we could end up telling a view its visibility
changed to (INVISIBLE | GONE), which just doesn't make any sense.
Bug
20103422
Change-Id: Ifba54c36114e85cf64869afcca766c30d601a16c
Chien-Yu Chen [Fri, 22 May 2015 18:20:20 +0000 (18:20 +0000)]
am
f5b1e39c: Merge "Camera2: Implement toString() for camera2 params" into mnc-dev
* commit '
f5b1e39c2e47a09e5df7d1cfbf05abcca0d429c9':
Camera2: Implement toString() for camera2 params
Johan Euphrosine [Fri, 22 May 2015 18:20:15 +0000 (18:20 +0000)]
am
14e121bd: am
6e7d2ba8: am
fe6d855c: am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
14e121bd8161f9ee8ee34c1f01b72c001359810d':
frameworks/base/docs: add jd files for NDK reference
Joe Fernandez [Fri, 22 May 2015 18:20:10 +0000 (18:20 +0000)]
am
45765ca6: am
eae90b80: am
ee143ce3: docs: M Preview Program overview, update 2
* commit '
45765ca6f43ceede82a4a953d37c3511e1428d57':
docs: M Preview Program overview, update 2
Chien-Yu Chen [Fri, 22 May 2015 18:15:03 +0000 (18:15 +0000)]
Merge "Camera2: Implement toString() for camera2 params" into mnc-dev
David Friedman [Fri, 22 May 2015 10:20:03 +0000 (03:20 -0700)]
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
Change-Id: I3867d70f9d669fa08cd7d533d79e02c15339d4ff
Johan Euphrosine [Fri, 22 May 2015 18:10:45 +0000 (18:10 +0000)]
am
6e7d2ba8: am
fe6d855c: am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
6e7d2ba8095c7c312013ff450dc8396135853e60':
frameworks/base/docs: add jd files for NDK reference
Joe Fernandez [Fri, 22 May 2015 18:10:40 +0000 (18:10 +0000)]
am
eae90b80: am
ee143ce3: docs: M Preview Program overview, update 2
* commit '
eae90b806a4a99f3c815113434d7808114db8d07':
docs: M Preview Program overview, update 2
Chris Craik [Fri, 22 May 2015 18:06:47 +0000 (18:06 +0000)]
am
33416a93: Merge "Disable density scaling for HW canvas" into mnc-dev
* commit '
33416a9363a8d78bf10818d40806085a4d1ba311':
Disable density scaling for HW canvas
Chris Craik [Fri, 22 May 2015 17:57:07 +0000 (17:57 +0000)]
Merge "Disable density scaling for HW canvas" into mnc-dev
Chris Craik [Thu, 21 May 2015 23:46:53 +0000 (16:46 -0700)]
Disable density scaling for HW canvas
bug:
20692121
Change-Id: Ief4514ba55857e183fa281f28e5aceac08d51990
Eric Laurent [Fri, 22 May 2015 17:47:44 +0000 (17:47 +0000)]
am
843f1e0f: Merge "sound trigger: fix wrong field type in JNI" into mnc-dev
* commit '
843f1e0f94dc1a6af209d16b3a22e100925f44fb':
sound trigger: fix wrong field type in JNI
Chien-Yu Chen [Wed, 20 May 2015 17:16:59 +0000 (10:16 -0700)]
Camera2: Implement toString() for camera2 params
Implement toString() for BlackLevelPattern, InputConfiguration, and
StreamConfigurationMap.
Bug:
16899576
Change-Id: Ide1cf103f3282750653ce7bdc29c0b74920d4855
Eric Laurent [Fri, 22 May 2015 17:36:39 +0000 (17:36 +0000)]
Merge "sound trigger: fix wrong field type in JNI" into mnc-dev
Eric Laurent [Fri, 22 May 2015 17:30:13 +0000 (10:30 -0700)]
sound trigger: fix wrong field type in JNI
Bug:
20951546.
Change-Id: I44f6dd05888e335a70bd212eb6f9c468a338ff92
Fyodor Kupolov [Fri, 22 May 2015 16:33:32 +0000 (16:33 +0000)]
am
96616a57: Merge "Use factory methods for RestrictionEntry" into mnc-dev
* commit '
96616a57f3af05d4808fb5b84e758000f6ab5372':
Use factory methods for RestrictionEntry
Fyodor Kupolov [Fri, 22 May 2015 16:21:19 +0000 (16:21 +0000)]
Merge "Use factory methods for RestrictionEntry" into mnc-dev
Robert Shih [Fri, 22 May 2015 16:08:48 +0000 (16:08 +0000)]
am
67ba691a: Merge "MediaPlayer: add mPreparing to weed out unwanted prepared messages" into mnc-dev
* commit '
67ba691ad6fbc6d0ee28635b40c87f4cddd61399':
MediaPlayer: add mPreparing to weed out unwanted prepared messages
Jean-Michel Trivi [Fri, 22 May 2015 16:02:57 +0000 (16:02 +0000)]
am
b0eb08b5: Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev
* commit '
b0eb08b521d2b76531df3946cece002ed72fa363':
Remove the 5 sec timeout logic for setVolumeControlStream
Robert Shih [Fri, 22 May 2015 16:02:05 +0000 (16:02 +0000)]
Merge "MediaPlayer: add mPreparing to weed out unwanted prepared messages" into mnc-dev
Jean-Michel Trivi [Fri, 22 May 2015 15:51:34 +0000 (15:51 +0000)]
Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev
Jason Monk [Fri, 22 May 2015 15:38:52 +0000 (15:38 +0000)]
am
bf3d1af3: SettingsLib: Fix wifi crash during settings index
* commit '
bf3d1af3d8bd32f410aa5cc44ccdc1df593ef210':
SettingsLib: Fix wifi crash during settings index
Johan Euphrosine [Fri, 22 May 2015 15:37:49 +0000 (15:37 +0000)]
am
fe6d855c: am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
fe6d855cf3239558f780f91ded6679f54cd47661':
frameworks/base/docs: add jd files for NDK reference
Johan Euphrosine [Fri, 22 May 2015 15:27:01 +0000 (15:27 +0000)]
am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
16580c9bb4ef4cad1f5d59402a855189decb56ba':
frameworks/base/docs: add jd files for NDK reference
Jason Monk [Fri, 22 May 2015 15:25:04 +0000 (11:25 -0400)]
SettingsLib: Fix wifi crash during settings index
and test it
Bug:
21365029
Change-Id: I9a914773577dcbe591b41c9114ba4d078b5e7369
Clara Bayarri [Fri, 22 May 2015 15:20:19 +0000 (15:20 +0000)]
am
ae0940fe: Merge "Update the PROCESS_TEXT action javadoc to include types" into mnc-dev
* commit '
ae0940fe754b7aba552b4a5cd616df052606ccd1':
Update the PROCESS_TEXT action javadoc to include types
Erik Kline [Fri, 22 May 2015 15:20:00 +0000 (15:20 +0000)]
am
2dcba49c: Merge "Notify only on loss of provisioning." into mnc-dev
* commit '
2dcba49caf114dd24ffc1c26a11683c5cb21e3ff':
Notify only on loss of provisioning.
Keisuke Kuroyanagi [Fri, 22 May 2015 15:19:54 +0000 (15:19 +0000)]
am
1733bd3d: Merge "Fix: Insertion handle can be moved just by tapping." into mnc-dev
* commit '
1733bd3defde7818940d72dac95bb18fb8d70b22':
Fix: Insertion handle can be moved just by tapping.
Adam Lesinski [Fri, 22 May 2015 15:19:47 +0000 (15:19 +0000)]
am
35f6c005: Merge "BatteryStatsService: Only query bluetooth on demand." into mnc-dev
* commit '
35f6c005be3565d49da60ff4e5b267a541115745':
BatteryStatsService: Only query bluetooth on demand.
Jim Miller [Fri, 22 May 2015 15:19:40 +0000 (15:19 +0000)]
am
b0eec328: Merge "Fix type-o in fingerprint string messages." into mnc-dev
* commit '
b0eec3288fc84fd5118be15004e46e27e5e584c1':
Fix type-o in fingerprint string messages.
Vinit Deshpande [Fri, 22 May 2015 15:19:34 +0000 (15:19 +0000)]
am
45261633: Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev
* commit '
4526163398e49713065d05be010d3233a281b05f':
Indicate failed scans with EXTRA_RESULTS_UPDATED
Griff Hazen [Fri, 22 May 2015 15:19:28 +0000 (15:19 +0000)]
am
cf3591ad: (-s ours) am
99fd373c: (-s ours) am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
cf3591ad60fac149fbe4d3e7e6335fdb9ea63eef':
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
Griff Hazen [Fri, 22 May 2015 15:19:23 +0000 (15:19 +0000)]
am
c40cd40d: (-s ours) am
77420269: (-s ours) am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
c40cd40d90c54b20e490fb25596f0781601e5d6d':
Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
Dirk Dougherty [Fri, 22 May 2015 15:19:17 +0000 (15:19 +0000)]
am
f4ba7833: am
0140854a: am
85dea528: Doc change: updated images, landings, and ndk updates.
* commit '
f4ba7833af54ad6a75803dd678acac57c7f9e26b':
Doc change: updated images, landings, and ndk updates.
Luan Nguyen [Fri, 22 May 2015 15:19:11 +0000 (15:19 +0000)]
am
67fe970e: am
82120b61: am
5c7dcb30: am
0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
* commit '
67fe970eaaa81b8fb4313ced7a05aac41bf25400':
docs: Update the AlwaysOn sample link to point to DAC's samples
Joe Fernandez [Fri, 22 May 2015 15:19:05 +0000 (15:19 +0000)]
am
b7361058: am
18cc51d6: am
23fcc39e: docs: M Preview downloads and SDK Setup pages v2
* commit '
b73610589aa5b580d3e22cbe8816cc48063d30ab':
docs: M Preview downloads and SDK Setup pages v2
Luan Nguyen [Fri, 22 May 2015 15:19:00 +0000 (15:19 +0000)]
am
1c23c1cb: am
d8573aa5: am
dfa79aeb: am
d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs
* commit '
1c23c1cb40a2e9e54e8fe1b707e9f29f9b00ee54':
docs: Refresh Wearable support library reference for Diamond
Luan Nguyen [Fri, 22 May 2015 15:18:54 +0000 (15:18 +0000)]
am
63b426e0: am
f644f702: am
6d592518: am
8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
* commit '
63b426e0c3e559dd57adf64b09fcda899e79cfaa':
docs: Remove references to Android Studio 0.8 beta