OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge changes I7e9aea3c,I2d23aabf
TreeHugger Robot [Thu, 9 Mar 2017 16:32:09 +0000 (16:32 +0000)]
Merge changes I7e9aea3c,I2d23aabf

* changes:
  Remove content description from QS pages
  Fix random clicks in QS

7 years agoMerge "USB audio: Use 'final' where possible"
Glenn Kasten [Thu, 9 Mar 2017 16:22:30 +0000 (16:22 +0000)]
Merge "USB audio: Use 'final' where possible"

7 years agoMerge "Comment out unused methods"
Glenn Kasten [Thu, 9 Mar 2017 16:22:11 +0000 (16:22 +0000)]
Merge "Comment out unused methods"

7 years agoMerge "Fix typo in log"
Glenn Kasten [Thu, 9 Mar 2017 16:21:41 +0000 (16:21 +0000)]
Merge "Fix typo in log"

7 years agoDO NOT MERGE Change permissions review mode check. am: 59bd89fa29 am: 97e12736ce
Paul Navin [Thu, 9 Mar 2017 15:57:43 +0000 (15:57 +0000)]
DO NOT MERGE Change permissions review mode check. am: 59bd89fa29 am: 97e12736ce
am: 501c3d1005  -s ours

Change-Id: I6bc9969659e5de514c2e2fcbb6bb0de9d96a8090

7 years agoDO NOT MERGE Change permissions review mode check. am: 59bd89fa29
Paul Navin [Thu, 9 Mar 2017 15:52:17 +0000 (15:52 +0000)]
DO NOT MERGE Change permissions review mode check. am: 59bd89fa29
am: 97e12736ce

Change-Id: Ib273a125444db99305bdf84eaf2c98ceb2ff5717

7 years agoDO NOT MERGE Change permissions review mode check.
Paul Navin [Thu, 9 Mar 2017 15:46:12 +0000 (15:46 +0000)]
DO NOT MERGE Change permissions review mode check.
am: 59bd89fa29

Change-Id: Icf3fa8e171d68e6878001529a496875f52f38909

7 years agoDO NOT MERGE Change permissions review mode check.
Paul Navin [Mon, 13 Feb 2017 18:33:33 +0000 (18:33 +0000)]
DO NOT MERGE Change permissions review mode check.

In ag/1835531 we introduced a check for permissions review mode,
that relies on an overlay resource. Since we can't use overlay
resources for the Unified Build, this CL temporarily introduces
the checking for a build property as well. This possibly won't work
for O/G, but will work for the Feldspar release of the Unified build.

BUG: 35028846
Change-Id: I4c82f242bc680028ecd872589552534a419f0152

7 years agoMerge "A11y updates for new a11y stream."
Julia Reynolds [Thu, 9 Mar 2017 15:23:23 +0000 (15:23 +0000)]
Merge "A11y updates for new a11y stream."

7 years agoMerge "Fix stale data due to stopped loader."
TreeHugger Robot [Thu, 9 Mar 2017 15:13:04 +0000 (15:13 +0000)]
Merge "Fix stale data due to stopped loader."

7 years agoMerge "IP connectivity metrics: update ipconnectivity.proto"
Hugo Benichi [Thu, 9 Mar 2017 14:20:54 +0000 (14:20 +0000)]
Merge "IP connectivity metrics: update ipconnectivity.proto"

7 years agoMerge "switch to new SkPathEffect factories for Compose and Sum"
TreeHugger Robot [Thu, 9 Mar 2017 12:29:10 +0000 (12:29 +0000)]
Merge "switch to new SkPathEffect factories for Compose and Sum"

7 years agoMerge "MathUtils: Remove static Random field."
Narayan Kamath [Thu, 9 Mar 2017 11:13:35 +0000 (11:13 +0000)]
Merge "MathUtils: Remove static Random field."

7 years agoMerge "CaptivePortalLoginActivity correctly gets UserAgent" am: 4903487fd9 am: 43961ee6ae
Hugo Benichi [Thu, 9 Mar 2017 10:23:36 +0000 (10:23 +0000)]
Merge "CaptivePortalLoginActivity correctly gets UserAgent" am: 4903487fd9 am: 43961ee6ae
am: 4f9e934c5f

Change-Id: I234d55c758c7538717d27035fdc8864a8650d75c

7 years agoMerge "CaptivePortalLoginActivity correctly gets UserAgent" am: 4903487fd9
Hugo Benichi [Thu, 9 Mar 2017 10:17:23 +0000 (10:17 +0000)]
Merge "CaptivePortalLoginActivity correctly gets UserAgent" am: 4903487fd9
am: 43961ee6ae

Change-Id: I8f43e7868ce43e6d1837900cfd131f556832f1a8

7 years agoMerge "CaptivePortalLoginActivity correctly gets UserAgent"
Hugo Benichi [Thu, 9 Mar 2017 10:11:55 +0000 (10:11 +0000)]
Merge "CaptivePortalLoginActivity correctly gets UserAgent"
am: 4903487fd9

Change-Id: Iea24e914cab4128464f8866a4b9ae47c7c5325bf

7 years agoMerge "CaptivePortalLoginActivity correctly gets UserAgent"
Treehugger Robot [Thu, 9 Mar 2017 10:03:26 +0000 (10:03 +0000)]
Merge "CaptivePortalLoginActivity correctly gets UserAgent"

7 years agoMerge "Remove interfaceChain from IServiceManager::add()" am: 4a75e32f1d am: 7665332a7a
Martijn Coenen [Thu, 9 Mar 2017 08:48:59 +0000 (08:48 +0000)]
Merge "Remove interfaceChain from IServiceManager::add()" am: 4a75e32f1d am: 7665332a7a
am: 7669e41d8a

Change-Id: Ide4a33b8532954659a9c7c997d8d5203279a270e

7 years agoMerge "Remove interfaceChain from IServiceManager::add()" am: 4a75e32f1d
Martijn Coenen [Thu, 9 Mar 2017 08:44:17 +0000 (08:44 +0000)]
Merge "Remove interfaceChain from IServiceManager::add()" am: 4a75e32f1d
am: 7665332a7a

Change-Id: I9f5187d9152e151afbf3fd165e4b6f58b4ac9638

7 years agoMerge "Remove interfaceChain from IServiceManager::add()"
Martijn Coenen [Thu, 9 Mar 2017 08:39:15 +0000 (08:39 +0000)]
Merge "Remove interfaceChain from IServiceManager::add()"
am: 4a75e32f1d

Change-Id: I9443e22ed730c44abc6fd6f697f8b3f04b667f37

7 years agoMerge "Remove interfaceChain from IServiceManager::add()"
Martijn Coenen [Thu, 9 Mar 2017 08:33:02 +0000 (08:33 +0000)]
Merge "Remove interfaceChain from IServiceManager::add()"

7 years agoCaptivePortalLoginActivity correctly gets UserAgent
Hugo Benichi [Tue, 7 Mar 2017 06:10:03 +0000 (15:10 +0900)]
CaptivePortalLoginActivity correctly gets UserAgent

Change I33cbcdab9809c712d998da6d925bdd4e3093f8ff added to the intent
passed from NetworkMonitor to the CaptivePortalLoginActivity an extra
argument to set the UserAgent header of probes done by the
CaptivePortalLoginActivity.

However that extra String argument is not correctly retrieved from the
Intent and instead a null pointer is returned by getParcelableExtra().
Consequently the UserAgent header field is never set.

This patch fixes this bug and replace getParcelableExtra() with
getStringExtra().

It also adds logging of the request header and response header for every
network probes sent by CaptivePortalLoginActivity.

Bug: 3593736732369183
Test: manually tested
Change-Id: If5c463023474ffb0401f3cda5875ccd9fc6f79f9

7 years agoIP connectivity metrics: update ipconnectivity.proto
Hugo Benichi [Wed, 8 Mar 2017 02:59:36 +0000 (11:59 +0900)]
IP connectivity metrics: update ipconnectivity.proto

This patch adds several new fields to ipconnectivity.proto for
improving APF metrics, connect metrics, and link_layer inference.

Test: build, flashed, ran $ adb shell dumpsys connmetrics list proto
      updated metrics unit tests depending on proto schema
Bug: 34901696
Change-Id: I6f68e16f583a6b407f33f8a500133e100f3453c7

7 years agoTwo fixes on autofill save.
Felipe Leme [Wed, 8 Mar 2017 20:18:20 +0000 (12:18 -0800)]
Two fixes on autofill save.

1.Fixed race condition on save request - if the service was unbound, it would
  mark the RemoteFillService as completed and the retry would be dropped.
2.Removed session when save request is canceled.

Change-Id: Ib71514cdcfecc38c07dd7656174d0db68ed758d1
Fixes: 36001206
Test: CtsAutoFillServiceTestCases pass

7 years agoMerge "Hook up screen brightness knob to DisplayPowerController."
Lei Yu [Thu, 9 Mar 2017 04:05:20 +0000 (04:05 +0000)]
Merge "Hook up screen brightness knob to DisplayPowerController."

7 years agoMerge "Add OverlayManagerService#setEnableExclusive"
TreeHugger Robot [Thu, 9 Mar 2017 03:14:52 +0000 (03:14 +0000)]
Merge "Add OverlayManagerService#setEnableExclusive"

7 years agoMerge "Avoid cross lock acquisition leading to deadlocks"
TreeHugger Robot [Thu, 9 Mar 2017 03:08:23 +0000 (03:08 +0000)]
Merge "Avoid cross lock acquisition leading to deadlocks"

7 years agoMerge "Add version of @UiThreadTest that works at class level"
TreeHugger Robot [Thu, 9 Mar 2017 03:00:39 +0000 (03:00 +0000)]
Merge "Add version of @UiThreadTest that works at class level"

7 years agoMerge "CEC: Add a method to control standby mode of the device"
Donghyun Cho [Thu, 9 Mar 2017 02:06:49 +0000 (02:06 +0000)]
Merge "CEC: Add a method to control standby mode of the device"

7 years agoMerge "Make Bitmap.get/setPixel[s] color space aware"
TreeHugger Robot [Thu, 9 Mar 2017 02:06:06 +0000 (02:06 +0000)]
Merge "Make Bitmap.get/setPixel[s] color space aware"

7 years agoMerge "Audio focus: framework enforces ducking"
TreeHugger Robot [Thu, 9 Mar 2017 01:52:59 +0000 (01:52 +0000)]
Merge "Audio focus: framework enforces ducking"

7 years agoMerge "Fix API checking for some"
TreeHugger Robot [Thu, 9 Mar 2017 01:37:19 +0000 (01:37 +0000)]
Merge "Fix API checking for some"

7 years agoAvoid cross lock acquisition leading to deadlocks
Svetoslav Ganov [Thu, 9 Mar 2017 01:32:35 +0000 (17:32 -0800)]
Avoid cross lock acquisition leading to deadlocks

Test: manual

bug:36007738

Change-Id: I3db09af07857435682754916849433a809547974

7 years agoMerge "Updated javadoc for ACTION_MANAGE_EXTERNAL_SOURCES"
TreeHugger Robot [Thu, 9 Mar 2017 01:21:55 +0000 (01:21 +0000)]
Merge "Updated javadoc for ACTION_MANAGE_EXTERNAL_SOURCES"

7 years agoMerge "Shell can now fake battery presence"
Chris Tate [Thu, 9 Mar 2017 01:16:33 +0000 (01:16 +0000)]
Merge "Shell can now fake battery presence"

7 years agoMerge "fallout from getting rid of IGraphicBufferAlloc"
Mathias Agopian [Thu, 9 Mar 2017 01:15:45 +0000 (01:15 +0000)]
Merge "fallout from getting rid of IGraphicBufferAlloc"

7 years agoMerge "Provided an AutofillCallback API."
TreeHugger Robot [Thu, 9 Mar 2017 01:13:11 +0000 (01:13 +0000)]
Merge "Provided an AutofillCallback API."

7 years agoMake Bitmap.get/setPixel[s] color space aware
Romain Guy [Wed, 8 Mar 2017 23:58:06 +0000 (15:58 -0800)]
Make Bitmap.get/setPixel[s] color space aware

Bug: 32984164
Test: cts-tradefed run singleCommand cts-dev --module CtsGraphicsTestCases --test android.graphics.cts.BitmapColorSpaceTest
Change-Id: Iee8c4abb264f0d2a44bae59788fbf4dcb2d0fdf7

7 years agoMerge "VolumeShaper: Update Builder methods and Object overrides"
Andy Hung [Thu, 9 Mar 2017 00:31:18 +0000 (00:31 +0000)]
Merge "VolumeShaper: Update Builder methods and Object overrides"

7 years agoMerge "Fix bug in error checking in GnssLocationProvider"
TreeHugger Robot [Thu, 9 Mar 2017 00:29:55 +0000 (00:29 +0000)]
Merge "Fix bug in error checking in GnssLocationProvider"

7 years agoMerge "Throw at getPackageSizeInfoAsUser() callers."
TreeHugger Robot [Thu, 9 Mar 2017 00:09:58 +0000 (00:09 +0000)]
Merge "Throw at getPackageSizeInfoAsUser() callers."

7 years agoFix API checking for some
Eino-Ville Talvala [Thu, 9 Mar 2017 00:02:48 +0000 (16:02 -0800)]
Fix API checking for some

Using AIDL constants in the definition of public API static ints seems
to confuse build tools sometimes.  Switch to just duplicating the
constants until that's worked out.

Test: Builds, at least for me!
Change-Id: I0fbe95bc0492eb8b39687f25a6c7e073fbb65dc4

7 years agoFix stale data due to stopped loader.
George Mount [Wed, 8 Mar 2017 22:53:43 +0000 (14:53 -0800)]
Fix stale data due to stopped loader.

Bug 33185424

When stopping an CursorLoader while data is being loaded,
the load task will be canceled. This CL marks the data as
changed if the cancel is called while the loader is stopped.

Test: I63b48210a25be72d13a2a6182eb1757cbe6a1949
Change-Id: Ibf9c5facdcc5160f6ed146c5fdd063549ac2a7a8

7 years agoMerge "Optimize ViewStructure for autofill by removing irrelevant nodes."
TreeHugger Robot [Wed, 8 Mar 2017 23:21:50 +0000 (23:21 +0000)]
Merge "Optimize ViewStructure for autofill by removing irrelevant nodes."

7 years agoMerge "Use LinedHashMap in AccountManagerService to return accounts in the order...
Dmitry Dementyev [Wed, 8 Mar 2017 23:20:57 +0000 (23:20 +0000)]
Merge "Use LinedHashMap in AccountManagerService to return accounts in the order of database addition"

7 years agofallout from getting rid of IGraphicBufferAlloc
Mathias Agopian [Tue, 28 Feb 2017 03:34:45 +0000 (19:34 -0800)]
fallout from getting rid of IGraphicBufferAlloc

Test: compiled & run
Bug: cleanup
Change-Id: I1590105d3abef985c2ae7c1a03cdf5fd2ec4bef9

7 years agoMerge "Move lagging users over to new storage API."
TreeHugger Robot [Wed, 8 Mar 2017 22:51:47 +0000 (22:51 +0000)]
Merge "Move lagging users over to new storage API."

7 years agoThrow at getPackageSizeInfoAsUser() callers.
Jeff Sharkey [Wed, 8 Mar 2017 04:03:18 +0000 (21:03 -0700)]
Throw at getPackageSizeInfoAsUser() callers.

But only when targeting O; if they're old apps then log and pass
a soft failure message to their callback.

Test: builds, boots
Bug: 35749102
Change-Id: I6c6b5a37c23669e7b1ed3c30207bca610821eb1f

7 years agoMerge "update uiautomator doclava build to use new location for templates as per...
Scott Main [Wed, 8 Mar 2017 21:59:09 +0000 (21:59 +0000)]
Merge "update uiautomator doclava build to use new location for templates as per: https://googleplex-android-review.git.corp.google.com/#/c/1524290/"

7 years agoMerge "Fixed a bug where the scrim was distracting when pulling on HUN"
Selim Cinek [Wed, 8 Mar 2017 21:52:55 +0000 (21:52 +0000)]
Merge "Fixed a bug where the scrim was distracting when pulling on HUN"

7 years agoswitch to new SkPathEffect factories for Compose and Sum
Mike Reed [Wed, 1 Mar 2017 19:08:24 +0000 (14:08 -0500)]
switch to new SkPathEffect factories for Compose and Sum

Test: existing Paint tests exercise these factories

Change-Id: I38abd91203b06b1141dcb4fd96478f9e0a1d18ba

7 years agoMerge "Disable versioning for pathInterpolator when no-version-vectors is on."
Tenghui Zhu [Wed, 8 Mar 2017 21:42:43 +0000 (21:42 +0000)]
Merge "Disable versioning for pathInterpolator when no-version-vectors is on."

7 years agoOptimize ViewStructure for autofill by removing irrelevant nodes.
Felipe Leme [Thu, 2 Mar 2017 20:56:18 +0000 (12:56 -0800)]
Optimize ViewStructure for autofill by removing irrelevant nodes.

Test: CtsAutoFillServiceTestCases (with new tests) pass
Fixes: 35840787

Change-Id: Iaa2c1907c8383b4a820fd7204e67fa2d276ad2b8

7 years agoMerge "Revert "Throw at getPackageSizeInfoAsUser() callers.""
Jeff Sharkey [Wed, 8 Mar 2017 21:19:37 +0000 (21:19 +0000)]
Merge "Revert "Throw at getPackageSizeInfoAsUser() callers.""

7 years agoHook up screen brightness knob to DisplayPowerController.
jackqdyulei [Tue, 28 Feb 2017 19:26:28 +0000 (11:26 -0800)]
Hook up screen brightness knob to DisplayPowerController.

This knob is designed to effectively tune the battery saver.

Bug: 34693888
Test: FrameworksServicesTests
Change-Id: I9fd7896f59fabd9baf649cdb12f01b1baaf4c34b

7 years agoMerge "AC3/EAC3 MaxInputChannelCount support"
Wally Yau [Wed, 8 Mar 2017 21:11:57 +0000 (21:11 +0000)]
Merge "AC3/EAC3 MaxInputChannelCount support"

7 years agoMerge "Replace AutoFillType by view constants."
TreeHugger Robot [Wed, 8 Mar 2017 21:08:52 +0000 (21:08 +0000)]
Merge "Replace AutoFillType by view constants."

7 years agoMerge "Surrounding some field names with quotes to avoid breaking CSV assumptions."
TreeHugger Robot [Wed, 8 Mar 2017 21:06:17 +0000 (21:06 +0000)]
Merge "Surrounding some field names with quotes to avoid breaking CSV assumptions."

7 years agoMove lagging users over to new storage API.
Jeff Sharkey [Wed, 8 Mar 2017 20:57:15 +0000 (13:57 -0700)]
Move lagging users over to new storage API.

Over the last month we've been moving everyone over to the new
StorageStatsManager public APIs, but we missed these users.

The ApplicationsState changes are straightforward, but we had to
completely rewrite StorageMeasurement to use the new fast-path
quota APIs.

Test: builds, boots, UI using StorageMeasurement works.
Bug: 36056120
Change-Id: If02177c95bf8c96ae4eceac4d631a168f99bef84

7 years agoMerge "log fs_stat from fs_mgr and mount_all time"
Keun-young Park [Wed, 8 Mar 2017 20:56:13 +0000 (20:56 +0000)]
Merge "log fs_stat from fs_mgr and mount_all time"

7 years agoMerge "Adds an explicit id for visibleToInstantApps attr"
Jesse Evans [Wed, 8 Mar 2017 20:52:46 +0000 (20:52 +0000)]
Merge "Adds an explicit id for visibleToInstantApps attr"

7 years agoMerge "Do not disable Open Network Notifications setting on profile change."
TreeHugger Robot [Wed, 8 Mar 2017 20:40:58 +0000 (20:40 +0000)]
Merge "Do not disable Open Network Notifications setting on profile change."

7 years agoMerge "Updating moveTaskToBack to handle PiP activities"
TreeHugger Robot [Wed, 8 Mar 2017 20:38:03 +0000 (20:38 +0000)]
Merge "Updating moveTaskToBack to handle PiP activities"

7 years agoMerge "Return generic Binder on onBind" am: c6613f7206 am: 2a71bd5150
Brad Ebinger [Wed, 8 Mar 2017 20:11:04 +0000 (20:11 +0000)]
Merge "Return generic Binder on onBind" am: c6613f7206 am: 2a71bd5150
am: 2fca3afd4b

Change-Id: Ic668d9bb43f58f28c096083f89c6bec30cf9640a

7 years agoMerge "Return generic Binder on onBind" am: c6613f7206
Brad Ebinger [Wed, 8 Mar 2017 20:06:26 +0000 (20:06 +0000)]
Merge "Return generic Binder on onBind" am: c6613f7206
am: 2a71bd5150

Change-Id: Ie447b8094ca9c483aac3886c795240301b5f2ace

7 years agoMerge "Add BatterySaverPolicy for power save mode"
Lei Yu [Wed, 8 Mar 2017 20:02:40 +0000 (20:02 +0000)]
Merge "Add BatterySaverPolicy for power save mode"

7 years agoMerge "Return generic Binder on onBind"
Brad Ebinger [Wed, 8 Mar 2017 20:02:03 +0000 (20:02 +0000)]
Merge "Return generic Binder on onBind"
am: c6613f7206

Change-Id: Ibc8cce3c63b93820f6bdd842e6a751233240874d

7 years agoMerge "Add metric for openProxyFileDescriptor."
TreeHugger Robot [Wed, 8 Mar 2017 19:55:38 +0000 (19:55 +0000)]
Merge "Add metric for openProxyFileDescriptor."

7 years agoMerge "Return generic Binder on onBind"
Brad Ebinger [Wed, 8 Mar 2017 19:53:25 +0000 (19:53 +0000)]
Merge "Return generic Binder on onBind"

7 years agoMerge "TextClassifier: Introduce LocaleList in the API."
TreeHugger Robot [Wed, 8 Mar 2017 19:50:14 +0000 (19:50 +0000)]
Merge "TextClassifier: Introduce LocaleList in the API."

7 years agoMerge "Add new constants to track successful contact queries Bug: 35803126,35873712...
TreeHugger Robot [Wed, 8 Mar 2017 19:49:37 +0000 (19:49 +0000)]
Merge "Add new constants to track successful contact queries Bug: 35803126,35873712 Test: No need to add any tests for this"

7 years agoMerge "Bluetooth 5 Advertising API" am: 1bb08c25b8 am: fc3c9d0e9e
Jakub Pawlowski [Wed, 8 Mar 2017 19:45:37 +0000 (19:45 +0000)]
Merge "Bluetooth 5 Advertising API" am: 1bb08c25b8 am: fc3c9d0e9e
am: c162879c6a

Change-Id: I61382d466f28311b8ba5dd4ab120747eb0708501

7 years agoMerge "Bluetooth 5 PHY selection API" am: 104eeedb42 am: 4f6034160c
Jakub Pawlowski [Wed, 8 Mar 2017 19:44:04 +0000 (19:44 +0000)]
Merge "Bluetooth 5 PHY selection API" am: 104eeedb42 am: 4f6034160c
am: 3730cd9608  -s ours

Change-Id: I5d0dfea7068f123e544686d0522d06a3a1bbf095

7 years agoMerge "Bluetooth 5 periodc scan API (1/2)" am: f1d76a71c8 am: 8acd7391bd
Jakub Pawlowski [Wed, 8 Mar 2017 19:35:27 +0000 (19:35 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)" am: f1d76a71c8 am: 8acd7391bd
am: 600a67a8c8  -s ours

Change-Id: Ibc1fc04aa569bb641a006b490ebf8450480b00ed

7 years agoMerge "Bluetooth 5 Advertising API" am: 1bb08c25b8
Jakub Pawlowski [Wed, 8 Mar 2017 19:28:54 +0000 (19:28 +0000)]
Merge "Bluetooth 5 Advertising API" am: 1bb08c25b8
am: fc3c9d0e9e

Change-Id: Ib8e53386754ccfec27314bc1d29aaabde0cb7976

7 years agolog fs_stat from fs_mgr and mount_all time
Keun-young Park [Thu, 2 Mar 2017 23:26:49 +0000 (15:26 -0800)]
log fs_stat from fs_mgr and mount_all time

- fs_mgr reports fs_stat int value during bootup when mounting
  an ext4 partition.
- This includes information like:
  if previous shutdown was clean
  if e2fsck has fixed any fs issue
  if any mounting or quota related operations has failed.
- Each information is set as flag. Flag definitions are avaiable from
  FsStatFlags in system/core/fs_mgr/fs_mgr.cpp
- log ro.boottime.init.mount_all.[early|default|late] which represent
  time duration for each mount stage. Depending on device's config, some of
  these stages may not exist. So do not log if value is 0, which means not existing.

bug: 32246772
bug: 35949600
bug: 35329915

Test: manual, check log after boot-up.

Change-Id: I4ceca88776119d88d5352d6793be122e82688279

7 years agoMerge "Bluetooth 5 PHY selection API" am: 104eeedb42
Jakub Pawlowski [Wed, 8 Mar 2017 19:27:38 +0000 (19:27 +0000)]
Merge "Bluetooth 5 PHY selection API" am: 104eeedb42
am: 4f6034160c

Change-Id: I3183ead1802d166aae903c180be46f19ea8291ee

7 years agoMerge "Bluetooth 5 enhanced scanning API" am: bed6fb3f5a am: 71760b71fd
Jakub Pawlowski [Wed, 8 Mar 2017 19:27:32 +0000 (19:27 +0000)]
Merge "Bluetooth 5 enhanced scanning API" am: bed6fb3f5a am: 71760b71fd
am: f64a341eb7

Change-Id: I309e654e65001d9b97c457a272601761e54f9a73

7 years agoMerge "Bluetooth 5 periodc scan API (1/2)" am: f1d76a71c8
Jakub Pawlowski [Wed, 8 Mar 2017 19:22:59 +0000 (19:22 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)" am: f1d76a71c8
am: 8acd7391bd

Change-Id: If28e751c19883914f3a44eb9fdec03e08a6a1901

7 years agoMerge "Bluetooth 5 feature check API (1/2)" am: a06a0dfdb7 am: e9bd9be3cb
Jakub Pawlowski [Wed, 8 Mar 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Bluetooth 5 feature check API (1/2)" am: a06a0dfdb7 am: e9bd9be3cb
am: 0798f31c34

Change-Id: I871c18d414ce5a7517eba911c7e4ee441377f14c

7 years agoupdate uiautomator doclava build to use new location for templates
Scott Main [Wed, 8 Mar 2017 19:18:50 +0000 (11:18 -0800)]
update uiautomator doclava build to use new location for templates
as per:
https://googleplex-android-review.git.corp.google.com/#/c/1524290/

Change-Id: Ib8588f01005a691474622e6ca81f63234f796f82

7 years agoMerge "Bluetooth 5 Advertising API"
Jakub Pawlowski [Wed, 8 Mar 2017 19:21:03 +0000 (19:21 +0000)]
Merge "Bluetooth 5 Advertising API"
am: 1bb08c25b8

Change-Id: Ifd95aacf025929d3c9f5a1762f31ed20c26fabfd

7 years agoMerge "Bluetooth 5 enhanced scanning API" am: bed6fb3f5a
Jakub Pawlowski [Wed, 8 Mar 2017 19:21:00 +0000 (19:21 +0000)]
Merge "Bluetooth 5 enhanced scanning API" am: bed6fb3f5a
am: 71760b71fd

Change-Id: I6a5de71a10fb1e326e57f3a9bd665229535a6571

7 years agoSurrounding some field names with quotes to avoid breaking CSV assumptions.
Kweku Adams [Wed, 8 Mar 2017 16:12:15 +0000 (08:12 -0800)]
Surrounding some field names with quotes to avoid breaking CSV assumptions.

Some names can include commas, and if they're not surrounded by quotes,
then CSV parsing breaks, as was the case in
https://github.com/google/battery-historian/issues/94#issuecomment-282790498
and several other circumstances.

Test: flashed local device and ran batterystats output through Historian

Change-Id: I070c5d873d9f79996a581bf0a5f664136c0af454

7 years agoMerge "Bluetooth 5 PHY selection API"
Jakub Pawlowski [Wed, 8 Mar 2017 19:18:50 +0000 (19:18 +0000)]
Merge "Bluetooth 5 PHY selection API"
am: 104eeedb42

Change-Id: I0ee2daaf0771b405c8a14598a70459879d31c953

7 years agoMerge "Bluetooth 5 feature check API (1/2)" am: a06a0dfdb7
Jakub Pawlowski [Wed, 8 Mar 2017 19:17:08 +0000 (19:17 +0000)]
Merge "Bluetooth 5 feature check API (1/2)" am: a06a0dfdb7
am: e9bd9be3cb

Change-Id: I462d459638f2b41f8806b877a6b307e21e6e30d3

7 years agoMerge "Bluetooth 5 periodc scan API (1/2)"
Jakub Pawlowski [Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)"
am: f1d76a71c8

Change-Id: I7b68746e3dc02a12d13380a90bcf26cebfd31f16

7 years agoMerge "Bluetooth 5 enhanced scanning API"
Jakub Pawlowski [Wed, 8 Mar 2017 19:12:08 +0000 (19:12 +0000)]
Merge "Bluetooth 5 enhanced scanning API"
am: bed6fb3f5a

Change-Id: I27d61ec7446c36143dcd5a94158451e1be9a5411

7 years agoMerge "Bluetooth 5 feature check API (1/2)"
Jakub Pawlowski [Wed, 8 Mar 2017 19:09:43 +0000 (19:09 +0000)]
Merge "Bluetooth 5 feature check API (1/2)"
am: a06a0dfdb7

Change-Id: I59cf0e8f496e6a1201a3a6ec832c33cd1c8972df

7 years agoMerge "Bluetooth 5 Advertising API"
Jakub Pawlowski [Wed, 8 Mar 2017 19:05:12 +0000 (19:05 +0000)]
Merge "Bluetooth 5 Advertising API"

7 years agoUpdating moveTaskToBack to handle PiP activities
Winson Chung [Wed, 8 Mar 2017 00:54:31 +0000 (16:54 -0800)]
Updating moveTaskToBack to handle PiP activities

- When a PiP activity calls moveTaskToBack(), we should fall through to
  the same behaviour as dismissing the PiP if there are no other tasks
  to show.

Bug: 36034065
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testMovePipToBackWithNoFullscreenStack
Test: #testMovePipToBackWithVisibleFullscreenStack
Test: #testMovePipToBackWithHiddenFullscreenStack

Change-Id: I83c3d27dabc031546f9f1cf20b808bb8f13d4646
Signed-off-by: Winson Chung <winsonc@google.com>
7 years agoBluetooth 5 Advertising API
Jakub Pawlowski [Tue, 10 Jan 2017 14:15:54 +0000 (06:15 -0800)]
Bluetooth 5 Advertising API

Test: manual
Bug: 30622771
Change-Id: Id6856e6110872ec50ff1af54ddc75c0104a6459c
(cherry picked from commit 5324a14cf490656269ef862d7f8f6b139a21c0e6)

7 years agoMerge "Bluetooth 5 PHY selection API"
Jakub Pawlowski [Wed, 8 Mar 2017 19:04:30 +0000 (19:04 +0000)]
Merge "Bluetooth 5 PHY selection API"

7 years agoRevert "Throw at getPackageSizeInfoAsUser() callers."
Tony Mantler [Wed, 8 Mar 2017 19:04:22 +0000 (19:04 +0000)]
Revert "Throw at getPackageSizeInfoAsUser() callers."

This reverts commit 597c93454699eaed99d6b417080417d75777e72d.

Change-Id: I7d966ef973050ef791403062774fd7f576a65388

7 years agoMerge changes I6823a613,I7763b473
Selim Cinek [Wed, 8 Mar 2017 19:04:16 +0000 (19:04 +0000)]
Merge changes I6823a613,I7763b473

* changes:
  Fixed a bug where the low-priority header wasn't cleared
  Fixes an issue where the notification header could be invisible

7 years agoBluetooth 5 PHY selection API
Jakub Pawlowski [Thu, 2 Feb 2017 16:07:12 +0000 (08:07 -0800)]
Bluetooth 5 PHY selection API

Bug: 30622771
Test: manual
Change-Id: I50262a56a70466439f9700549c3c0e7bd49e2e8d
(cherry picked from commit db5a87d50db9d4b3d642603f6c329b83ee5851f6)

7 years agoMerge "Bluetooth 5 periodc scan API (1/2)"
Jakub Pawlowski [Wed, 8 Mar 2017 19:03:47 +0000 (19:03 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)"

7 years agoBluetooth 5 periodc scan API (1/2)
Jakub Pawlowski [Mon, 16 Jan 2017 15:21:01 +0000 (07:21 -0800)]
Bluetooth 5 periodc scan API (1/2)

Bug: 30622771
Test: manual
Change-Id: I61853bc71f6013e9406d1d151bb51ea4484bb92c
(cherry picked from commit a48e03745becc96181c676dc3d194d0572f11c10)

7 years agoMerge "Bluetooth 5 enhanced scanning API"
Jakub Pawlowski [Wed, 8 Mar 2017 19:02:57 +0000 (19:02 +0000)]
Merge "Bluetooth 5 enhanced scanning API"

7 years agoBluetooth 5 enhanced scanning API
Jakub Pawlowski [Tue, 17 Jan 2017 15:50:46 +0000 (07:50 -0800)]
Bluetooth 5 enhanced scanning API

Bug: 30622771
Test: manual
Change-Id: I2c8065fbcedf48777ce18c7d8fe621e568b3fd75
(cherry picked from commit 9de522c6e48497028d36a1f8ad8f8adf4b7b1ae6)