OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356
Erik Kline [Thu, 12 Jan 2017 10:43:26 +0000 (10:43 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356
am: 082263344a

Change-Id: I11af9d4b1810cce628e240f2d8b6980ea55cd40a

7 years agoMerge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9
Martijn Coenen [Thu, 12 Jan 2017 10:38:28 +0000 (10:38 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9
am: eed50c1809

Change-Id: Ia89700ddb0300b931e11b3f4dc5f31c4234d7076

7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b
Erik Kline [Thu, 12 Jan 2017 10:33:24 +0000 (10:33 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b
am: cbd3d8b356

Change-Id: I845443ae243429847e0a42b3be5bec6276a216c0

7 years agoMerge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb
Martijn Coenen [Thu, 12 Jan 2017 10:31:35 +0000 (10:31 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb
am: aa4d6f1be9

Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d

7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling"
Erik Kline [Thu, 12 Jan 2017 10:26:43 +0000 (10:26 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"
am: f9f5cf9d9b

Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9

7 years agoMerge "Use new read(Embedded)Buffer APIs."
Martijn Coenen [Thu, 12 Jan 2017 10:25:01 +0000 (10:25 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
am: 34ed84d4eb

Change-Id: Idaa3a3a2d874b10cb5f07e3cb606c822e7ddfd8b

7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling"
Treehugger Robot [Thu, 12 Jan 2017 10:18:24 +0000 (10:18 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"

7 years agoMerge "Use new read(Embedded)Buffer APIs."
Treehugger Robot [Thu, 12 Jan 2017 10:17:38 +0000 (10:17 +0000)]
Merge "Use new read(Embedded)Buffer APIs."

7 years agoMerge "Captive portal: better detect empty responses" into nyc-mr2-dev
Hugo Benichi [Thu, 12 Jan 2017 08:59:33 +0000 (08:59 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev
am: c45082266f

Change-Id: Ice8b5df87baf475ebc4eb8f2eb4fe0150c938639

7 years agoCaptive portal: better detect empty responses
Hugo Benichi [Thu, 12 Jan 2017 08:59:27 +0000 (08:59 +0000)]
Captive portal: better detect empty responses
am: cb4aa4d412

Change-Id: I64a006f6bb83dc588b108395d54189bb401c83ff

7 years agoMerge "Captive portal: better detect empty responses" into nyc-mr2-dev
TreeHugger Robot [Thu, 12 Jan 2017 08:51:31 +0000 (08:51 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366...
Stephen Chen [Thu, 12 Jan 2017 07:33:19 +0000 (07:33 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366 am: 0e7882f2ac
am: 272e70bf69

Change-Id: I2bc76076e613566111404c55faefaeda9048f2d1

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366
Stephen Chen [Thu, 12 Jan 2017 07:27:22 +0000 (07:27 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366
am: 0e7882f2ac

Change-Id: I7408b253a7acc4aaf22dc7748b1941576d5de4c7

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi"
Stephen Chen [Thu, 12 Jan 2017 07:21:49 +0000 (07:21 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
am: 691ebe5366

Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi"
Treehugger Robot [Thu, 12 Jan 2017 07:15:05 +0000 (07:15 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"

7 years agoCaptive portal: better detect empty responses
Hugo Benichi [Wed, 11 Jan 2017 07:23:26 +0000 (16:23 +0900)]
Captive portal: better detect empty responses

The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.

However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.

When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.

This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.

Test: build, flashed + manual tests.
Bug: 33498325
Change-Id: Ie2e5c6a9dc3740e4a2304034879b5ed60f277ade

7 years agoExpose WifiManager#connect and ActionListener as @SystemApi
Stephen Chen [Fri, 6 Jan 2017 23:34:28 +0000 (15:34 -0800)]
Expose WifiManager#connect and ActionListener as @SystemApi

This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.

Bug: 33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8

7 years agoMerge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43
Colin Cross [Thu, 12 Jan 2017 05:11:47 +0000 (05:11 +0000)]
Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43
am: dcb0c55c15

Change-Id: I55f8fed5eff824e792cbfc29b7cd7b496cad106c

7 years agoMerge "Remove libservicestestsjni" am: d00478e9ad
Colin Cross [Thu, 12 Jan 2017 05:05:41 +0000 (05:05 +0000)]
Merge "Remove libservicestestsjni" am: d00478e9ad
am: 301c714b43

Change-Id: I08e2298e7dd1ba8729e6d4a03e3c940012bb5e12

7 years agoMerge "Remove libservicestestsjni"
Colin Cross [Thu, 12 Jan 2017 04:59:42 +0000 (04:59 +0000)]
Merge "Remove libservicestestsjni"
am: d00478e9ad

Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c

7 years agoMerge "Remove libservicestestsjni"
Treehugger Robot [Thu, 12 Jan 2017 04:50:56 +0000 (04:50 +0000)]
Merge "Remove libservicestestsjni"

7 years agoSimplify UpstreamNetworkMonitor callback handling
Erik Kline [Wed, 11 Jan 2017 08:34:50 +0000 (17:34 +0900)]
Simplify UpstreamNetworkMonitor callback handling

In the callback post a lamba to the target state machine's handler
that does the processing we need before sending a notification to
the state machine.

No semantic change, just a bit cleaner.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - tested basic wifi-to-mobile tethering (no DUN)
Bug: 32163131
Change-Id: I07e1b510c1ebaa5dffd42a3f16ba96e961cb58f1

7 years agoRemove libservicestestsjni
Colin Cross [Wed, 11 Jan 2017 22:29:10 +0000 (14:29 -0800)]
Remove libservicestestsjni

frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.

Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from e399468b88ae84a586f9d583251ee0a6a7e94a43)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065

7 years agoMerge "Sync the startConsentUiIfNeeded logics to master. We are missing the package...
Android Build Merger (Role) [Thu, 12 Jan 2017 03:13:04 +0000 (03:13 +0000)]
Merge "Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59" into nyc-mr2-dev-plus-aosp

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now. am: 5e7fc7ccc8
am: 699e7878ef

Change-Id: I39aefb9af40cbe6a2cc833bf4e5e96890c0b13a4

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now. am: 5e7fc7ccc8
am: ae21066a59

Change-Id: I3033d6d64d35f2c9c1aafe003eef0860c1f78efc

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:07:23 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now.
am: 5e7fc7ccc8

Change-Id: I327673625deafc5c18319ce1b61734a090b6a989

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:07:10 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now.
am: 5e7fc7ccc8

Change-Id: I4214dc072d3155cd417ee3577918570e515fa1cf

7 years agoMerge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d
Yifan Hong [Thu, 12 Jan 2017 02:14:00 +0000 (02:14 +0000)]
Merge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d
am: 860ef8810d

Change-Id: I60bdcdd36defa739e346481aa3f3a46ac90ccf32

7 years agoMerge "BpBase -> BpHwBase" am: d8384b5c15
Yifan Hong [Thu, 12 Jan 2017 02:08:36 +0000 (02:08 +0000)]
Merge "BpBase -> BpHwBase" am: d8384b5c15
am: e0707f139d

Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e

7 years agoMerge "BpBase -> BpHwBase"
Yifan Hong [Thu, 12 Jan 2017 01:58:33 +0000 (01:58 +0000)]
Merge "BpBase -> BpHwBase"
am: d8384b5c15

Change-Id: I647e8ec4461e4d9c859144c123f278216111a2f4

7 years agoMerge "BpBase -> BpHwBase"
Treehugger Robot [Thu, 12 Jan 2017 01:50:57 +0000 (01:50 +0000)]
Merge "BpBase -> BpHwBase"

7 years agoMerge "add additional logging to ActiityManagerService" into nyc-mr2-dev
Tim Murray [Thu, 12 Jan 2017 00:32:01 +0000 (00:32 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev
am: 0b7b79a882

Change-Id: I669aa5012a93c70b7ee7af7c1958159d933b4f4c

7 years agoadd additional logging to ActiityManagerService
Tim Murray [Thu, 12 Jan 2017 00:31:54 +0000 (00:31 +0000)]
add additional logging to ActiityManagerService
am: 82e201f03d

Change-Id: I0ea737adc3f59674a0ce313a0a8caa49d926e359

7 years agoMerge "add additional logging to ActiityManagerService" into nyc-mr2-dev
Tim Murray [Thu, 12 Jan 2017 00:24:27 +0000 (00:24 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c
Etan Cohen [Wed, 11 Jan 2017 23:22:51 +0000 (23:22 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c
am: b32dfa4ef5

Change-Id: If2a6b632cd03984921572b190745865953a8e808

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
Etan Cohen [Wed, 11 Jan 2017 23:17:19 +0000 (23:17 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
am: 2a4e3bef2c

Change-Id: I6f894d92451032657678639c3021eef07289a6a2

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
Etan Cohen [Wed, 11 Jan 2017 23:12:16 +0000 (23:12 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
am: dfe8f5dc13

Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42

7 years agoMerge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev
Felipe Leme [Wed, 11 Jan 2017 23:09:30 +0000 (23:09 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev
am: 2729bb8517

Change-Id: Idfef7bea67e3f75bc5faad6e325c4197c4904652

7 years agoAdded BUGREPORT_OPTION_TELEPHONY.
Felipe Leme [Wed, 11 Jan 2017 23:09:01 +0000 (23:09 +0000)]
Added BUGREPORT_OPTION_TELEPHONY.
am: a561b1f9c0

Change-Id: I063a0d6c4c66035082789d4361b649439da00bf9

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
Etan Cohen [Wed, 11 Jan 2017 22:59:24 +0000 (22:59 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"

7 years agoMerge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev
TreeHugger Robot [Wed, 11 Jan 2017 22:55:34 +0000 (22:55 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev

7 years agoadd additional logging to ActiityManagerService
Tim Murray [Wed, 11 Jan 2017 17:52:38 +0000 (09:52 -0800)]
add additional logging to ActiityManagerService

add logging to help debugging issues with attachApplication/attachApplicationLocked.

bug 34193533
Tests: boots and starts apps

Change-Id: I6ef46dd92e893b71c164bfb28eeba1835dddffee

7 years agoMerge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95
Jeremy Joslin [Wed, 11 Jan 2017 20:08:49 +0000 (20:08 +0000)]
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95
am: ab9eb11e2f

Change-Id: Iede47bf5a625ac4183919b4253c6d5e3f92520bc

7 years agoMerge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3
Jeremy Joslin [Wed, 11 Jan 2017 19:59:27 +0000 (19:59 +0000)]
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3
am: 425a0fdc95

Change-Id: Icd1e76d7987cc9937cce5079dedf610fcd21c903

7 years agoMerge "Move getActiveScorerPackage() to the score service."
Jeremy Joslin [Wed, 11 Jan 2017 19:52:37 +0000 (19:52 +0000)]
Merge "Move getActiveScorerPackage() to the score service."
am: b5488ec3b3

Change-Id: I8819c482a87a8c78ad0a1a39dda74b5ee2e7da4c

7 years agoMerge "Move getActiveScorerPackage() to the score service."
Treehugger Robot [Wed, 11 Jan 2017 19:40:44 +0000 (19:40 +0000)]
Merge "Move getActiveScorerPackage() to the score service."

7 years ago[AWARE] Unhide Wi-Fi Aware API (baseline)
Etan Cohen [Tue, 10 Jan 2017 05:47:32 +0000 (21:47 -0800)]
[AWARE] Unhide Wi-Fi Aware API (baseline)

Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).

Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933

7 years agoAdd ticker text for network logging notification
phweiss [Wed, 11 Jan 2017 18:37:58 +0000 (18:37 +0000)]
Add ticker text for network logging notification
am: df7bfcfc22

Change-Id: Iff2f2e9866eb9b4bc018965bdd48eaff5bbc9af3

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package
Shijian Li [Wed, 11 Jan 2017 17:32:12 +0000 (17:32 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package
name when starting the activity now.

Bug: 34216066
Change-Id: Ic8c8576ce2c65bc554bbf4794e169838c2ccbbe1

7 years agoMerge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd
Akira Oshimi [Wed, 11 Jan 2017 16:11:53 +0000 (16:11 +0000)]
Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd
am: d999e53487

Change-Id: I7a1420c595f187923ad565d080e05c15c98d7dce

7 years agoMerge "Fix clipping for edit screen of Quick Settings" am: e3677865a8
Akira Oshimi [Wed, 11 Jan 2017 16:06:22 +0000 (16:06 +0000)]
Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8
am: 49b68ad0cd

Change-Id: I02de0a87c633f4ffc8cee81e8773e31c9851d19d

7 years agoMerge "Fix clipping for edit screen of Quick Settings"
Akira Oshimi [Wed, 11 Jan 2017 16:01:23 +0000 (16:01 +0000)]
Merge "Fix clipping for edit screen of Quick Settings"
am: e3677865a8

Change-Id: Idb615698c433bd4436950cbf94ced95f02198cd9

7 years agoMerge "Fix clipping for edit screen of Quick Settings"
Treehugger Robot [Wed, 11 Jan 2017 15:51:36 +0000 (15:51 +0000)]
Merge "Fix clipping for edit screen of Quick Settings"

7 years agoMerge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143c...
Mark Salyzyn [Wed, 11 Jan 2017 15:45:46 +0000 (15:45 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5
am: ef8ccc8510

Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b

7 years agoMerge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
Mark Salyzyn [Wed, 11 Jan 2017 15:40:24 +0000 (15:40 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
am: 6143cbf1e5

Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75

7 years agoMerge "Replace cutils/log.h and log/logger.h with log/log.h"
Mark Salyzyn [Wed, 11 Jan 2017 15:35:19 +0000 (15:35 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
am: e7fcbcb991

Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08

7 years agoMerge "Replace cutils/log.h and log/logger.h with log/log.h"
Mark Salyzyn [Wed, 11 Jan 2017 15:24:10 +0000 (15:24 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h"

7 years agoMerge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cd...
Neil Fuller [Wed, 11 Jan 2017 15:13:08 +0000 (15:13 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6 am: 5be9960f66
am: d544a4c682

Change-Id: I9e2ee5c872aaa500378900962899672f318e294c

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b...
Lenka Trochtova [Wed, 11 Jan 2017 15:09:46 +0000 (15:09 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97 am: 345362c66f
am: 44a53bab46

Change-Id: Ide191d76911c7909b2ffa6969f6d2481b1b27276

7 years agoAdd ticker text for network logging notification
phweiss [Tue, 10 Jan 2017 18:31:07 +0000 (19:31 +0100)]
Add ticker text for network logging notification

Set ticker text to title for accessibility.

Bug:31207965
Test: manual

Change-Id: I0b78f9e6464dd470b74e0db97813623b335835d9
(cherry picked from commit d4a54bbfd1902dccb0e4de03f15bfbbba50b9531)

7 years agoMerge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6
Neil Fuller [Wed, 11 Jan 2017 15:02:42 +0000 (15:02 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6
am: 5be9960f66

Change-Id: I7cc9fed8ca298bd559b94ff57fd881b0651a16bd

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97
Lenka Trochtova [Wed, 11 Jan 2017 14:59:18 +0000 (14:59 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97
am: 345362c66f

Change-Id: I56d94f43683581d940d3711c9ca86fee0861b0e6

7 years agoMerge "Switch ConfigUpdater to the new version of timezone updater code"
Neil Fuller [Wed, 11 Jan 2017 14:54:51 +0000 (14:54 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code"
am: 216303cdb6

Change-Id: I106699e4f141b27e0ace17d4997a2a67bf6a7c55

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed."
Lenka Trochtova [Wed, 11 Jan 2017 14:49:09 +0000 (14:49 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
am: 0c1a4b6a97

Change-Id: Ic304d77ea532a1a6a6539ba9d4dca35a0f628ff2

7 years agoMerge "Switch ConfigUpdater to the new version of timezone updater code"
Neil Fuller [Wed, 11 Jan 2017 14:46:46 +0000 (14:46 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code"

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed."
Treehugger Robot [Wed, 11 Jan 2017 14:40:05 +0000 (14:40 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am...
Neil Fuller [Wed, 11 Jan 2017 13:54:10 +0000 (13:54 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794
am: 43d53395dc

Change-Id: Ib7055c5ddf2caa52082aee4b67e3ebd213e09e4b

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524
Neil Fuller [Wed, 11 Jan 2017 13:48:14 +0000 (13:48 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524
am: f4e236c794

Change-Id: If23b5efe912c5b0a76487c46723288ff6a903a14

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
Neil Fuller [Wed, 11 Jan 2017 13:37:37 +0000 (13:37 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
am: 649a89e524

Change-Id: Ib8dc0ec183b870931bf4befea5ff32532009fddd

7 years agoMerge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
Neil Fuller [Wed, 11 Jan 2017 13:27:09 +0000 (13:27 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"

7 years agoUse new read(Embedded)Buffer APIs.
Martijn Coenen [Wed, 11 Jan 2017 11:35:56 +0000 (12:35 +0100)]
Use new read(Embedded)Buffer APIs.

Bug: 34134129
Test: mma, hidl_test_java
Change-Id: I13b3841778d5df4e7c37760610712a26c68896d6

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d...
Richard Uhler [Wed, 11 Jan 2017 10:58:30 +0000 (10:58 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d am: 5c5637e1bd
am: 4911e517ab

Change-Id: I5fd04eb1e91d4ff590a195598566a85bbc00999f

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d
Richard Uhler [Wed, 11 Jan 2017 10:48:00 +0000 (10:48 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d
am: 5c5637e1bd

Change-Id: I27f00cca9b511d6950e12b59f179faae21f07147

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Richard Uhler [Wed, 11 Jan 2017 10:37:33 +0000 (10:37 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
am: 8582826f8d

Change-Id: If5d55f55d86c4e4711e36a7f517336fbdda96e3d

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Treehugger Robot [Wed, 11 Jan 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e
Erik Kline [Wed, 11 Jan 2017 08:48:33 +0000 (08:48 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e
am: 305796276b

Change-Id: Iba225c91bb8b27887805cdba29493c817a969f98

7 years agoCleanup code given PATCHOAT_FOR_RELOCATION has been removed.
Richard Uhler [Thu, 8 Dec 2016 10:33:09 +0000 (10:33 +0000)]
Cleanup code given PATCHOAT_FOR_RELOCATION has been removed.

Test: make, device boots, installed an app
Test: adb shell cmd package compile -m speed|speed-profile <app>
Bug: 33192586
Change-Id: I8ef7d4926773586251fedf8a7737a8005f119859

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76
Erik Kline [Wed, 11 Jan 2017 08:42:55 +0000 (08:42 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76
am: d48902d37e

Change-Id: Ia3c21d905c5f4eaa1dd0ea09f3113989e9d8eecc

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction"
Erik Kline [Wed, 11 Jan 2017 08:38:00 +0000 (08:38 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction"
am: f84e5e8f76

Change-Id: I4e4d525ff1dc23189e4ef6978a1980319d6b85f2

7 years agoMerge "Prepare UpstreamNetworkMonitor for extraction"
Erik Kline [Wed, 11 Jan 2017 08:29:17 +0000 (08:29 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction"

7 years agoPrepare UpstreamNetworkMonitor for extraction
Erik Kline [Tue, 10 Jan 2017 08:37:54 +0000 (17:37 +0900)]
Prepare UpstreamNetworkMonitor for extraction

Test: as follows:
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net
    - tested basic wifi-to-mobile tethering (no DUN)
Bug: 32163131
Change-Id: Id0b2497f231af5e79ae3bbf42c73bc78031b6fa3

7 years agoMerge "Add Brightness setting for VR Mode." into nyc-mr2-dev
Santos Cordon [Wed, 11 Jan 2017 03:12:11 +0000 (03:12 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
am: a00c235600

Change-Id: Idcf0447ec99e148b865c2f8fe25c614bc149aa32

7 years agoAdd Brightness setting for VR Mode.
Santos Cordon [Wed, 11 Jan 2017 03:12:05 +0000 (03:12 +0000)]
Add Brightness setting for VR Mode.
am: d6a5660a2c

Change-Id: If371f485471eb1ab0a3e07964c197cb9b8ef1c9f

7 years agoMerge "Add Brightness setting for VR Mode." into nyc-mr2-dev
Santos Cordon [Wed, 11 Jan 2017 03:02:52 +0000 (03:02 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev

7 years agoMerge "Zygote: Add fdsToIgnore" am: 5b22a826d5 am: 140b9b65a1
Andreas Gampe [Wed, 11 Jan 2017 03:01:40 +0000 (03:01 +0000)]
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5 am: 140b9b65a1
am: e4cff36099

Change-Id: I89cd109839b4af2510a5b1789a146f7efea4cb80

7 years agoMerge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3...
Calin Juravle [Wed, 11 Jan 2017 02:58:50 +0000 (02:58 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3 am: 6d0b836562
am: 8ad84c5e70

Change-Id: I3b632d25a35dca6601cd6b88862d1a302a9eb471

7 years agoFix clipping for edit screen of Quick Settings
Akira Oshimi [Fri, 16 Dec 2016 09:57:28 +0000 (18:57 +0900)]
Fix clipping for edit screen of Quick Settings

The width of the edit screen is fixed when the display size is updated
in landscape mode. So when the device is rotated to portrait mode, the
width is not updated and the edit screen is truncated.
To fix this issue, "match_parent" should be used to match to the width
of Notification Panel always.

Bug: 34206618
Test: manual - go to Settings, rotate device to landscape mode, change
               display size (Default > Large > Default), rotate device
               to portrait mode and show QS edit screen

Change-Id: I35ac623812908a61cd34357e6bda567cab55ace1

7 years agoAdd an extra debug flag to BackgroundDexOptimizer am: 3a2b7f7d59 am: 236477e86e
Calin Juravle [Wed, 11 Jan 2017 02:57:52 +0000 (02:57 +0000)]
Add an extra debug flag to BackgroundDexOptimizer am: 3a2b7f7d59 am: 236477e86e
am: f5d005b8c2

Change-Id: Icb9d089b68ec192b73b31b965c66f2f747ce220b

7 years agoSome refactoring in BackgroundDexOptService. am: 95176bb18e am: 377cc26e3a
Calin Juravle [Wed, 11 Jan 2017 02:56:53 +0000 (02:56 +0000)]
Some refactoring in BackgroundDexOptService. am: 95176bb18e am: 377cc26e3a
am: e1a0a76381

Change-Id: Id97538a51933ccbb9c62511e5949664780b7e861

7 years agoDo not try to resolve realpath in DexManager. am: b96dba9bad am: b8f31d8a85
Calin Juravle [Wed, 11 Jan 2017 02:56:00 +0000 (02:56 +0000)]
Do not try to resolve realpath in DexManager. am: b96dba9bad am: b8f31d8a85
am: d86ca1cd25

Change-Id: I6b01cc2af9447ca2d5a871c6e1dd9ccf8d84e640

7 years agoLog DexManager realpath errors only in debug mode. am: 271bacbf5c am: 42c7fc7f27
Calin Juravle [Wed, 11 Jan 2017 02:54:25 +0000 (02:54 +0000)]
Log DexManager realpath errors only in debug mode. am: 271bacbf5c am: 42c7fc7f27
am: 46b323869f

Change-Id: I55e04d69bba9d14f0527c648d29f8ec8b7bbddfb

7 years agoRecord data about dex files use on disk am: 5a9094c1b6 am: dc10a3bdb0
Calin Juravle [Wed, 11 Jan 2017 02:53:31 +0000 (02:53 +0000)]
Record data about dex files use on disk am: 5a9094c1b6 am: dc10a3bdb0
am: ea1c34d45e

Change-Id: Ie9f489ff2ec89e9014eb683e269139ba633762bb

7 years agoAdd logic for recording dex files use on disk am: 6ea5ace7b3 am: 34bdf1680a
Calin Juravle [Wed, 11 Jan 2017 02:52:35 +0000 (02:52 +0000)]
Add logic for recording dex files use on disk am: 6ea5ace7b3 am: 34bdf1680a
am: bc7f234daa

Change-Id: Iaf2ffd60d374eef179705e35743338ff3d8105c3

7 years agoMerge "Zygote: Add fdsToIgnore" am: 5b22a826d5
Andreas Gampe [Wed, 11 Jan 2017 02:46:57 +0000 (02:46 +0000)]
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5
am: 140b9b65a1

Change-Id: Ib4c46887ed5d87ef143bd866320d77b75d8711a3

7 years agoMerge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3
Calin Juravle [Wed, 11 Jan 2017 02:44:08 +0000 (02:44 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3
am: 6d0b836562

Change-Id: I22594f44c2487a7b0933de9c298389f9a6688549

7 years agoAdd an extra debug flag to BackgroundDexOptimizer am: 3a2b7f7d59
Calin Juravle [Wed, 11 Jan 2017 02:43:15 +0000 (02:43 +0000)]
Add an extra debug flag to BackgroundDexOptimizer am: 3a2b7f7d59
am: 236477e86e

Change-Id: I30686bda79e0400d6aaca8ee71ca0c449452ed31

7 years agoSome refactoring in BackgroundDexOptService. am: 95176bb18e
Calin Juravle [Wed, 11 Jan 2017 02:42:21 +0000 (02:42 +0000)]
Some refactoring in BackgroundDexOptService. am: 95176bb18e
am: 377cc26e3a

Change-Id: If18489475e12e1d5c641f512a6b21f0ba70c6b6a

7 years agoDo not try to resolve realpath in DexManager. am: b96dba9bad
Calin Juravle [Wed, 11 Jan 2017 02:41:28 +0000 (02:41 +0000)]
Do not try to resolve realpath in DexManager. am: b96dba9bad
am: b8f31d8a85

Change-Id: I4b9e9c0781a4db89a49d588bcebb953c6144f5a3

7 years agoLog DexManager realpath errors only in debug mode. am: 271bacbf5c
Calin Juravle [Wed, 11 Jan 2017 02:40:14 +0000 (02:40 +0000)]
Log DexManager realpath errors only in debug mode. am: 271bacbf5c
am: 42c7fc7f27

Change-Id: I68f14e9a0b7507a93a9569e670b3693958fd7c09