OSDN Git Service
Yin-Chia Yeh [Tue, 28 Apr 2015 18:20:09 +0000 (18:20 +0000)]
am
1fe9666c: am
5af4cc39: Merge "Camera: document supported templates" into mnc-dev
* commit '
1fe9666c669f3fefa5f980983f865f2e6934f0aa':
Camera: document supported templates
Amit Mahajan [Tue, 28 Apr 2015 18:20:03 +0000 (18:20 +0000)]
am
ce8e20ce: am
e3e60ebc: Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
* commit '
ce8e20cef9b8e79f456a8739d50a74c6f20a03f3':
Revert "Adding logging to debug SignalStrength callback missing issue."
Alan Viverette [Tue, 28 Apr 2015 18:19:58 +0000 (18:19 +0000)]
am
e8518e7e: am
f8fdf87c: Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
* commit '
e8518e7ee729597d2b2141c0c4aba695eb529028':
Fix handling of android:onClick for ContextWrapper
Amith Yamasani [Tue, 28 Apr 2015 18:19:52 +0000 (18:19 +0000)]
am
1a7a7383: am
c1ce0bbd: Merge "Mark actually seen notifications as seen" into mnc-dev
* commit '
1a7a73838567672e16ab78f673d9569c52c9c833':
Mark actually seen notifications as seen
Zhijun He [Tue, 28 Apr 2015 18:19:47 +0000 (18:19 +0000)]
am
44e5fe6c: am
513f7c33: Camera2: add max capture stall for reprocess
* commit '
44e5fe6c6c241a4f1d46bdb59f45decd756257e4':
Camera2: add max capture stall for reprocess
Yin-Chia Yeh [Tue, 28 Apr 2015 18:12:10 +0000 (18:12 +0000)]
am
5af4cc39: Merge "Camera: document supported templates" into mnc-dev
* commit '
5af4cc3922e8e1b6e1c89ee438c40c89980583ac':
Camera: document supported templates
Amit Mahajan [Tue, 28 Apr 2015 18:12:05 +0000 (18:12 +0000)]
am
e3e60ebc: Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
* commit '
e3e60ebc36b1dcbb085ebe33e04cb6b83c610832':
Revert "Adding logging to debug SignalStrength callback missing issue."
Alan Viverette [Tue, 28 Apr 2015 18:00:19 +0000 (18:00 +0000)]
am
f8fdf87c: Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
* commit '
f8fdf87c060fa77a1910d8b6f4b6d26c83963033':
Fix handling of android:onClick for ContextWrapper
Amith Yamasani [Tue, 28 Apr 2015 18:00:14 +0000 (18:00 +0000)]
am
c1ce0bbd: Merge "Mark actually seen notifications as seen" into mnc-dev
* commit '
c1ce0bbd149600fff3c7bada1c13bb00ccdbea1d':
Mark actually seen notifications as seen
Zhijun He [Tue, 28 Apr 2015 18:00:08 +0000 (18:00 +0000)]
am
513f7c33: Camera2: add max capture stall for reprocess
* commit '
513f7c33eae0084ecd70062d660f2b873032d895':
Camera2: add max capture stall for reprocess
Yin-Chia Yeh [Tue, 28 Apr 2015 17:55:13 +0000 (17:55 +0000)]
Merge "Camera: document supported templates" into mnc-dev
Yin-Chia Yeh [Sat, 25 Apr 2015 00:48:04 +0000 (17:48 -0700)]
Camera: document supported templates
Bug:
20264663
Change-Id: I6fee34a337bccb61aa563903032f9e2c13bf65e0
Amit Mahajan [Tue, 28 Apr 2015 17:53:14 +0000 (17:53 +0000)]
Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
Amit Mahajan [Mon, 27 Apr 2015 22:58:29 +0000 (22:58 +0000)]
Revert "Adding logging to debug SignalStrength callback missing issue."
This reverts commit
6ba726f825162481644df89cf0754f4e20f2793e.
Bug:
20444738
Change-Id: Idf118b259cfd3854feac851b9532d4fff1d74985
Alan Viverette [Tue, 28 Apr 2015 17:49:19 +0000 (17:49 +0000)]
Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
Amith Yamasani [Tue, 28 Apr 2015 17:48:15 +0000 (17:48 +0000)]
Merge "Mark actually seen notifications as seen" into mnc-dev
Wale Ogunwale [Tue, 28 Apr 2015 17:46:58 +0000 (17:46 +0000)]
am
fe4680f9: am
354b70f7: Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
* commit '
fe4680f9da7cb428af58f07978f1ef3125c0dad5':
Set non-starting visible resumed activity as resumed activity for the stack
Zhijun He [Sat, 25 Apr 2015 01:23:54 +0000 (18:23 -0700)]
Camera2: add max capture stall for reprocess
Bug:
19988710
Change-Id: I05bf3f72fdd54127d9aaa1583e9b0903be94c310
Alan Viverette [Tue, 28 Apr 2015 17:40:05 +0000 (17:40 +0000)]
am
6af08c6b: Merge "Fix for infinite loop in RemoteViewsAdapter"
* commit '
6af08c6b7693b4329184c9cccbc474a0b6a9ea5c':
Fix for infinite loop in RemoteViewsAdapter
Wale Ogunwale [Tue, 28 Apr 2015 17:29:46 +0000 (17:29 +0000)]
am
354b70f7: Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
* commit '
354b70f7d209e79e4442d4b70fb1d849163eae3d':
Set non-starting visible resumed activity as resumed activity for the stack
Joe Fernandez [Tue, 28 Apr 2015 17:28:28 +0000 (17:28 +0000)]
am
cd3793c6: am
e658285b: am
03cbc278: am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
cd3793c6f20048ce7278f749b35c5788f2a86852':
docs: Modify Branding guidelines for Android form factors
Amith Yamasani [Tue, 28 Apr 2015 17:28:09 +0000 (10:28 -0700)]
Mark actually seen notifications as seen
This was missing from a previous CL that was meant to have it.
Change-Id: I856cee8708d988630778ba88b70deaad8730fc1f
Joe Fernandez [Tue, 28 Apr 2015 17:14:34 +0000 (17:14 +0000)]
am
e658285b: am
03cbc278: am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
e658285baf86a223ad369851d1fc5ebacad7b408':
docs: Modify Branding guidelines for Android form factors
Wale Ogunwale [Tue, 28 Apr 2015 17:12:46 +0000 (17:12 +0000)]
Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
Alan Viverette [Tue, 28 Apr 2015 17:10:40 +0000 (17:10 +0000)]
Merge "Fix for infinite loop in RemoteViewsAdapter"
Joe Fernandez [Tue, 28 Apr 2015 17:02:34 +0000 (17:02 +0000)]
am
03cbc278: am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
03cbc27845d6622c8eb7c033ec18dc535ab5d7e4':
docs: Modify Branding guidelines for Android form factors
Joe Fernandez [Tue, 28 Apr 2015 16:46:36 +0000 (16:46 +0000)]
am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
0312f37785768d7931e81afe92dbeda11f132d50':
docs: Modify Branding guidelines for Android form factors
Marco Nelissen [Tue, 28 Apr 2015 16:45:50 +0000 (16:45 +0000)]
Merge "resolved conflicts for merge of
375e21f8 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
Marco Nelissen [Tue, 28 Apr 2015 16:42:54 +0000 (09:42 -0700)]
resolved conflicts for merge of
375e21f8 to mnc-dev-plus-aosp
Change-Id: I5681890381beed09e8719b066d0c37accae1658d
Svet Ganov [Tue, 28 Apr 2015 16:32:25 +0000 (16:32 +0000)]
am
565d274f: am
340b198c: Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
* commit '
565d274f3042c5573fb6fc2623876328f498091e':
Handle null projection properly if provider app op is not enabled.
Joe Fernandez [Tue, 28 Apr 2015 16:21:55 +0000 (16:21 +0000)]
Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
Svet Ganov [Tue, 28 Apr 2015 16:20:43 +0000 (16:20 +0000)]
am
340b198c: Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
* commit '
340b198ccbd1a05e67d586c345139617d4b84ce0':
Handle null projection properly if provider app op is not enabled.
Svet Ganov [Tue, 28 Apr 2015 16:03:53 +0000 (16:03 +0000)]
Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
dcashman [Tue, 28 Apr 2015 15:33:51 +0000 (15:33 +0000)]
am
59f9592f: am
2301174e: Merge "Add KeySetManagerService unit tests." into mnc-dev
* commit '
59f9592ff485de382abd4dfcdf04f0dd54fc7199':
Add KeySetManagerService unit tests.
dcashman [Tue, 28 Apr 2015 15:33:46 +0000 (15:33 +0000)]
am
1ea5067e: am
e12f23dc: Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev
* commit '
1ea5067e0a85982670c8072762af5308b9a8fb57':
Remove static modifier from KeySetManagerService issuedIds.
Marco Nelissen [Tue, 28 Apr 2015 15:26:52 +0000 (15:26 +0000)]
Merge "Sometimes the application context is null"
Geoff Mendal [Tue, 28 Apr 2015 14:55:11 +0000 (14:55 +0000)]
am
d34e8ebc: (-s ours) am
5d3249d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
d34e8ebc027bb90db5eb66c64d368b6b46aaf397':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 14:55:07 +0000 (14:55 +0000)]
am
c0aba5f7: (-s ours) am
5e43ae9c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c0aba5f70522088dcaacba59754321f6ce6d61d3':
Import translations. DO NOT MERGE
Dongwon Kang [Tue, 28 Apr 2015 14:55:00 +0000 (14:55 +0000)]
am
2be6622b: am
99f6c2a0: Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev
* commit '
2be6622b9655e5f7cba7107edbdfefd83be8fa3f':
TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
dcashman [Tue, 28 Apr 2015 14:54:59 +0000 (14:54 +0000)]
am
2301174e: Merge "Add KeySetManagerService unit tests." into mnc-dev
* commit '
2301174eb3598a3290b5c56aae36b19b2c6743ac':
Add KeySetManagerService unit tests.
dcashman [Tue, 28 Apr 2015 14:54:55 +0000 (14:54 +0000)]
am
e12f23dc: Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev
* commit '
e12f23dc7e36f34c2ebd440e5deffd8866b66ade':
Remove static modifier from KeySetManagerService issuedIds.
Martijn Coenen [Tue, 28 Apr 2015 14:54:50 +0000 (14:54 +0000)]
am
cfbedfee: am
e48cca2a: Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev
* commit '
cfbedfeebbd834e7420fa06cde96c87720e0199d':
Fix vmalloc memory accounting (DO NOT MERGE).
Keisuke Kuroyanagi [Tue, 28 Apr 2015 14:54:38 +0000 (14:54 +0000)]
am
a3a411ec: am
d2b9bd80: Merge "Fix: End handle disappears when the selection is short." into mnc-dev
* commit '
a3a411ec68024332ffb3c261374adc05a4e15b68':
Fix: End handle disappears when the selection is short.
Geoff Mendal [Tue, 28 Apr 2015 14:54:34 +0000 (14:54 +0000)]
am
3f98c14d: (-s ours) am
7bdd6aa1: (-s ours) Import translations. DO NOT MERGE
* commit '
3f98c14dc6fea2dfc09fb917fe9eaae0f6cce176':
Import translations. DO NOT MERGE
Joe Fernandez [Tue, 28 Apr 2015 14:53:57 +0000 (14:53 +0000)]
am
203c0a1c: am
f488985d: am
ff31bb4b: am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
203c0a1c31da87685afa0ee3bcb0df824e542789':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 14:53:52 +0000 (14:53 +0000)]
am
c70f95a3: am
d602d23f: am
80d19484: am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
c70f95a337480b4ea14725b2534afdf1e2bcc472':
docs: Update Wearable API setup to mention addApiIfAvailable().
Robert Shih [Tue, 28 Apr 2015 14:53:46 +0000 (14:53 +0000)]
am
ce1ff57f: am
43429656: Merge "MediaController: workaround to disable seek" into mnc-dev
* commit '
ce1ff57f2df632e8543d1c5415eba806c8e5c174':
MediaController: workaround to disable seek
Alan Viverette [Tue, 28 Apr 2015 14:53:26 +0000 (14:53 +0000)]
am
aacb04ca: am
1ce80dc0: Merge "Add some missing Settings and DayNight themes" into mnc-dev
* commit '
aacb04ca5c9c3d30b500987cb34d8c23163b843c':
Add some missing Settings and DayNight themes
Deepanshu Gupta [Tue, 28 Apr 2015 14:53:18 +0000 (14:53 +0000)]
am
9014b31f: am
8381e2cd: Merge "Fix view outline for shadows in LayoutLib." into mnc-dev
* commit '
9014b31f8094ce8dd1cead0b0fa8982e62ee35be':
Fix view outline for shadows in LayoutLib.
Raph Levien [Tue, 28 Apr 2015 14:53:01 +0000 (14:53 +0000)]
am
33d77e18: am
a589368a: Merge "Expose drawTextRun publicly" into mnc-dev
* commit '
33d77e18c4ee2a7c3ac7b853fdd819d7aff34751':
Expose drawTextRun publicly
Yorke Lee [Tue, 28 Apr 2015 14:52:55 +0000 (14:52 +0000)]
am
5e4b0843: am
d0922ed7: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
* commit '
5e4b08432cb3e8acb3b9abca7fd609edfd287c8c':
Rename setDefaultDialerApplication for consistency
Cedric Ho [Tue, 28 Apr 2015 14:51:59 +0000 (14:51 +0000)]
am
452304f7: am
25d12e3f: Merge "resolved conflicts for merge of
0af3af03 to mnc-dev" into mnc-dev
* commit '
452304f7195a782f5448ecf8bda7be11d5536982':
Enable VoiceInteractionService on watch.
Yorke Lee [Tue, 28 Apr 2015 14:51:47 +0000 (14:51 +0000)]
am
528887b2: am
c0f705a8: Merge "Add utility method isDefaultOrSystemDialer" into mnc-dev
* commit '
528887b23bdf105835e98f2e50ecfbbb71468fb9':
Add utility method isDefaultOrSystemDialer
Chris Craik [Tue, 28 Apr 2015 14:51:37 +0000 (14:51 +0000)]
am
15a0616d: am
3d80f4a6: Merge "Anti-alias by default" into mnc-dev
* commit '
15a0616d42513b69942c1e475bd1be5a1b340e8a':
Anti-alias by default
Chris Craik [Tue, 28 Apr 2015 14:51:32 +0000 (14:51 +0000)]
am
695b37cb: am
ba061aec: Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev
* commit '
695b37cb5dc78faf56289231a7f6a6def4b5fb53':
Promote RenderProperties with an alpha to have a RenderLayer
Dan Stoza [Tue, 28 Apr 2015 14:51:19 +0000 (14:51 +0000)]
am
692f288a: am
e54fbaa2: Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev
* commit '
692f288a64d87e426940905c54a874aea6732116':
ImageWriter: Change detach to sp<GraphicBuffer>
Adam Powell [Tue, 28 Apr 2015 14:51:07 +0000 (14:51 +0000)]
am
7c420307: am
580c30a6: Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
* commit '
7c42030739a5b9418135be798885df68a03c6ac2':
Wire up caller chooser targets for ChooserActivity
Svet Ganov [Tue, 28 Apr 2015 14:50:51 +0000 (14:50 +0000)]
am
87e96b66: am
1f0943dd: Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev
* commit '
87e96b6609b6a0e073449bade173e9fe7be9826b':
DO NOT MERGE Do not clean up global/system settings on package unintalls.
Arunesh Mishra [Tue, 28 Apr 2015 14:50:46 +0000 (14:50 +0000)]
am
371dd500: am
c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
* commit '
371dd5003e6c470f7021ad1fb8d2c853ecb5ba98':
Add near-ultrasound properties to AudioManager.java
Scott Rowe [Tue, 28 Apr 2015 14:50:41 +0000 (14:50 +0000)]
am
5c4eb380: am
cc637ab0: am
7f2e8cdc: am
63604283: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
5c4eb38053c029f67de1e069cf42883e0e17e236':
Andrew Solovay [Tue, 28 Apr 2015 14:50:36 +0000 (14:50 +0000)]
am
5ba6a768: am
b005be69: am
ec472abf: am
44199d26: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
5ba6a76884f8cfefc5b40553c78cf94a7003f11f':
Andrew Solovay [Tue, 28 Apr 2015 14:50:26 +0000 (14:50 +0000)]
am
b7b997e6: am
0d59144c: am
bd719d7b: am
19bc81db: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
b7b997e6262fc0090f1deba7aeb62a096a1e6da9':
Quddus Chong [Tue, 28 Apr 2015 14:50:19 +0000 (14:50 +0000)]
am
b6dd8354: am
a7db8bcb: am
5edfdac4: am
a76a3dd3: (-s ours) am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
b6dd8354537496774e84ac25e13d6113507534d8':
Julia Reynolds [Tue, 28 Apr 2015 14:50:11 +0000 (14:50 +0000)]
am
89f19371: am
6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev
* commit '
89f193715484c5e10e555aa477012c0246a1827e':
Allow device initializers to set a preferred setup activity.
Benjamin Franz [Tue, 28 Apr 2015 14:50:05 +0000 (14:50 +0000)]
am
94e3b0c5: am
0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev
* commit '
94e3b0c509aacd8ff0395c56f06a7898eabeca5b':
Introduce disable2 into StatusBarManager
Geoff Mendal [Tue, 28 Apr 2015 14:50:00 +0000 (14:50 +0000)]
am
b268f606: (-s ours) am
d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
b268f6064239ca30749e77db86200c4627f0d93a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 14:49:54 +0000 (14:49 +0000)]
am
bbca11e5: (-s ours) am
69812636: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
bbca11e573d6e3e8188433a2061e2e26f28a733e':
Import translations. DO NOT MERGE
dcashman [Tue, 28 Apr 2015 14:44:05 +0000 (14:44 +0000)]
Merge "Add KeySetManagerService unit tests." into mnc-dev
dcashman [Tue, 28 Apr 2015 14:43:29 +0000 (14:43 +0000)]
Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 10:09:21 +0000 (10:09 +0000)]
am
5d3249d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
5d3249d6fd0b699087fbafa27a699256a3bd1e65':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 10:09:17 +0000 (10:09 +0000)]
am
5e43ae9c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
5e43ae9c9c33d4be8ce1dbd760ce0170d0666d71':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 09:56:40 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 09:56:23 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Narayan Kamath [Tue, 28 Apr 2015 09:48:24 +0000 (09:48 +0000)]
am
71fa6862: Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"
* commit '
71fa6862f307796c659fd4e83a7724dd6851b69e':
Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
Narayan Kamath [Tue, 28 Apr 2015 09:48:19 +0000 (09:48 +0000)]
am
b736868b: Merge "Fix NullPointerException in Bundle#hasFileDescriptors"
* commit '
b736868be917afd5d3ea7e8a8d3d658c4350a239':
Fix NullPointerException in Bundle#hasFileDescriptors
Dongwon Kang [Tue, 28 Apr 2015 09:41:18 +0000 (09:41 +0000)]
am
99f6c2a0: Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev
* commit '
99f6c2a0728ddd41e9d147884816a451c250b0ad':
TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
Dongwon Kang [Tue, 28 Apr 2015 09:25:49 +0000 (09:25 +0000)]
Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 08:56:40 +0000 (01:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f6d4bf043ac98defa9d3b70d0a01d48f4aa6ace
Auto-generated-cl: translation import
Geoff Mendal [Tue, 28 Apr 2015 08:43:47 +0000 (01:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25003c7f81d46bc95432d22aeb7657fef7c76579
Auto-generated-cl: translation import
Narayan Kamath [Tue, 28 Apr 2015 08:32:55 +0000 (08:32 +0000)]
Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"
Taiju Tsuiki [Tue, 28 Apr 2015 04:36:15 +0000 (13:36 +0900)]
Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
Add a null check for each values of SparseArray in Bundle#hasFileDescriptor
to avoid NullPointerException.
Change-Id: I43ecc01f2759ccbe85b902fa118d55cb74ebf38b
Narayan Kamath [Tue, 28 Apr 2015 08:29:09 +0000 (08:29 +0000)]
Merge "Fix NullPointerException in Bundle#hasFileDescriptors"
Taiju Tsuiki [Wed, 22 Apr 2015 07:59:00 +0000 (16:59 +0900)]
Fix NullPointerException in Bundle#hasFileDescriptors
Add null check for array elements in Bundle#hasFileDescriptors to avoid NPE on
null valued array.
Change-Id: Ic6ef8864ca6add023c7a69ba3c9474b0f6291723
Dongwon Kang [Tue, 28 Apr 2015 08:24:51 +0000 (17:24 +0900)]
TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
Bug:
20509313
Change-Id: I762bb74ae2a1688e1bc6cdbf6bf5a8b931ae0689
Martijn Coenen [Tue, 28 Apr 2015 08:03:58 +0000 (08:03 +0000)]
am
e48cca2a: Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev
* commit '
e48cca2a20668951254e980ac9284cd3492280ba':
Fix vmalloc memory accounting (DO NOT MERGE).
Martijn Coenen [Tue, 28 Apr 2015 07:50:12 +0000 (07:50 +0000)]
Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev
Keisuke Kuroyanagi [Tue, 28 Apr 2015 05:10:55 +0000 (05:10 +0000)]
am
d2b9bd80: Merge "Fix: End handle disappears when the selection is short." into mnc-dev
* commit '
d2b9bd80a20e5339bd2555d83d11a5cd88a20034':
Fix: End handle disappears when the selection is short.
Keisuke Kuroyanagi [Tue, 28 Apr 2015 04:58:42 +0000 (04:58 +0000)]
Merge "Fix: End handle disappears when the selection is short." into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 04:58:07 +0000 (04:58 +0000)]
am
7bdd6aa1: (-s ours) Import translations. DO NOT MERGE
* commit '
7bdd6aa1a4fd0f02184dc39fb43a2096fbfb6e1f':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 04:38:29 +0000 (21:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56af308506de3258cefb3c96d49ca5ccaed1a57d
Auto-generated-cl: translation import
Wale Ogunwale [Tue, 28 Apr 2015 03:54:47 +0000 (20:54 -0700)]
Set non-starting visible resumed activity as resumed activity for the stack
When ensuring visible activities for a stack we check to see if there is
already a resumed activity on the stack, so if we need to start an
activity that needs to be visible, we start it in the paused state
if there is already a resumed activity in the stack. This was't
taking into account a non-starting, visible, and resumed activity.
One case this can happen is if the currently resumed activity in
the stack becomes translucent and the activity behind it needs to
be started because it was previously destroyed due to low memory.
Bug:
19636839
Change-Id: I31670fd64d3bcbbf41823f51518ca603c7412e92
Joe Fernandez [Tue, 28 Apr 2015 00:45:48 +0000 (00:45 +0000)]
am
f488985d: am
ff31bb4b: am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
f488985dce6424446a458f08f2c141b64ac07e39':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 00:45:44 +0000 (00:45 +0000)]
am
d602d23f: am
80d19484: am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
d602d23fd81d7b70d76c596d9b0ae7a4cfd98e02':
docs: Update Wearable API setup to mention addApiIfAvailable().
Robert Shih [Tue, 28 Apr 2015 00:45:38 +0000 (00:45 +0000)]
am
43429656: Merge "MediaController: workaround to disable seek" into mnc-dev
* commit '
43429656ff8762416571661c591691aeb9cebdbd':
MediaController: workaround to disable seek
Joe Fernandez [Tue, 28 Apr 2015 00:36:29 +0000 (00:36 +0000)]
am
ff31bb4b: am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
ff31bb4bb7d46766552526f6580a76445a549339':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 00:36:23 +0000 (00:36 +0000)]
am
80d19484: am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
80d19484c109c4beb0e36b7ce0418ebe526ad300':
docs: Update Wearable API setup to mention addApiIfAvailable().
Robert Shih [Tue, 28 Apr 2015 00:30:11 +0000 (00:30 +0000)]
Merge "MediaController: workaround to disable seek" into mnc-dev
Joe Fernandez [Tue, 28 Apr 2015 00:24:26 +0000 (00:24 +0000)]
am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
68ef92871f52bad28d5aea168c0d3a4b863d282d':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 00:24:19 +0000 (00:24 +0000)]
am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
185002bcc9b551828557ab6946fef7fef1c17d74':
docs: Update Wearable API setup to mention addApiIfAvailable().
Svet Ganov [Tue, 28 Apr 2015 00:00:44 +0000 (17:00 -0700)]
Handle null projection properly if provider app op is not enabled.
Change-Id: I00b757ef73bf4dd58217ba748520c3504350d4ba
OSDN Git Service
