OSDN Git Service
Tyler Gunn [Fri, 28 Apr 2017 19:32:55 +0000 (19:32 +0000)]
Merge "Add sort order extra for phoneaccount" am:
78d3f9e1f5 am:
bd4140a945
am:
9001d22999
Change-Id: I903198c9b488bc2571f4cfba8ffd25fe15b7260d
Chen Xu [Fri, 28 Apr 2017 19:30:43 +0000 (19:30 +0000)]
Merge "Updated javadocs for sendUssd APIs." am:
763ff42a69 am:
85f2654bb7
am:
88af063701 -s ours
Change-Id: Ib01f856091f65bd6af36c1f256cc06d749b28ea4
Chen Xu [Fri, 28 Apr 2017 19:21:19 +0000 (19:21 +0000)]
Merge "Update VVM API" am:
ac29d38623 am:
fe7e5970ac
am:
21ee1e2b54 -s ours
Change-Id: I2ba1d502edfeafbf94c84f0154e0ff05b90bf6ab
Chad Brubaker [Fri, 28 Apr 2017 19:01:17 +0000 (19:01 +0000)]
Merge "Allow system apps to define ephemeral permissions" into oc-dev
am:
0ddca92018
Change-Id: Ie68abfae227db1b5a62029671ab607ac38620ce3
Chris Craik [Fri, 28 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "Add conic support for Path#approximate" into oc-dev
am:
ebd44d0076
Change-Id: I68f5924aef7526de1c801f529dd5a304a1a1d287
TreeHugger Robot [Fri, 28 Apr 2017 18:51:07 +0000 (18:51 +0000)]
Merge "Allow system apps to define ephemeral permissions" into oc-dev
Eric Laurent [Fri, 28 Apr 2017 18:51:10 +0000 (18:51 +0000)]
Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev
am:
d91cedb76d
Change-Id: I0d07b4cb37b9c35086e82bf06d55c99d47b267ad
TreeHugger Robot [Fri, 28 Apr 2017 18:47:31 +0000 (18:47 +0000)]
Merge "Add conic support for Path#approximate" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 18:43:37 +0000 (18:43 +0000)]
Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev
Dianne Hackborn [Fri, 28 Apr 2017 18:42:20 +0000 (18:42 +0000)]
Merge "Fix issue #
37714224: API Review: ACTION_NEW_VIDEO" into oc-dev
am:
9cd47a8ff2
Change-Id: I3b0c2cd18126792c6bd7e3894f8ff7753aecc078
Shane Brennan [Fri, 28 Apr 2017 18:33:03 +0000 (18:33 +0000)]
Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev
am:
8bfbb0af21
Change-Id: Iadb42396a450c70049544b967a3220db751158ed
Shane Brennan [Fri, 28 Apr 2017 18:22:22 +0000 (18:22 +0000)]
Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
am:
7eec245c62
Change-Id: I5cb8c194e5f6b233720771db8fabb0b7eef3b0b0
Jeff Sharkey [Fri, 28 Apr 2017 18:20:11 +0000 (18:20 +0000)]
Merge "Change ClipData.addItem signature" into oc-dev
am:
5b26dac2c3
Change-Id: Iefe0521f3aaa7978e3805aae326b56c426885cef
Tyler Gunn [Fri, 28 Apr 2017 18:18:11 +0000 (18:18 +0000)]
Merge "Add sort order extra for phoneaccount" am:
78d3f9e1f5
am:
bd4140a945
Change-Id: I541d0bf6c370b952e0e725960187e55ecc9e9ac7
Selim Cinek [Fri, 28 Apr 2017 18:17:22 +0000 (18:17 +0000)]
Merge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev
am:
7188fda4af
Change-Id: If501b5b534bee5b95f446fd48012c4c6a779bb10
Matthew Ng [Fri, 28 Apr 2017 18:15:17 +0000 (18:15 +0000)]
Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev
am:
ba836ad1fa
Change-Id: I34b0e717f5da0c029a8dd4d9571dc57291ec34c3
Chen Xu [Fri, 28 Apr 2017 18:12:21 +0000 (18:12 +0000)]
Merge "Updated javadocs for sendUssd APIs." am:
763ff42a69
am:
85f2654bb7
Change-Id: I5231b118c7cc0ce815b4e7f6c253a85c9d9fd929
Dianne Hackborn [Fri, 28 Apr 2017 18:10:35 +0000 (18:10 +0000)]
Merge "Fix issue #
37714224: API Review: ACTION_NEW_VIDEO" into oc-dev
Tyler Gunn [Fri, 28 Apr 2017 18:09:34 +0000 (18:09 +0000)]
Merge "Add sort order extra for phoneaccount"
am:
78d3f9e1f5
Change-Id: I7352b5c26122a2cda79687544d314c35c0a8d769
Chen Xu [Fri, 28 Apr 2017 18:04:42 +0000 (18:04 +0000)]
Merge "Update VVM API" am:
ac29d38623
am:
fe7e5970ac
Change-Id: I4f6ba7b3edd16cf63a6039b9da34db1a9c48cdec
Shane Brennan [Fri, 28 Apr 2017 18:02:39 +0000 (18:02 +0000)]
Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev
Andrew Scull [Fri, 28 Apr 2017 18:02:08 +0000 (18:02 +0000)]
Merge "Expand abbreviation in constant identifier." into oc-dev
am:
2c20a0f885
Change-Id: I2556528e6eed48196c622695c7d1e48043b5000e
Tyler Gunn [Fri, 28 Apr 2017 17:58:43 +0000 (17:58 +0000)]
Merge "Add sort order extra for phoneaccount"
Chen Xu [Fri, 28 Apr 2017 17:57:29 +0000 (17:57 +0000)]
Merge "Updated javadocs for sendUssd APIs."
am:
763ff42a69
Change-Id: I9a7fd10b652bdbc43b3a171229815f99dfbf8e97
Shane Brennan [Fri, 28 Apr 2017 17:56:50 +0000 (17:56 +0000)]
Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
Chen Xu [Fri, 28 Apr 2017 17:55:07 +0000 (17:55 +0000)]
Merge "Update VVM API"
am:
ac29d38623
Change-Id: Iec4b0f3cb89b49902aeeb7a044fbab0a98ba9e3e
Jeff Sharkey [Fri, 28 Apr 2017 17:53:09 +0000 (17:53 +0000)]
Merge "Change ClipData.addItem signature" into oc-dev
Srikanth Chintala [Mon, 27 Mar 2017 13:57:52 +0000 (19:27 +0530)]
Add sort order extra for phoneaccount
Add sort order extra for phoneaccount
which will be used while sorting
phone accounts in Telecomm
Test: Manual
Bug:
34872161
Merged-In: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
Change-Id: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
Selim Cinek [Fri, 28 Apr 2017 17:48:55 +0000 (17:48 +0000)]
Merge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev
Chris Wren [Fri, 28 Apr 2017 17:46:02 +0000 (17:46 +0000)]
Merge "expose the UID in the EventLog API" into oc-dev
am:
8ae5e04636
Change-Id: Id199e23d3024c9b137946e7802ee57e5e85281db
TreeHugger Robot [Fri, 28 Apr 2017 17:45:21 +0000 (17:45 +0000)]
Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev
Andrew Scull [Fri, 28 Apr 2017 17:41:48 +0000 (17:41 +0000)]
Merge "Expand abbreviation in constant identifier." into oc-dev
Jeff Sharkey [Fri, 28 Apr 2017 17:38:33 +0000 (17:38 +0000)]
Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
am:
4315c1e3d5
Change-Id: I8ec2d24a8b6bda9641bbb627e69521914240942f
TreeHugger Robot [Fri, 28 Apr 2017 17:28:01 +0000 (17:28 +0000)]
Merge "expose the UID in the EventLog API" into oc-dev
Jeff Sharkey [Fri, 28 Apr 2017 17:27:53 +0000 (17:27 +0000)]
Merge "Respond to API council feedback." into oc-dev
am:
77cc43e0d2
Change-Id: I0c2b86d34cfd2b2f5b94bc693657b40ecbd764fe
Chen Xu [Fri, 28 Apr 2017 17:26:11 +0000 (17:26 +0000)]
Merge "Updated javadocs for sendUssd APIs."
Chen Xu [Fri, 28 Apr 2017 17:25:53 +0000 (17:25 +0000)]
Merge "Update VVM API"
Chris Craik [Fri, 28 Apr 2017 17:23:24 +0000 (17:23 +0000)]
Merge "Make SurfaceTexture#isReleased public API" into oc-dev
am:
533538c96e
Change-Id: I03494906f51f88b3c650e3f0859bcac2148872e7
Evan Rosky [Fri, 28 Apr 2017 17:13:23 +0000 (17:13 +0000)]
Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev
am:
7666d6f967
Change-Id: Idc3a8f95bea47bad543d90e9ad18c606255e55ae
Jeff Sharkey [Fri, 28 Apr 2017 17:10:20 +0000 (17:10 +0000)]
Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 17:10:12 +0000 (17:10 +0000)]
Merge "Respond to API council feedback." into oc-dev
Chris Craik [Fri, 28 Apr 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Make SurfaceTexture#isReleased public API" into oc-dev
Evan Rosky [Fri, 28 Apr 2017 17:05:40 +0000 (17:05 +0000)]
Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev
Eric Laurent [Fri, 28 Apr 2017 01:31:22 +0000 (18:31 -0700)]
AudioService: fix missing AUDIO_BECOMING_NOISY intent
If Bluetooth service calls onBluetoothA2dpDeviceConfigChange() before
setBluetoothA2dpDeviceConnectionState(), there is a chance that the
first method fails leaving the A2DP device state disconnected in audio
policy manager while it appears as connected in AudioService causing a
failure to send the AUDIO_BECOMING_NOISY intent.
Bug:
37687852
Test: Verify AUDIO_BECOMING_NOISY intent is sent even if race
condition occurs.
Change-Id: I014d145e7da5e7d267991ffb2ff50626e71247eb
Felipe Leme [Fri, 28 Apr 2017 15:55:58 +0000 (15:55 +0000)]
Merge "Improved Autofill logging." into oc-dev
am:
2d5c0d89e5
Change-Id: I222ecf081d1d841350191fcfe36aa457fdbeb305
TreeHugger Robot [Fri, 28 Apr 2017 15:50:26 +0000 (15:50 +0000)]
Merge "Improved Autofill logging." into oc-dev
Chris Wren [Thu, 27 Apr 2017 20:56:54 +0000 (16:56 -0400)]
expose the UID in the EventLog API
Bug:
32806111
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Change-Id: I16800a33bc6d4d37b3addd71b675fd760bd5d7b8
Martijn Coenen [Fri, 28 Apr 2017 15:10:39 +0000 (15:10 +0000)]
Merge "Validate incoming data properly." am:
5718b01b9a am:
4fcfe05707
am:
5aaf5543e4
Change-Id: I841e1f420a3e5f37839aa840fa7a88de6257772a
Julia Reynolds [Fri, 28 Apr 2017 14:54:41 +0000 (14:54 +0000)]
Merge "Default number badging off." into oc-dev
am:
076a255a76
Change-Id: I6c6b6f7107467009608f5695b4a374f1bdc4959b
Julia Reynolds [Fri, 28 Apr 2017 14:47:56 +0000 (14:47 +0000)]
Merge "Default number badging off." into oc-dev
Martijn Coenen [Fri, 28 Apr 2017 14:44:47 +0000 (14:44 +0000)]
Merge "Validate incoming data properly." am:
5718b01b9a
am:
4fcfe05707
Change-Id: I129a3e6c1b401448c075cd63c5396914bfb67fd7
Julia Reynolds [Thu, 27 Apr 2017 14:12:50 +0000 (10:12 -0400)]
Default number badging off.
Test: cts
Bug:
37737008
Change-Id: I5f73a648936d18c59c74334083b33e131395a681
Martijn Coenen [Fri, 28 Apr 2017 14:38:26 +0000 (14:38 +0000)]
Merge "Validate incoming data properly."
am:
5718b01b9a
Change-Id: I6b2badb1b075c1eb8d8e9d1e25397fc41ab1aae3
Jorim Jaggi [Fri, 28 Apr 2017 14:34:21 +0000 (14:34 +0000)]
Merge "Workaround an interpreter behavior to fix leak" into oc-dev
am:
745c6e02c6
Change-Id: I487fb7438edb7697a65e5abc695f32332f0567b1
Martijn Coenen [Fri, 28 Apr 2017 14:32:54 +0000 (14:32 +0000)]
Merge "Validate incoming data properly."
TreeHugger Robot [Fri, 28 Apr 2017 14:29:06 +0000 (14:29 +0000)]
Merge "Workaround an interpreter behavior to fix leak" into oc-dev
Pavel Grafov [Fri, 28 Apr 2017 14:23:42 +0000 (14:23 +0000)]
Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev
am:
90357d62e9
Change-Id: I925165817781c3b0f4e37afe8ebcce1ac264d775
Pavel Grafov [Fri, 28 Apr 2017 14:15:53 +0000 (14:15 +0000)]
Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev
Kirill Grouchnikov [Fri, 28 Apr 2017 14:01:21 +0000 (14:01 +0000)]
Merge "Tweak initialization order of LinearLayout's dividers" into oc-dev
am:
b07544cf69
Change-Id: Icd96ecd6bc49c7c228a74e5322f79fc1ae4f42bc
Kirill Grouchnikov [Fri, 28 Apr 2017 13:56:22 +0000 (13:56 +0000)]
Merge "Tweak initialization order of LinearLayout's dividers" into oc-dev
Felipe Leme [Thu, 27 Apr 2017 20:56:22 +0000 (13:56 -0700)]
Improved Autofill logging.
- Removed ui.Helper.
- Replaced DEBUG and VERBOSE constants by sDebug and sVerbose.
- Added a shell command to dynamically set the constants.
- Removed obsoleted log statements.
- Changed log-level of some log entries.
- Removed unused methods.
Fixes:
36141126
Test: CtsAutoFillServiceTestCases pass
Test: manual verification
Change-Id: Ic08ee9a2adc10e63f49bbcc7ed126455462dc9c1
Julia Reynolds [Fri, 28 Apr 2017 13:56:17 +0000 (13:56 +0000)]
Merge "Documentation updates" into oc-dev
am:
b8d4a94867
Change-Id: I085ba39281dd30b127d41ea260c16b66c2b123ad
Geoffrey Pitsch [Fri, 28 Apr 2017 13:50:01 +0000 (13:50 +0000)]
Merge "Fix notification text not wrapping and clipping switch." into oc-dev
am:
b05beffabc
Change-Id: Ie931c61a94a9680c75fa739a16d6b2da7e072686
Julia Reynolds [Fri, 28 Apr 2017 13:44:04 +0000 (13:44 +0000)]
Merge "Documentation updates" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 13:40:53 +0000 (13:40 +0000)]
Merge "Fix notification text not wrapping and clipping switch." into oc-dev
Jorim Jaggi [Thu, 27 Apr 2017 15:44:00 +0000 (17:44 +0200)]
Workaround an interpreter behavior to fix leak
When a local variable (cachedThumbnailData) gets out of scope,
the interpreter might still keep a reference to it in the
register. Thus, we extract the handling of this local variable
into a method such that it gets removed from the register.
Test: Open recents, go home, take dump, make sure no reference
from HandlerThread to ThumbnailData is still existing.
Fixes:
37630958
Change-Id: If25456b212341be7a66882a0adfd5afb4a64ce23
Andrew Scull [Tue, 25 Apr 2017 13:44:24 +0000 (14:44 +0100)]
Expand abbreviation in constant identifier.
The abbreviation is not in common use. Also remove FBE from
documentation as it also isn't used elsewhere.
Test: Build success
Bug:
37621349
Change-Id: Icf19be5e96e71dcd45aa7cac8f58b05b6d77d02b
Erik Kline [Fri, 28 Apr 2017 09:57:31 +0000 (09:57 +0000)]
Merge "Notify WifiManager of interface state changes" into oc-dev
am:
0c21500920
Change-Id: I2f8903b593a0ce0a0d91b98c19c58a1a6feea748
Jaekyun Seok [Fri, 28 Apr 2017 09:55:01 +0000 (09:55 +0000)]
Merge "Apply static RRO when parsing Android manifest of a target package" into oc-dev
am:
dc326a883e
Change-Id: I7803a75b0c0a863e5491b3faa3a03c03f46036e8
TreeHugger Robot [Fri, 28 Apr 2017 09:49:41 +0000 (09:49 +0000)]
Merge "Notify WifiManager of interface state changes" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 09:48:45 +0000 (09:48 +0000)]
Merge "Apply static RRO when parsing Android manifest of a target package" into oc-dev
Felipe Leme [Fri, 28 Apr 2017 09:32:24 +0000 (09:32 +0000)]
Merge "Refactored Autofill to move starting flag out of Session." into oc-dev
am:
b63d261f9c
Change-Id: Icf8f2b15b932acfe45fe48ec1b79307280957a12
TreeHugger Robot [Fri, 28 Apr 2017 09:24:59 +0000 (09:24 +0000)]
Merge "Refactored Autofill to move starting flag out of Session." into oc-dev
Narayan Kamath [Fri, 28 Apr 2017 08:48:28 +0000 (08:48 +0000)]
Merge "AppErrors: Refine notion of "interesting" processes for b/g ANRs." into oc-dev
am:
048306f318
Change-Id: Ia8bf43396ca91d2f26ad21933988f665fa2204ca
Narayan Kamath [Fri, 28 Apr 2017 08:42:34 +0000 (08:42 +0000)]
Merge "AppErrors: Refine notion of "interesting" processes for b/g ANRs." into oc-dev
Erik Kline [Fri, 28 Apr 2017 08:16:11 +0000 (08:16 +0000)]
Merge "Notify WifiManager of interface state changes" am:
8e97274186 am:
241a7f15f2
am:
2439781719
Change-Id: I5b3f640f4dd5cfac7555ddf1f6ae752899caddb0
Erik Kline [Fri, 28 Apr 2017 08:11:04 +0000 (08:11 +0000)]
Merge "Notify WifiManager of interface state changes" am:
8e97274186
am:
241a7f15f2
Change-Id: I4360a558181624004a88074da92b3bbf202a6a18
Erik Kline [Fri, 28 Apr 2017 08:04:31 +0000 (08:04 +0000)]
Merge "Notify WifiManager of interface state changes"
am:
8e97274186
Change-Id: I6e9594805f9f55da53cf29e322829b1d2ff2f058
Treehugger Robot [Fri, 28 Apr 2017 07:55:47 +0000 (07:55 +0000)]
Merge "Notify WifiManager of interface state changes"
Erik Kline [Thu, 27 Apr 2017 11:57:23 +0000 (20:57 +0900)]
Notify WifiManager of interface state changes
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
(except for an unrelated IpConnectivityMetricsTest error)
Bug:
31466854
Bug:
32163131
Change-Id: I702ea79eb2c02604761e4e1ebcd5f9e445178efb
Jaekyun Seok [Tue, 11 Apr 2017 00:41:11 +0000 (09:41 +0900)]
Apply static RRO when parsing Android manifest of a target package
This CL creates idmaps for static RROs right before parsing a target
package. Those idmaps will be used to parse correctly the Android
manifest of the target package.
Later, OverlayManagerService will update each idmap with the correct
gid from the target package app id.
Note that the idmaps generated here will be used by OverlayManagerService
as well until they are outdated (http://ag/
2127839).
Additionally a target package should be parsed again if its overlays are
updated to apply the changes.
Test: building succeeded and tested with sailfish-userdebug.
Bug:
37179531
Change-Id: Ie0d5e92ae6e06b2d377ebd4cfdb0a8519b49a944
Felipe Leme [Fri, 28 Apr 2017 06:48:47 +0000 (06:48 +0000)]
Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev
am:
3dfd827574
Change-Id: I9e8a9b81c890eb08bb089faaa1c3b3bd9fc9893f
TreeHugger Robot [Fri, 28 Apr 2017 06:42:17 +0000 (06:42 +0000)]
Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev
Svetoslav Ganov [Fri, 28 Apr 2017 06:41:40 +0000 (06:41 +0000)]
Merge "Implement the rest of autofill importance modes" into oc-dev
am:
70c0221813
Change-Id: I5c03a2cde466a87b6f8067838b411319ba907fb2
Felipe Leme [Wed, 26 Apr 2017 19:36:01 +0000 (12:36 -0700)]
Refactored Autofill to move starting flag out of Session.
Otherwise, all onFillRequest() calls in the same partition would use
the same flags.
Fixes:
37675138
Test: existing CtsAutoFillServiceTestCases pass
Test: CtsAssistTestCases pass
Test: PartitionedActivityTest.testAutofill4ParitionsMixManualAndAuto() pass
Change-Id: I03c8a036637bae534904d4f41265e451088cf940
Svetoslav Ganov [Fri, 28 Apr 2017 06:35:05 +0000 (06:35 +0000)]
Merge "Force autofill on overflow only if empty" into oc-dev
am:
64cf2bb19b
Change-Id: Idbc5b0b7414e5537bb4f734cef439c2ebf449324
Svetoslav Ganov [Fri, 28 Apr 2017 06:29:58 +0000 (06:29 +0000)]
Merge "Implement the rest of autofill importance modes" into oc-dev
Svetoslav Ganov [Fri, 28 Apr 2017 06:29:19 +0000 (06:29 +0000)]
Merge "Force autofill on overflow only if empty" into oc-dev
Daichi Hirono [Fri, 28 Apr 2017 05:53:19 +0000 (14:53 +0900)]
@hide non-Handler variant of SM.openProxyFileDescriptor
Bug:
37749462
Test: Build succeeded
Change-Id: I2e3d0cf9e219353eae4dae384c93d99b9ef60ea9
Felipe Leme [Thu, 27 Apr 2017 22:24:19 +0000 (15:24 -0700)]
Changed HtmlInfo.getAttributes() to return List instead of ArrayList
Fixes:
37747396
Test: CtsAutoFillServiceTestCases pass
Change-Id: Ief53e6d71805f561577b73e57a9d36bc3769862a
Erik Kline [Thu, 27 Apr 2017 11:57:23 +0000 (20:57 +0900)]
Notify WifiManager of interface state changes
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
(except for an unrelated IpConnectivityMetricsTest error)
Bug:
31466854
Bug:
32163131
Change-Id: I702ea79eb2c02604761e4e1ebcd5f9e445178efb
Lorenzo Colitti [Fri, 28 Apr 2017 04:04:21 +0000 (04:04 +0000)]
Merge "Address ConnectivityManager API comments." into oc-dev
am:
ce8eae73af
Change-Id: I7024b4fe23ab12760fb452a59929df886912b104
Lorenzo Colitti [Fri, 28 Apr 2017 03:58:06 +0000 (03:58 +0000)]
Merge "Address ConnectivityManager API comments." into oc-dev
Phil Weaver [Fri, 28 Apr 2017 03:52:30 +0000 (03:52 +0000)]
Merge "Rename FingerprintGestureCallback.onGesture" into oc-dev
am:
cfbe105e4b
Change-Id: Iedaa4a9f6969cb6f935ee652404669827842e88b
Casey Burkhardt [Fri, 28 Apr 2017 03:50:26 +0000 (03:50 +0000)]
Merge "@NonNull on AccessibilityButtonController methods" into oc-dev
am:
4b426d799f
Change-Id: Ie04d4fe17cc1af92eab5768561d4eff4b7b7408b
Kevin Chyn [Fri, 28 Apr 2017 03:48:08 +0000 (03:48 +0000)]
Merge "FP won't wake device if daemon dies" into oc-dev
am:
e3d3ffcb19
Change-Id: I66737d8a07f8147a5929559f79cfa6d8a4780881
TreeHugger Robot [Fri, 28 Apr 2017 03:41:57 +0000 (03:41 +0000)]
Merge "Rename FingerprintGestureCallback.onGesture" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 03:41:29 +0000 (03:41 +0000)]
Merge "@NonNull on AccessibilityButtonController methods" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 03:40:38 +0000 (03:40 +0000)]
Merge "FP won't wake device if daemon dies" into oc-dev
Jean-Michel Trivi [Fri, 28 Apr 2017 03:35:13 +0000 (03:35 +0000)]
Merge "AudioService: unmute media on connection of new audio accessory" into oc-dev
am:
97c1d58ea4
Change-Id: Idef1ca709a88bace5fbee47f4e4910e96139ae65