OSDN Git Service

android-x86/frameworks-base.git
7 years agoMove explicit mobile request handling into UpstreamNetworkMonitor am: fdd4111ef6
Erik Kline [Fri, 13 Jan 2017 07:17:47 +0000 (07:17 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor am: fdd4111ef6
am: 7340e272c3

Change-Id: Ie5065a8224e392dafc75e9f9cd9e07587e46b814

7 years agoMove explicit mobile request handling into UpstreamNetworkMonitor
Erik Kline [Fri, 13 Jan 2017 07:11:43 +0000 (07:11 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor
am: fdd4111ef6

Change-Id: If452982fdc47cf0e655c7f079c1be3f535ec6c03

7 years agoMove explicit mobile request handling into UpstreamNetworkMonitor
Erik Kline [Thu, 12 Jan 2017 08:02:51 +0000 (17:02 +0900)]
Move explicit mobile request handling into UpstreamNetworkMonitor

Also:
    - some minor typo fixes
    - some minor style fixes
    - variable renames for clarity

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - regular (no DUN) wifi tethering to mobile works
    - USB tethering with switching between mobile and wifi works
Bug: 32163131
Change-Id: I113536f24436f0b962f402f3b37386e29468dc0a

7 years agoMerge "Default Carrier app for traffic mitigation" am: 4533b1ccdd
Chen Xu [Fri, 13 Jan 2017 02:33:24 +0000 (02:33 +0000)]
Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd
am: 1d0877f59e

Change-Id: I1df7d283d8339065d4418af562775c3aea56a707

7 years agoMerge "Default Carrier app for traffic mitigation"
Chen Xu [Fri, 13 Jan 2017 02:28:28 +0000 (02:28 +0000)]
Merge "Default Carrier app for traffic mitigation"
am: 4533b1ccdd

Change-Id: I999285660c3a53fb2da8f18ddde9042f611f4e96

7 years agoMerge "Default Carrier app for traffic mitigation"
Chen Xu [Fri, 13 Jan 2017 02:22:38 +0000 (02:22 +0000)]
Merge "Default Carrier app for traffic mitigation"

7 years agoDo not write if apply() did not change the file. am: 1f99f81bdc
Philip P. Moltmann [Fri, 13 Jan 2017 01:17:30 +0000 (01:17 +0000)]
Do not write if apply() did not change the file. am: 1f99f81bdc
am: 331a4bb8d4

Change-Id: I068dcbfcdaffff85379d422a9c53aafe7caa01c2

7 years agoOnly persist last Shared Preferences state am: d15c4f1da5
Philip P. Moltmann [Fri, 13 Jan 2017 01:16:23 +0000 (01:16 +0000)]
Only persist last Shared Preferences state am: d15c4f1da5
am: 889a420a9e

Change-Id: If0849eedacedf9197e19616dc56edad2ca39f015

7 years agoDo not write if apply() did not change the file.
Philip P. Moltmann [Fri, 13 Jan 2017 01:10:01 +0000 (01:10 +0000)]
Do not write if apply() did not change the file.
am: 1f99f81bdc

Change-Id: I4dd94b4f862f6c3d5ada9961d75cc2f91886edf1

7 years agoOnly persist last Shared Preferences state
Philip P. Moltmann [Fri, 13 Jan 2017 01:09:03 +0000 (01:09 +0000)]
Only persist last Shared Preferences state
am: d15c4f1da5

Change-Id: I6431d4b7d07064eec5013d01b5bda76b1ed35e14

7 years agoDo not write if apply() did not change the file.
Philip P. Moltmann [Wed, 14 Dec 2016 00:32:06 +0000 (16:32 -0800)]
Do not write if apply() did not change the file.

Bug: 33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136

7 years agoOnly persist last Shared Preferences state
Philip P. Moltmann [Wed, 14 Dec 2016 00:23:21 +0000 (16:23 -0800)]
Only persist last Shared Preferences state

If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.

For commit() we need to make sure that we have at least persisted the
state of the commit.

Generation counts are 64 bit, hence they never overflow.

Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
(cherry picked from commit 31d6889f4c89dd8498e2095f9d8a3c39fbd17c86)

7 years agoDefault Carrier app for traffic mitigation
fionaxu [Wed, 14 Dec 2016 01:15:11 +0000 (17:15 -0800)]
Default Carrier app for traffic mitigation

- have the basic function working, support traffic mitigation and
  captive portal login
- support carrier customization, OEM could configure a list of carrier
  actions to act upon certain signals
- unit test

Test: Manual test with live sim card & runtest --path
frameworks/base/packages/CarrierDefaultApp
Bug: 30958215

Change-Id: Ie99be3b95e8a1dd60fc51bef703836478fbde09d

7 years agoMerge "Add support for FDN contact dial" am: 082b118641
Robert Greenwalt [Thu, 12 Jan 2017 23:16:20 +0000 (23:16 +0000)]
Merge "Add support for FDN contact dial" am: 082b118641
am: 24dea10375

Change-Id: I5091d35ff79eff952c57109ce120369c95309598

7 years agoMerge "Add support for FDN contact dial"
Robert Greenwalt [Thu, 12 Jan 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add support for FDN contact dial"
am: 082b118641

Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc

7 years agoMerge "Add support for FDN contact dial"
Robert Greenwalt [Thu, 12 Jan 2017 23:06:59 +0000 (23:06 +0000)]
Merge "Add support for FDN contact dial"

7 years agoMerge "Revert "Don't offer the BT sharing option to the user if BT is disallowed...
Andre Eisenbach [Thu, 12 Jan 2017 16:44:42 +0000 (16:44 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e
am: 2d0ad3a9e7

Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01

7 years agoMerge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
Andre Eisenbach [Thu, 12 Jan 2017 16:27:03 +0000 (16:27 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
am: 0b9a18d21e

Change-Id: I245966c53c49da6c0b95b73ec72754d85edcd627

7 years agoMerge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
Andre Eisenbach [Thu, 12 Jan 2017 15:58:36 +0000 (15:58 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""

7 years agoRevert "Don't offer the BT sharing option to the user if BT is disallowed."
Andre Eisenbach [Thu, 12 Jan 2017 15:56:39 +0000 (15:56 +0000)]
Revert "Don't offer the BT sharing option to the user if BT is disallowed."

Causes boot loop issue:

02-15 02:31:59.785   770   770 E System  : Caused by: java.lang.IllegalArgumentException: Unknown component: com.android.bluetooth/com.android.bluetooth.opp.BluetoothOppLauncherActivity
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setEnabledSetting(PackageManagerService.java:18500)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setComponentEnabledSetting(PackageManagerService.java:18461)
02-15 02:31:59.785   770   770 E System  : .at android.app.ApplicationPackageManager.setComponentEnabledSetting(ApplicationPackageManager.java:2129)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.BluetoothManagerService.updateOppLauncherComponentState(BluetoothManagerService.java:2036)

This reverts commit 77fe44ffb6b5d40daf3b127cb36d5111b7618cc1.

Change-Id: Ia079bb2fcc91bb5979a3840ab50b9d9ddda1cf24

7 years agoMerge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part...
Mark Salyzyn [Thu, 12 Jan 2017 15:46:20 +0000 (15:46 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b
am: d1740f0f5b

Change-Id: I78430cd21cf1186ccc2b48ee4ee8a9b07decde5e

7 years agoMerge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part...
Mark Salyzyn [Thu, 12 Jan 2017 15:32:50 +0000 (15:32 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
am: 2225a0640b

Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966

7 years agoMerge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part...
Mark Salyzyn [Thu, 12 Jan 2017 15:18:25 +0000 (15:18 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"

7 years agoMerge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:33:15 +0000 (11:33 +0000)]
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a
am: 3556fd53a2

Change-Id: Idd321bad02683a94425fb2b6302f3f7621b6844f

7 years agoMerge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:27:32 +0000 (11:27 +0000)]
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"
am: c0d71fa38a

Change-Id: I43d1e2241bfcb1dde53390e21c94c44054375901

7 years agoMerge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"
Treehugger Robot [Thu, 12 Jan 2017 11:20:05 +0000 (11:20 +0000)]
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"

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 agoTrack libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 09:40:47 +0000 (09:40 +0000)]
Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d

java.util.regex named group capture support.

Test: vogar OldMatcherTest
Bug: 19717812
Change-Id: I525489bc26083b22bb2ce670d614f6d6e6eeaa29

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 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
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 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 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 agoReplace cutils/log.h and log/logger.h with android/log.h or log/log.h
Mark Salyzyn [Wed, 28 Sep 2016 23:15:30 +0000 (16:15 -0700)]
Replace cutils/log.h and log/logger.h with android/log.h or log/log.h
(part deux)

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I7417936c4d3666608fccfe51a312c90ecefba2fb

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 "[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 "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 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
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
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: 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
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: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 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 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 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

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

Change-Id: Ife1e626d722ba129cdcb6cd4a8f454cf28ca267c

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

Change-Id: I075e6c5224b374f2d03d711e4d5492d60e4da572

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

Change-Id: I458e354acf620cb434de41790ce94b814ff0a4ea

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

Change-Id: I7f13f7a7557288f2b5cc515b424161c946241d5a

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

Change-Id: I309923c247bef67ffbdba56955582f6decde3800

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

Change-Id: I191aeed8a7264bb13c4cef8b1ba135fd03a75d58

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

Change-Id: I67aba48784bca9a51f63e47b54c211ba535dd0e4

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

Change-Id: I94aca4959284912e6d5008f56617254be2fc3ea7

7 years agoMerge "Delete old WifiNotificationController strings." am: 6daef4499f
Stephen Chen [Wed, 11 Jan 2017 02:24:26 +0000 (02:24 +0000)]
Merge "Delete old WifiNotificationController strings." am: 6daef4499f
am: f412290e94

Change-Id: I40bfd75b95a299516d08b4fdf699317249156eda

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

Change-Id: I50378b1351a5ae83ac55f1b26e2e0c5f3230c6d2

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

Change-Id: I82246efd8e78c1c4ac18a67f0274b10545605207

7 years agoMerge "Zygote: Add fdsToIgnore"
Treehugger Robot [Wed, 11 Jan 2017 02:20:36 +0000 (02:20 +0000)]
Merge "Zygote: Add fdsToIgnore"

7 years agoMerge "Delete old WifiNotificationController strings."
Stephen Chen [Wed, 11 Jan 2017 02:20:14 +0000 (02:20 +0000)]
Merge "Delete old WifiNotificationController strings."
am: 6daef4499f

Change-Id: I20a68ca904cc0ad8042be61820808f4ff4680bee

7 years agoMerge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...
Treehugger Robot [Wed, 11 Jan 2017 02:15:28 +0000 (02:15 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...

* changes:
  Add an extra debug flag to BackgroundDexOptimizer
  Some refactoring in BackgroundDexOptService.
  Do not try to resolve realpath in DexManager.
  Log DexManager realpath errors only in debug mode.
  Record data about dex files use on disk
  Add logic for recording dex files use on disk