OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev am: d91cedb76d
Eric Laurent [Fri, 28 Apr 2017 19:07:29 +0000 (19:07 +0000)]
Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev am: d91cedb76d
am: 82c6833c51

Change-Id: I7c56552a093b8181241dc05584a0e756241921ca

7 years agoMerge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev am: 9cd47a8ff2
Dianne Hackborn [Fri, 28 Apr 2017 18:56:44 +0000 (18:56 +0000)]
Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev am: 9cd47a8ff2
am: a0f1fb6b06

Change-Id: Id761a81dd6127f2a1bd05f2e392d8867d7e86e1c

7 years agoMerge "Fix bug in translating the outline of a notification."
TreeHugger Robot [Fri, 28 Apr 2017 18:52:42 +0000 (18:52 +0000)]
Merge "Fix bug in translating the outline of a notification."

7 years agoMerge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" 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

7 years agoMerge "Updating docs for RemoteInput non-textual inputs per API review request."...
Shane Brennan [Fri, 28 Apr 2017 18:46:33 +0000 (18:46 +0000)]
Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev am: 8bfbb0af21
am: 1a0e5ac3cc

Change-Id: I41d8507a7098423719020facf4d33216a442d8f2

7 years agoMerge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev am...
Shane Brennan [Fri, 28 Apr 2017 18:44:34 +0000 (18:44 +0000)]
Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev am: 7eec245c62
am: 3ea6d1931d

Change-Id: I0bf694b905d19e64a98ee4659f4f494be04eb922

7 years agoMerge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" 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

7 years agoMerge "Change ClipData.addItem signature" into oc-dev am: 5b26dac2c3
Jeff Sharkey [Fri, 28 Apr 2017 18:42:27 +0000 (18:42 +0000)]
Merge "Change ClipData.addItem signature" into oc-dev am: 5b26dac2c3
am: bd3fa3c72c

Change-Id: I475d9eca8667005959c5578548b622ed7460b2b0

7 years agoMerge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" 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

7 years agoMerge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev...
Selim Cinek [Fri, 28 Apr 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev am: 7188fda4af
am: bf0a784423

Change-Id: I61c6e1e694e9d9168f8398092dba53e4391d6f02

7 years agoMerge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)"...
Matthew Ng [Fri, 28 Apr 2017 18:33:54 +0000 (18:33 +0000)]
Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev am: ba836ad1fa
am: ed6e67388e

Change-Id: Iaad787457b787dbbdc984aaf7009895c4c6d3091

7 years agoMerge "Updating docs for RemoteInput non-textual inputs per API review request."...
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

7 years agoMerge "Expand abbreviation in constant identifier." into oc-dev am: 2c20a0f885
Andrew Scull [Fri, 28 Apr 2017 18:25:23 +0000 (18:25 +0000)]
Merge "Expand abbreviation in constant identifier." into oc-dev am: 2c20a0f885
am: 7d32c0bd04

Change-Id: I435db9c38e42cb0d2dbf82441470e45dc37728cc

7 years agoMerge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
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

7 years agoMerge "Change ClipData.addItem signature" into oc-dev
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

7 years agoMerge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev
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

7 years agoMerge "Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636 am:...
Android Build Merger (Role) [Fri, 28 Apr 2017 18:15:51 +0000 (18:15 +0000)]
Merge "Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636 am: 21abf1cd20"

7 years agoMerge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)"...
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

7 years agoMerge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev
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

7 years agoMerge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636
Chris Wren [Fri, 28 Apr 2017 18:02:57 +0000 (18:02 +0000)]
Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636
am: 21abf1cd20

Change-Id: Id1ccf3fa7a50f276003e98cfebee1407e0fa4090

7 years agoMerge "Updating docs for RemoteInput non-textual inputs per API review request."...
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

7 years agoMerge "USB audio: increase protection of member fields"
Glenn Kasten [Fri, 28 Apr 2017 18:02:30 +0000 (18:02 +0000)]
Merge "USB audio: increase protection of member fields"

7 years agoMerge "Expand abbreviation in constant identifier." 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

7 years agoMerge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
Shane Brennan [Fri, 28 Apr 2017 17:56:50 +0000 (17:56 +0000)]
Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev

7 years agoMerge "Change ClipData.addItem signature" into oc-dev
Jeff Sharkey [Fri, 28 Apr 2017 17:53:09 +0000 (17:53 +0000)]
Merge "Change ClipData.addItem signature" into oc-dev

7 years agoMerge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev am: 4315c...
Jeff Sharkey [Fri, 28 Apr 2017 17:51:04 +0000 (17:51 +0000)]
Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev am: 4315c1e3d5
am: 1737e50fa1

Change-Id: I92766efee7b312e9dd09bc7fcac42850f457a5e9

7 years agoMerge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev
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

7 years agoMerge "Respond to API council feedback." into oc-dev am: 77cc43e0d2
Jeff Sharkey [Fri, 28 Apr 2017 17:48:26 +0000 (17:48 +0000)]
Merge "Respond to API council feedback." into oc-dev am: 77cc43e0d2
am: 86e27f65f8

Change-Id: I7933a8ba6858d38423b29a52dfc5f9f65c641faf

7 years agoMerge "expose the UID in the EventLog API" 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

7 years agoMerge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)"...
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

7 years agoMerge "Expand abbreviation in constant identifier." 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

7 years agoMerge "@hide non-Handler variant of SM.openProxyFileDescriptor" 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

7 years agoMerge "Make SurfaceTexture#isReleased public API" into oc-dev am: 533538c96e
Chris Craik [Fri, 28 Apr 2017 17:32:16 +0000 (17:32 +0000)]
Merge "Make SurfaceTexture#isReleased public API" into oc-dev am: 533538c96e
am: 7b026d8aa4

Change-Id: Ia6d5b4179881c20f30a4de3b3e2efde38bfa4c23

7 years agoMerge "expose the UID in the EventLog API" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 17:28:01 +0000 (17:28 +0000)]
Merge "expose the UID in the EventLog API" into oc-dev

7 years agoMerge "Respond to API council feedback." 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

7 years agoMerge "Prepend shared libraries in their original order."
Jeff Hao [Fri, 28 Apr 2017 17:27:01 +0000 (17:27 +0000)]
Merge "Prepend shared libraries in their original order."

7 years agoMerge "Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev am...
Android Build Merger (Role) [Fri, 28 Apr 2017 17:24:49 +0000 (17:24 +0000)]
Merge "Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev am: 7666d6f967 am: adcc61d65f"

7 years agoMerge "Make SurfaceTexture#isReleased public API" into oc-dev
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

7 years agoMerge "Extend extension support"
Jason Monk [Fri, 28 Apr 2017 17:21:39 +0000 (17:21 +0000)]
Merge "Extend extension support"

7 years agoMerge "removeAllViews should also clean-up focusedInCluster" into oc-dev am: 7666d6f967
Evan Rosky [Fri, 28 Apr 2017 17:19:38 +0000 (17:19 +0000)]
Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev am: 7666d6f967
am: adcc61d65f

Change-Id: I91829dceceaf3d2a273f43d9f1d7732cd30b8ff4

7 years agoMerge "removeAllViews should also clean-up focusedInCluster" into oc-dev
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

7 years agoMerge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
Jeff Sharkey [Fri, 28 Apr 2017 17:10:20 +0000 (17:10 +0000)]
Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev

7 years agoMerge "Respond to API council feedback." 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

7 years agoMerge "Make SurfaceTexture#isReleased public API" 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

7 years agoMerge "removeAllViews should also clean-up focusedInCluster" 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

7 years agoAudioService: fix missing AUDIO_BECOMING_NOISY intent
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

7 years agoMerge "Clarify DISALLOW_BLUETOOTH_SHARING javadoc."
Pavel Grafov [Fri, 28 Apr 2017 16:30:17 +0000 (16:30 +0000)]
Merge "Clarify DISALLOW_BLUETOOTH_SHARING javadoc."

7 years agoMerge "Another round of code deduplication."
TreeHugger Robot [Fri, 28 Apr 2017 16:27:56 +0000 (16:27 +0000)]
Merge "Another round of code deduplication."

7 years agoUSB audio: increase protection of member fields
Glenn Kasten [Mon, 13 Mar 2017 16:20:48 +0000 (09:20 -0700)]
USB audio: increase protection of member fields

Replace public by private or package access in field declarations,
and add getters and setters as needed.

Test: compiles OK
Change-Id: Ief3fffb6a21d2e4d05153839f444617ea5e70846

7 years agoMerge "Improved Autofill logging." into oc-dev am: 2d5c0d89e5
Felipe Leme [Fri, 28 Apr 2017 16:02:56 +0000 (16:02 +0000)]
Merge "Improved Autofill logging." into oc-dev am: 2d5c0d89e5
am: eb9a99c3d4

Change-Id: Iefa99c2578934ba959d075e5b620d9cc81df668c

7 years agoMerge "Improved Autofill logging." into oc-dev
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

7 years agoMerge "Improved Autofill logging." into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 15:50:26 +0000 (15:50 +0000)]
Merge "Improved Autofill logging." into oc-dev

7 years agoexpose the UID in the EventLog API
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

7 years agoMerge "Validate incoming data properly." am: 5718b01b9a am: 4fcfe05707 am: 5aaf5543e4
Martijn Coenen [Fri, 28 Apr 2017 15:17:19 +0000 (15:17 +0000)]
Merge "Validate incoming data properly." am: 5718b01b9a am: 4fcfe05707 am: 5aaf5543e4
am: ede868c0f8

Change-Id: I62b18ba9604dc2e5f020d64775b43d9cbc7efec5

7 years agoExtend extension support
Jason Monk [Thu, 27 Apr 2017 20:58:49 +0000 (16:58 -0400)]
Extend extension support

 - Add support for ui mode type selection
 - Convert plugin fragment listener over to extensions to be more
   versatile
 - Add tests

Test: runtest systemui
Change-Id: Id5f28aa14b16e5a12df0434c9792bce551011efb

7 years agoMerge "Validate incoming data properly." am: 5718b01b9a am: 4fcfe05707
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

7 years agoMerge "Default number badging off." into oc-dev am: 076a255a76
Julia Reynolds [Fri, 28 Apr 2017 15:03:09 +0000 (15:03 +0000)]
Merge "Default number badging off." into oc-dev am: 076a255a76
am: 9b0ce863d3

Change-Id: If75d5012b1d2a3d8a9d7928d885b92f73f783c2e

7 years agoMerge "Default number badging off." into oc-dev
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

7 years agoMerge "Add sort order extra for phoneaccount"
Tyler Gunn [Fri, 28 Apr 2017 14:53:33 +0000 (14:53 +0000)]
Merge "Add sort order extra for phoneaccount"

7 years agoMerge "Default number badging off." into oc-dev
Julia Reynolds [Fri, 28 Apr 2017 14:47:56 +0000 (14:47 +0000)]
Merge "Default number badging off." into oc-dev

7 years agoAnother round of code deduplication.
Artem Iglikov [Thu, 27 Apr 2017 13:05:41 +0000 (14:05 +0100)]
Another round of code deduplication.

Moved more common classes and methods to utilities (automated).
Prepared for deduplication of restoreOneFile() method.

Bug: 37519282
Test: gts
Change-Id: Ibc3de8f7c6675f64c636aafe51a885cfbd162e3a

7 years agoMerge "Validate incoming data properly." am: 5718b01b9a
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

7 years agoDefault number badging off.
Julia Reynolds [Thu, 27 Apr 2017 14:12:50 +0000 (10:12 -0400)]
Default number badging off.

Test: cts
Bug: 37737008
Change-Id: I5f73a648936d18c59c74334083b33e131395a681

7 years agoClarify DISALLOW_BLUETOOTH_SHARING javadoc.
Pavel Grafov [Fri, 28 Apr 2017 14:41:32 +0000 (15:41 +0100)]
Clarify DISALLOW_BLUETOOTH_SHARING javadoc.

Test: nothing to test.
Bug: 36249732
Change-Id: I3bf44acb8d5d10073bcbccbc5a3c412a08426b8f

7 years agoMerge "Workaround an interpreter behavior to fix leak" into oc-dev am: 745c6e02c6
Jorim Jaggi [Fri, 28 Apr 2017 14:39:22 +0000 (14:39 +0000)]
Merge "Workaround an interpreter behavior to fix leak" into oc-dev am: 745c6e02c6
am: 5067b8565e

Change-Id: Iae41224ff10a7a8a0d6f41d8a9ae63ba4261978d

7 years agoMerge "Validate incoming data properly."
Martijn Coenen [Fri, 28 Apr 2017 14:38:26 +0000 (14:38 +0000)]
Merge "Validate incoming data properly."
am: 5718b01b9a

Change-Id: I6b2badb1b075c1eb8d8e9d1e25397fc41ab1aae3

7 years agoMerge "Workaround an interpreter behavior to fix leak" into oc-dev
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

7 years agoMerge "Validate incoming data properly."
Martijn Coenen [Fri, 28 Apr 2017 14:32:54 +0000 (14:32 +0000)]
Merge "Validate incoming data properly."

7 years agoMerge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev am: 90357d62e9
Pavel Grafov [Fri, 28 Apr 2017 14:32:34 +0000 (14:32 +0000)]
Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev am: 90357d62e9
am: 776158ba4f  -s ours

Change-Id: I8c99244bf2beffa6e9ba2c0566c004d540d54ae9

7 years agoMerge "Workaround an interpreter behavior to fix leak" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 14:29:06 +0000 (14:29 +0000)]
Merge "Workaround an interpreter behavior to fix leak" into oc-dev

7 years agoMerge "Introduce DISALLOW_BLUETOOTH_SHARING." 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

7 years agoMerge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev
Pavel Grafov [Fri, 28 Apr 2017 14:15:53 +0000 (14:15 +0000)]
Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev

7 years agoMerge "Tweak initialization order of LinearLayout's dividers" into oc-dev am: b07544cf69
Kirill Grouchnikov [Fri, 28 Apr 2017 14:07:20 +0000 (14:07 +0000)]
Merge "Tweak initialization order of LinearLayout's dividers" into oc-dev am: b07544cf69
am: 38b5610779

Change-Id: I37bbff45bd309ce847f2797cb0ea96f114e81dad

7 years agoMerge "Documentation updates" into oc-dev am: b8d4a94867
Julia Reynolds [Fri, 28 Apr 2017 14:01:53 +0000 (14:01 +0000)]
Merge "Documentation updates" into oc-dev am: b8d4a94867
am: 9b4511c643

Change-Id: Ib8d4c116d548b55f395e977ab76bc1f85d9791ba

7 years agoMerge "Tweak initialization order of LinearLayout's dividers" 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

7 years agoMerge "Tweak initialization order of LinearLayout's dividers" into oc-dev
Kirill Grouchnikov [Fri, 28 Apr 2017 13:56:22 +0000 (13:56 +0000)]
Merge "Tweak initialization order of LinearLayout's dividers" into oc-dev

7 years agoImproved Autofill logging.
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

7 years agoMerge "Documentation updates" into oc-dev
Julia Reynolds [Fri, 28 Apr 2017 13:56:17 +0000 (13:56 +0000)]
Merge "Documentation updates" into oc-dev
am: b8d4a94867

Change-Id: I085ba39281dd30b127d41ea260c16b66c2b123ad

7 years agoMerge "Fix notification text not wrapping and clipping switch." into oc-dev am: b05be...
Geoffrey Pitsch [Fri, 28 Apr 2017 13:56:16 +0000 (13:56 +0000)]
Merge "Fix notification text not wrapping and clipping switch." into oc-dev am: b05beffabc
am: 1838ed0e85

Change-Id: I236a9b3fd8fee09981e2bb65d75f63cc290b9475

7 years agoMerge "Fix notification text not wrapping and clipping switch." into oc-dev
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

7 years agoMerge "Documentation updates" into oc-dev
Julia Reynolds [Fri, 28 Apr 2017 13:44:04 +0000 (13:44 +0000)]
Merge "Documentation updates" into oc-dev

7 years agoMerge "Fix notification text not wrapping and clipping switch." 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

7 years agoWorkaround an interpreter behavior to fix leak
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

7 years agoExpand abbreviation in constant identifier.
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

7 years agoMerge "Notify WifiManager of interface state changes" into oc-dev am: 0c21500920
Erik Kline [Fri, 28 Apr 2017 10:04:04 +0000 (10:04 +0000)]
Merge "Notify WifiManager of interface state changes" into oc-dev am: 0c21500920
am: e41d09cad0

Change-Id: Ic5f5006d7106fe9c3032a304b6d67804ca0d45d0

7 years agoMerge "Apply static RRO when parsing Android manifest of a target package" into oc...
Jaekyun Seok [Fri, 28 Apr 2017 10:02:11 +0000 (10:02 +0000)]
Merge "Apply static RRO when parsing Android manifest of a target package" into oc-dev am: dc326a883e
am: 1a4bcd04ee

Change-Id: I342faf8a6486f3b6dfdf42047e90ae11671b58e5

7 years agoMerge "Notify WifiManager of interface state changes" into oc-dev
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

7 years agoMerge "Apply static RRO when parsing Android manifest of a target package" into oc-dev
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

7 years agoMerge "Notify WifiManager of interface state changes" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 09:49:41 +0000 (09:49 +0000)]
Merge "Notify WifiManager of interface state changes" into oc-dev

7 years agoMerge "Apply static RRO when parsing Android manifest of a target package" 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

7 years agoMerge "Refactored Autofill to move starting flag out of Session." into oc-dev am...
Felipe Leme [Fri, 28 Apr 2017 09:41:57 +0000 (09:41 +0000)]
Merge "Refactored Autofill to move starting flag out of Session." into oc-dev am: b63d261f9c
am: f966d48f66

Change-Id: I2d7d5a8eb571ceb093f26d3f9805917b201167f7

7 years agoMerge "Refactored Autofill to move starting flag out of Session." 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

7 years agoMerge "Refactored Autofill to move starting flag out of Session." into oc-dev
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

7 years agoMerge "AppErrors: Refine notion of "interesting" processes for b/g ANRs." into oc...
Narayan Kamath [Fri, 28 Apr 2017 08:55:02 +0000 (08:55 +0000)]
Merge "AppErrors: Refine notion of "interesting" processes for b/g ANRs." into oc-dev am: 048306f318
am: 8d6236be81

Change-Id: I7258fb2a68e47bf0cbf610ccd74d99cc0d190686

7 years agoMerge "AppErrors: Refine notion of "interesting" processes for b/g ANRs." 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

7 years agoMerge "AppErrors: Refine notion of "interesting" processes for b/g ANRs." into oc-dev
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

7 years agoMerge "Notify WifiManager of interface state changes" am: 8e97274186 am: 241a7f15f2...
Erik Kline [Fri, 28 Apr 2017 08:20:59 +0000 (08:20 +0000)]
Merge "Notify WifiManager of interface state changes" am: 8e97274186 am: 241a7f15f2 am: 2439781719
am: 45cb5e37b0

Change-Id: Ic7b9bdb9f503e8a34db3ee1ccab6cb3ed24956df

7 years agoMerge "Notify WifiManager of interface state changes" am: 8e97274186 am: 241a7f15f2
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

7 years agoMerge "Notify WifiManager of interface state changes" am: 8e97274186
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

7 years agoMerge "Notify WifiManager of interface state changes"
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