OSDN Git Service
Alan Viverette [Mon, 3 Apr 2017 23:06:43 +0000 (23:06 +0000)]
Merge "Refresh opacity and statefulness on tint change" into oc-dev am:
265dbc1f09
am:
1148bc819a
Change-Id: I76faf6d25666c1b5612c009cfd9081465f319589
Alan Viverette [Mon, 3 Apr 2017 22:57:11 +0000 (22:57 +0000)]
Merge "Refresh opacity and statefulness on tint change" into oc-dev
am:
265dbc1f09
Change-Id: Ie5a0ab7ff9f107ef386d9d5dae6b30bfbd93b6f6
TreeHugger Robot [Mon, 3 Apr 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Refresh opacity and statefulness on tint change" into oc-dev
Pankaj Kanwar [Mon, 3 Apr 2017 22:47:22 +0000 (22:47 +0000)]
Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev am:
37bbb789af
am:
a3c05485db
Change-Id: Iec17862e992d1597741d376dabcbf602aef72923
Pankaj Kanwar [Mon, 3 Apr 2017 22:41:17 +0000 (22:41 +0000)]
Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev
am:
37bbb789af
Change-Id: I5181ea040e2406c9b7bc2bb8c16f2b1a8d35946e
Dianne Hackborn [Mon, 3 Apr 2017 22:37:12 +0000 (22:37 +0000)]
Merge "Framework support to improve bg check CTS tests." into oc-dev am:
78e8ac9c14
am:
13f9bb4c0a
Change-Id: I14c6dcd5f6328e700d1a6f5c059020767732bc6b
Pankaj Kanwar [Mon, 3 Apr 2017 22:35:59 +0000 (22:35 +0000)]
Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev
Jeff Sharkey [Mon, 3 Apr 2017 22:32:14 +0000 (22:32 +0000)]
Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev am:
a73aee4cdc
am:
39561fa9a9
Change-Id: I6031f36aa31679a143b66e7f7eced1b468648de7
Dianne Hackborn [Mon, 3 Apr 2017 22:32:11 +0000 (22:32 +0000)]
Merge "Framework support to improve bg check CTS tests." into oc-dev
am:
78e8ac9c14
Change-Id: Ibc14492d2ce3cf312f7478a6f6edaf383d26f657
Yohei Yukawa [Mon, 3 Apr 2017 22:31:13 +0000 (22:31 +0000)]
Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev am:
1061992733
am:
7f5b18356c
Change-Id: I44a3d6e304270fa1d53953aac0eaf8d42d748615
Makoto Onuki [Mon, 3 Apr 2017 22:30:19 +0000 (22:30 +0000)]
Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev am:
6a7a967b71
am:
eeb6197d39
Change-Id: Ief58d7cf855babdda0ae0a0933051ee8a1ee2b53
Jeff Sharkey [Mon, 3 Apr 2017 22:26:03 +0000 (22:26 +0000)]
Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev
am:
a73aee4cdc
Change-Id: I6b1bfbc5365906b0e8eb7a058fdda01297ef4c56
TreeHugger Robot [Mon, 3 Apr 2017 22:25:53 +0000 (22:25 +0000)]
Merge "Framework support to improve bg check CTS tests." into oc-dev
Yohei Yukawa [Mon, 3 Apr 2017 22:24:34 +0000 (22:24 +0000)]
Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev
am:
1061992733
Change-Id: Ief8593eb666c0162fa30753471112f2ab64f1e38
Makoto Onuki [Mon, 3 Apr 2017 22:23:35 +0000 (22:23 +0000)]
Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev
am:
6a7a967b71
Change-Id: I7b8cba52ec500fb789171d4dd97e467a8b926bfa
Sanket Padawe [Mon, 3 Apr 2017 22:23:28 +0000 (22:23 +0000)]
Merge "Make some intents public in SubscriptionManager." into oc-dev am:
9077faab1f
am:
a374081697
Change-Id: I68cac494b2cae5217657098672a49ce99a6feca4
TreeHugger Robot [Mon, 3 Apr 2017 22:17:13 +0000 (22:17 +0000)]
Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev
Sanket Padawe [Mon, 3 Apr 2017 22:16:54 +0000 (22:16 +0000)]
Merge "Make some intents public in SubscriptionManager." into oc-dev
am:
9077faab1f
Change-Id: I5cfb95fd6965c58adfb86e4a607123b648d10b24
Yohei Yukawa [Mon, 3 Apr 2017 22:14:25 +0000 (22:14 +0000)]
Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 22:13:26 +0000 (22:13 +0000)]
Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev
Sanket Padawe [Mon, 3 Apr 2017 22:10:24 +0000 (22:10 +0000)]
Merge "Make some intents public in SubscriptionManager." into oc-dev
Joseph Pirozzo [Mon, 3 Apr 2017 22:09:49 +0000 (22:09 +0000)]
Merge "Bluetooth Multi Connect"
Dongwon Kang [Mon, 3 Apr 2017 22:07:47 +0000 (22:07 +0000)]
Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev am:
64731b1d41
am:
2e7a92f1a5
Change-Id: I1a7ab67424478c92ab879a39b3b54aeb31ee9f95
TreeHugger Robot [Mon, 3 Apr 2017 22:04:17 +0000 (22:04 +0000)]
Merge "Add AvailableVirtualKeyboardFragment to TV"
Dongwon Kang [Mon, 3 Apr 2017 21:56:44 +0000 (21:56 +0000)]
Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev
am:
64731b1d41
Change-Id: Id2737cf02080ba6b9a37dffba2a7727466ae07e5
Doris Liu [Mon, 3 Apr 2017 21:54:52 +0000 (21:54 +0000)]
Merge "Remove workaround for end() not supported in some app" into oc-dev am:
33f893202d
am:
f27cf9cb9a
Change-Id: Ib0af0d8db932c33842b3a71ec0040a1fe7d9061e
Doris Liu [Mon, 3 Apr 2017 21:48:13 +0000 (21:48 +0000)]
Merge "Remove workaround for end() not supported in some app" into oc-dev
am:
33f893202d
Change-Id: I991ba78a570021ea4d7e7ac4d743225ee947a635
TreeHugger Robot [Mon, 3 Apr 2017 21:46:32 +0000 (21:46 +0000)]
Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 21:41:12 +0000 (21:41 +0000)]
Merge "Remove workaround for end() not supported in some app" into oc-dev
Romain Guy [Mon, 3 Apr 2017 21:36:32 +0000 (21:36 +0000)]
Merge "Make Color non-final because apps break..." into oc-dev am:
c0c524af4f
am:
97497985ad
Change-Id: Id10b82a9f6e6092a121a3fb35b28ff120b35b86f
Romain Guy [Mon, 3 Apr 2017 21:28:58 +0000 (21:28 +0000)]
Merge "Make Color non-final because apps break..." into oc-dev
am:
c0c524af4f
Change-Id: Ic2d88c0a09eadd151f164b4da50c6e60df83dbbd
TreeHugger Robot [Mon, 3 Apr 2017 21:21:13 +0000 (21:21 +0000)]
Merge "Make Color non-final because apps break..." into oc-dev
Vladislav Kaznacheev [Mon, 3 Apr 2017 21:08:50 +0000 (21:08 +0000)]
Merge "Javadoc fix for View.setTooltipText" into oc-dev am:
5219a85eaa
am:
595fdd7dc5
Change-Id: I40654a7e3c9d3f35fecb727cb9669a67f6910415
Vladislav Kaznacheev [Mon, 3 Apr 2017 21:01:25 +0000 (21:01 +0000)]
Merge "Javadoc fix for View.setTooltipText" into oc-dev
am:
5219a85eaa
Change-Id: Id6a4d111411ea8e44cbc7865fc5a26f9b0c1bb31
TreeHugger Robot [Mon, 3 Apr 2017 20:56:43 +0000 (20:56 +0000)]
Merge "Fix error in RenderNode unit test with Skia pipeline"
TreeHugger Robot [Mon, 3 Apr 2017 20:55:11 +0000 (20:55 +0000)]
Merge "Javadoc fix for View.setTooltipText" into oc-dev
Makoto Onuki [Mon, 3 Apr 2017 20:49:51 +0000 (20:49 +0000)]
Merge "Persistent connection to DO/PO service." into oc-dev am:
dcc792a13f
am:
24e1ad4001
Change-Id: Ia90400628ca9313f7ec2326a7c0967fe01e1cc6e
Makoto Onuki [Mon, 3 Apr 2017 20:44:25 +0000 (20:44 +0000)]
Merge "Persistent connection to DO/PO service." into oc-dev
am:
dcc792a13f
Change-Id: I05bb97b2708cab722e5dfa2807ac24f1869bb245
TreeHugger Robot [Mon, 3 Apr 2017 20:35:14 +0000 (20:35 +0000)]
Merge "Persistent connection to DO/PO service." into oc-dev
Jeff Davidson [Mon, 3 Apr 2017 20:26:53 +0000 (20:26 +0000)]
Merge "Squashed merge of master-sim into master."
Jeff Sharkey [Mon, 3 Apr 2017 20:14:10 +0000 (20:14 +0000)]
Revert "Deprecate EXTRA_STREAM."
This reverts commit
a0ba51c2ab75c8e0406bbd43742597552b6dae98.
Bug:
35293781
Change-Id: I5f0b9000535ac0bcbbe125fe781c20c5fb0c8782
Makoto Onuki [Mon, 3 Apr 2017 20:01:58 +0000 (20:01 +0000)]
Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev am:
ef7dff2563
am:
be3ee7ee30
Change-Id: I13a0dd37dfb4475866535abb514aa4a8dcd2f6a6
Makoto Onuki [Mon, 3 Apr 2017 18:24:25 +0000 (11:24 -0700)]
Remove/fix broken test due to change to DUMP permission check.
Bug
36854321
Test: adb shell am instrument -e class 'com.android.server.pm.ShortcutManagerTest2' -w com.android.frameworks.servicestests
Change-Id: I80f2a326b70f8d0598246732510e3725a0c58871
Makoto Onuki [Mon, 3 Apr 2017 19:54:24 +0000 (19:54 +0000)]
Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev
am:
ef7dff2563
Change-Id: I43302d90f7aa2c174c5e31cd5390e03c3c087157
Dongwon Kang [Fri, 24 Mar 2017 00:05:38 +0000 (17:05 -0700)]
TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI
Test: cts-tradefed run cts -m CtsTvTestCases
Bug:
35856179
Change-Id: I284cb1b764203c646e3edb3f105d90d59a7688d1
Makoto Onuki [Mon, 3 Apr 2017 19:45:08 +0000 (19:45 +0000)]
Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev
pkanwar [Tue, 28 Mar 2017 23:40:28 +0000 (16:40 -0700)]
Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.
Bug:
35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
(cherry picked from commit
89731a8389c9726172989f1677b76cc0f6a96f4f)
Winson Chung [Mon, 3 Apr 2017 19:34:41 +0000 (19:34 +0000)]
Merge "Fix menu visibility while updating dismiss fraction." into oc-dev am:
3f2bbcbe92
am:
04475bfa2c
Change-Id: I011e86072a521775547c11563e08276b04d1f933
Android Build Merger (Role) [Mon, 3 Apr 2017 19:28:53 +0000 (19:28 +0000)]
Merge "Merge "Add test API for if the device supports QS" into oc-dev am:
be436bdefe am:
b3963766c6"
TreeHugger Robot [Mon, 3 Apr 2017 19:27:59 +0000 (19:27 +0000)]
Merge "add temporary cast to allow Skia roll"
Jason Monk [Mon, 3 Apr 2017 19:27:26 +0000 (19:27 +0000)]
Merge "Add test API for if the device supports QS" into oc-dev am:
be436bdefe
am:
b3963766c6
Change-Id: I9601140fb9d24cec74d3c028240acaa1b7d0113d
Winson Chung [Mon, 3 Apr 2017 19:26:31 +0000 (19:26 +0000)]
Merge "Fix menu visibility while updating dismiss fraction." into oc-dev
am:
3f2bbcbe92
Change-Id: I748b00c12872baa61280a20d354da49766fcf837
Winson Chung [Mon, 3 Apr 2017 19:22:54 +0000 (19:22 +0000)]
Merge "Fix menu visibility while updating dismiss fraction." into oc-dev
Jason Monk [Mon, 3 Apr 2017 19:22:35 +0000 (19:22 +0000)]
Merge "Add test API for if the device supports QS" into oc-dev
am:
be436bdefe
Change-Id: Ia882b3d7e7ab25c8b1426f478adadad8432c18f2
Jason Monk [Mon, 3 Apr 2017 19:11:36 +0000 (19:11 +0000)]
Merge "Add test API for if the device supports QS" into oc-dev
Doris Liu [Mon, 3 Apr 2017 18:08:11 +0000 (11:08 -0700)]
Remove workaround for end() not supported in some app
BUG:
36241584
Test: Follow repro steps of comment #1 in the bug above
Change-Id: I1bf27a7cc9cc2bd398c372623d7978e838f1d8b2
Stephen Chen [Mon, 3 Apr 2017 18:51:46 +0000 (18:51 +0000)]
Merge "Add friction icon for metered networks." into oc-dev am:
38344ac4e9
am:
aa0b33f065
Change-Id: Ib9da5f27610bd131dcd10ab12cb2d493023cbe14
Romain Guy [Mon, 3 Apr 2017 18:49:20 +0000 (11:49 -0700)]
Make Color non-final because apps break...
Bug:
36858735
Test: Manual run of crashing app
Change-Id: I3eb06260074ee6950bc91731e7093a26d7e32b49
Winson Chung [Mon, 3 Apr 2017 18:47:49 +0000 (18:47 +0000)]
Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev am:
34ecbaa991
am:
0ed0b685b4
Change-Id: I925a568a4bde9eaab06b227690094c6099b7dfff
Stephen Chen [Mon, 3 Apr 2017 18:40:19 +0000 (18:40 +0000)]
Merge "Add friction icon for metered networks." into oc-dev
am:
38344ac4e9
Change-Id: I4edf3bd9367de701ea3f161a0ff461d47e216186
Vladislav Kaznacheev [Thu, 30 Mar 2017 00:14:37 +0000 (17:14 -0700)]
Javadoc fix for View.setTooltipText
Change "unless is not handled" to "unless it is handled"
Bug:
36668465
Test: read the Javadoc
Change-Id: I432f24e313358b4448aff2ff9de382d4a58652bc
Winson Chung [Mon, 3 Apr 2017 18:37:57 +0000 (18:37 +0000)]
Merge "Fixing regression in PiP TV." into oc-dev am:
244e4854c3
am:
3152f5b4e6
Change-Id: Ie53f7c78709d5b71bf26d746d1c0966b8afc5fbd
Brad Ebinger [Mon, 3 Apr 2017 18:36:51 +0000 (18:36 +0000)]
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev am:
57132a1513
am:
6f4841bd3b
Change-Id: I73d709b8763c0859b13c621d530d5614d93c8ca2
Winson Chung [Mon, 3 Apr 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev
am:
34ecbaa991
Change-Id: I76109d3ae5f9b6ad98860d62c889b042bb3f6562
Winson Chung [Mon, 3 Apr 2017 18:33:50 +0000 (18:33 +0000)]
Merge "Fixing regression in PiP TV." into oc-dev
am:
244e4854c3
Change-Id: Id0d758849c8838f9f43958e43978246b9b8c5cec
Brad Ebinger [Mon, 3 Apr 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
am:
57132a1513
Change-Id: Ic29e989b13f2a9d4d53b403f3bdc1b1c46145e45
Chad Brubaker [Mon, 3 Apr 2017 18:25:36 +0000 (18:25 +0000)]
Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev am:
e35d50622c
am:
a8c068f723
Change-Id: Id57b91b68ce6a4e1f31e8670798b59b82593ea96
TreeHugger Robot [Mon, 3 Apr 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Add friction icon for metered networks." into oc-dev
Andrii Kulian [Mon, 3 Apr 2017 18:23:58 +0000 (18:23 +0000)]
Merge "Fix some WM unit tests" into oc-dev am:
2c93764bee
am:
45d534bf93
Change-Id: Ia81653887fbf9a712d0ed285fa91a0e3afe1bff6
Winson Chung [Mon, 3 Apr 2017 18:23:24 +0000 (18:23 +0000)]
Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev
Daniel Nishi [Mon, 3 Apr 2017 18:22:54 +0000 (18:22 +0000)]
Merge "Use KB instead of kB." into oc-dev am:
e8165eb4ba
am:
2444e42e1c
Change-Id: Ic43b71522c28cdd2e7c73e7406f972b623bc4d54
Winson Chung [Mon, 3 Apr 2017 18:22:35 +0000 (18:22 +0000)]
Merge "Fixing regression in PiP TV." into oc-dev
Geoffrey Pitsch [Mon, 3 Apr 2017 18:21:57 +0000 (18:21 +0000)]
Merge "Fix deleting Misc channel for o-aps" into oc-dev am:
a906fb7b43
am:
635e4efa1c
Change-Id: I97ca05aff7bea5d0d99d19d29d17bdc00c8381be
Todd Kennedy [Mon, 3 Apr 2017 18:20:55 +0000 (18:20 +0000)]
Merge "Expose instant app to exposed providers" into oc-dev am:
644648ebfd
am:
58672aba18
Change-Id: I2a2b87d9203c55a905ec2dc5585a87b4fedbde98
Jason Monk [Mon, 3 Apr 2017 18:19:46 +0000 (18:19 +0000)]
Merge "Disable sounds on menu button" into oc-dev am:
5c8832a983
am:
3184cfce76
Change-Id: Ibeab08999de0480fe4dd7ca287996a9395df84e7
Jason Monk [Mon, 3 Apr 2017 18:18:41 +0000 (18:18 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev am:
cb4ed821f2
am:
17e605aae8
Change-Id: I31c58ac77e4df9e32958659519229467a82d2f08
Jeff Davidson [Mon, 27 Feb 2017 17:46:00 +0000 (09:46 -0800)]
Squashed merge of master-sim into master.
Includes the following commits:
==
New system feature: eUICC.
Presence of this feature implies that eUICC-related APIs are expected
to function as long as an eUICC is present in the device. Note that an
eUICC may be embedded in the device but may also be removable.
==
Add empty EuiccManager API and plumbing.
==
Add stub EuiccService.
EuiccService is the class that the LPA app must implement; for now,
just define the action and priority so that the implementation can be
found. Actual methods will come later.
Also declare two relevant permissions: BIND_EUICC_SERVICE, which the
implementation must require (so that nobody else can bind to the
service directly), and WRITE_EMBEDDED_SUBSCRIPTIONS, which permits
signature|privileged apps and CTS (via development) to access
EuiccManager APIs.
==
Add UiccAccessRule based off UiccCarrierPrivilegeRules#AccessRule.
This class can be used to transfer access rules between an
EuiccService implementation and the platform.
We also add a simple encoding/decoding of a list of rules so that they
may be stored in the subscription info table.
==
Add getEid() to EuiccManager/EuiccService.
getEid() fetches the EID. It requires either a privileged permission
(READ_PRIVILEGED_PHONE_STATE) or carrier privileges on the
currently-active profile. Until there is a use case that requires
opening this up to apps with only READ_PHONE_STATE, we shouldn't do
so.
To avoid churn in the future, the API signatures for EuiccService
include a slot ID to identify which SIM slot is being used. However,
this parameter is currently not populated correctly (nor is it usable,
as no Telephony APIs accept a slot ID to address commands). There is
no need to expose it yet in the EuiccManager APIs as we expect to
follow the TelephonyManager pattern of allowing per-slot instances of
EuiccManager in the future while keeping other method signatures the
same.
==
Define Euicc UI actions in EuiccManager/EuiccService.
The EuiccManager actions are to be implemented by the platform (and
only the platform), which forwards the actions to the active
implementation.
Also, remove our explicit priority meta-data tag as we can just rely
on android:priority in the corresponding intent-filter.
==
APIs for downloading embedded subscriptions.
Includes:
-getDownloadableSubscriptionMetadata, used by the platform and LUI to
fetch metadata about a downloadable subscription. The platform will
use this to perform the necessary permission checks (only allowing
otherwise-unprivileged apps to download profiles that are permitted
per the subscription metadata), and the LUI can use this to present
the name of the profile.
-downloadSubscription, to actually perform a profile download.
The stub for startResolutionActivity is included but not implemented;
resolution activities will be handled in a follow-up change.
==
Test: TreeHugger
Change-Id: I47b1da5a69f0736012cb137e02cd6c4e07fdaace
George Mount [Mon, 3 Apr 2017 18:13:28 +0000 (18:13 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev am:
e9679db5e2
am:
834752d4b2
Change-Id: I8f60a0e8b45d6c9c0944b47d867cbb5727fafc7a
Chad Brubaker [Mon, 3 Apr 2017 18:13:27 +0000 (18:13 +0000)]
Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
am:
e35d50622c
Change-Id: Ibe29b902356c271e4ca33da87ed908d427dfb46d
Brad Ebinger [Mon, 3 Apr 2017 18:12:37 +0000 (18:12 +0000)]
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
Diego Perez [Mon, 3 Apr 2017 18:10:52 +0000 (18:10 +0000)]
Merge "Fix broken perf tests" into oc-dev am:
974b5b13b2
am:
471872e4b8
Change-Id: I9941c82ab0467fd885262aba22078fef5fda8769
Jason Monk [Mon, 3 Apr 2017 18:09:36 +0000 (18:09 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev am:
a56b6e530a
am:
f6e22d4f36
Change-Id: Ib70b009369497f3c11369b01093298bb287f432f
Jason Monk [Mon, 3 Apr 2017 18:08:17 +0000 (18:08 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev am:
f244f7e1b8
am:
5c549b3a2a
Change-Id: I73db4793b09c095404e61e7b377579108116c5f2
Andrii Kulian [Mon, 3 Apr 2017 18:07:30 +0000 (18:07 +0000)]
Merge "Fix some WM unit tests" into oc-dev
am:
2c93764bee
Change-Id: I7d2d610f3939eac1b271e45ae35457b7b71dc46a
Daniel Nishi [Mon, 3 Apr 2017 18:06:19 +0000 (18:06 +0000)]
Merge "Use KB instead of kB." into oc-dev
am:
e8165eb4ba
Change-Id: I33784b0f9c681dcfdc2a1f03d707336a9729ae30
Geoffrey Pitsch [Mon, 3 Apr 2017 18:05:06 +0000 (18:05 +0000)]
Merge "Fix deleting Misc channel for o-aps" into oc-dev
am:
a906fb7b43
Change-Id: I5276632980c373a0bc1861915a10cecf29b6cce1
Todd Kennedy [Mon, 3 Apr 2017 18:03:47 +0000 (18:03 +0000)]
Merge "Expose instant app to exposed providers" into oc-dev
am:
644648ebfd
Change-Id: I32fc7de9cd1a0823dd38e5103d85c47776bb1404
Jason Monk [Mon, 3 Apr 2017 18:02:26 +0000 (18:02 +0000)]
Merge "Disable sounds on menu button" into oc-dev
am:
5c8832a983
Change-Id: I16aef7e38de6a154d051f539b9fc8c96db73958a
Todd Kennedy [Mon, 3 Apr 2017 18:02:24 +0000 (18:02 +0000)]
Merge "Implement service filtering" into oc-dev am:
35110948b7
am:
48a2f0036c
Change-Id: I479a1db354a7f61e669f67241a0648d843301e95
Jason Monk [Mon, 3 Apr 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev
am:
cb4ed821f2
Change-Id: I34cc7adb16ec21ba8c9cf210b3ca61b2c9506290
Bryce Lee [Mon, 3 Apr 2017 18:00:08 +0000 (18:00 +0000)]
Merge "Add app bounds to configuration." into oc-dev am:
7efe56b779
am:
59d1f8a024
Change-Id: Iae8e43872eee11214347cfb935793e9356a50e08
Chris Wren [Mon, 3 Apr 2017 17:58:54 +0000 (17:58 +0000)]
Merge "standardize network policy notification IDs" into oc-dev am:
ef3a28cb92
am:
04b0e05bef
Change-Id: Ifd5acffff7b45e02d5ba404550e32e16b5003bd7
Joseph Pirozzo [Thu, 30 Mar 2017 22:42:01 +0000 (15:42 -0700)]
Bluetooth Multi Connect
Allow automotive bluetooth profiles to connect to issue multiple connect
calls without disconnecting other devices. These client side profiles
either support multiple connections or handle multiple connection
requests gracefully.
Bug:
36789202
Test: Manual, Connect to one paired device then attempt to connect to a
second paired device, observe that HFP and PBAP are both connected on
both devices.
Change-Id: I8bd6aea2b8411ba5585b34292d8c6ec62c5c2f96
George Mount [Mon, 3 Apr 2017 17:57:27 +0000 (17:57 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
am:
e9679db5e2
Change-Id: I4192bc42bdc35ff29ac6e3c4ce2bb67f5a412c4b
Jason Monk [Mon, 3 Apr 2017 17:57:23 +0000 (17:57 +0000)]
Merge "Switch cast over to support library dialog" into oc-dev am:
de8cd0e8f5
am:
4209e9d739
Change-Id: I5311fff98a4735bf79c1f147e5733c38caf9da37
Jorim Jaggi [Mon, 3 Apr 2017 17:56:10 +0000 (17:56 +0000)]
Revert "Temporarily bg-whitelist the default container package-cleaning service" am:
91232840aa
am:
c4bfd5e751
Change-Id: I83a8d235fca0991f394cd9da899089a96bc0a7f3
Tony Mak [Mon, 3 Apr 2017 17:54:39 +0000 (17:54 +0000)]
Merge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev am:
0c224f9674
am:
aa82698241
Change-Id: If67406031276a6d958a9c3261a3c6ef51907f2c4
Diego Perez [Mon, 3 Apr 2017 17:52:17 +0000 (17:52 +0000)]
Merge "Fix broken perf tests" into oc-dev
am:
974b5b13b2
Change-Id: Ic9442beef0e2bec7db53b8e6ef1ff47dc6d12769
Jason Monk [Mon, 3 Apr 2017 17:51:00 +0000 (17:51 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev
am:
a56b6e530a
Change-Id: I43f7dafe192930ce5f3a78db5e586d62ba66a1c4
Jason Monk [Mon, 3 Apr 2017 17:49:45 +0000 (17:49 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev
am:
f244f7e1b8
Change-Id: I08a75d88e6764703d4c450b9ee5f81a824e2adc9