OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "LE Maximum Advertising Data Length (1/4)"
Jakub Pawlowski [Fri, 17 Mar 2017 05:19:57 +0000 (05:19 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)"
am: 74f2e1a303

Change-Id: I3b6599937ddd04a9c13573d156cc721152c0005a

7 years agoMerge "LE Maximum Advertising Data Length (1/4)"
Jakub Pawlowski [Fri, 17 Mar 2017 05:13:44 +0000 (05:13 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)"

7 years agoMerge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
Joel Scherpelz [Fri, 17 Mar 2017 02:53:11 +0000 (02:53 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
am: 52f8421b77

Change-Id: I5b5d5460f9fe7ed228ab32b2c63cb601be5e1edb

7 years agoMerge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
Treehugger Robot [Fri, 17 Mar 2017 02:44:07 +0000 (02:44 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"

7 years agoLE Maximum Advertising Data Length (1/4)
Jakub Pawlowski [Fri, 17 Mar 2017 01:22:36 +0000 (18:22 -0700)]
LE Maximum Advertising Data Length (1/4)

Add ability to check maximum advertising data length.

Bug: 30622771
Test: manual
Change-Id: I281f7e9f294c40a47a67a22809cc753b6693f7c4

7 years agoMerge "Bluetooth 5 AdvertisingSet implementation (1/4)"
Jakub Pawlowski [Fri, 17 Mar 2017 01:09:02 +0000 (01:09 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am: 15e69df921

Change-Id: I585fc900b4a153744116fa87764db98b038184d5

7 years agoMerge "Bluetooth 5 AdvertisingSet implementation (1/4)"
Treehugger Robot [Fri, 17 Mar 2017 01:01:15 +0000 (01:01 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"

7 years agoSet accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces
Joel Scherpelz [Wed, 15 Mar 2017 06:32:33 +0000 (15:32 +0900)]
Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces

This patch tries to change accept_ra_rt_info_max_plen to 64 from its
default value of 0 on kernels that support router advertisements with
route information options. The code fails silently on older unsupported
platforms.

Also factor existing startIPv6() code into a self documenting function
enableInterfaceIpv6PrivacyExtensions()

Bug: 33333670
Test: as follows
    - build sailfish
    - flashed
    - booted
    - runtest frameworks-net passes
    - runtest frameworks-wifi passes

Change-Id: I10ec83b9e04836089477d74417b7222499820066

7 years agoMerge "Add a flag that indicates whether in-band ringing is avalable"
Jack He [Fri, 17 Mar 2017 00:09:58 +0000 (00:09 +0000)]
Merge "Add a flag that indicates whether in-band ringing is avalable"
am: 41f5b61f5d

Change-Id: I25931f4ed056f6990c6ecb2d9f6629d89610c072

7 years agoMerge "Add a flag that indicates whether in-band ringing is avalable"
Treehugger Robot [Fri, 17 Mar 2017 00:00:16 +0000 (00:00 +0000)]
Merge "Add a flag that indicates whether in-band ringing is avalable"

7 years agoMerge "wifi: add a flag indicating legacy Passpoint configuration"
Peter Qiu [Thu, 16 Mar 2017 23:32:33 +0000 (23:32 +0000)]
Merge "wifi: add a flag indicating legacy Passpoint configuration"
am: 2d87679a11

Change-Id: I12bc10c8bf51df93ee7c2c7b770820ca7189527d

7 years agoMerge "wifi: add a flag indicating legacy Passpoint configuration"
Treehugger Robot [Thu, 16 Mar 2017 23:20:44 +0000 (23:20 +0000)]
Merge "wifi: add a flag indicating legacy Passpoint configuration"

7 years agoAdd a flag that indicates whether in-band ringing is avalable
Jack He [Thu, 16 Mar 2017 22:20:41 +0000 (15:20 -0700)]
Add a flag that indicates whether in-band ringing is avalable

* Add a flag in config.xml and symbols.xml to indicate whether in-band
  ringing is available on current platform

Bug: 19171297
Test: make, testplans/79248
Change-Id: I7eaa0d838ae25184502587d0bcc73f055d62170d

7 years agoBluetooth 5 AdvertisingSet implementation (1/4)
Jakub Pawlowski [Wed, 15 Mar 2017 19:34:03 +0000 (12:34 -0700)]
Bluetooth 5 AdvertisingSet implementation (1/4)

This patch wires up fist methods of AdvertisingSet, making it possible
to start advertising and stop advertising. It also replaces legacy
implemementation with calls to new implementation.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I80a4b1b2b632d5ef8a80d958615897684cfa0c16

7 years agoMerge "Added configuration for VT downgrade/tear down when data disabled"
Brad Ebinger [Thu, 16 Mar 2017 21:28:37 +0000 (21:28 +0000)]
Merge "Added configuration for VT downgrade/tear down when data disabled"
am: 0463a7d38e

Change-Id: I4cdb29ef1d2dfd79bb9cf567fda83d56e6f658e4

7 years agoMerge "Added configuration for VT downgrade/tear down when data disabled"
Brad Ebinger [Thu, 16 Mar 2017 19:52:08 +0000 (19:52 +0000)]
Merge "Added configuration for VT downgrade/tear down when data disabled"

7 years agoMerge "Add HwParcel::releaseParcel()"
Martijn Coenen [Thu, 16 Mar 2017 19:42:45 +0000 (19:42 +0000)]
Merge "Add HwParcel::releaseParcel()"
am: 210b9afe64

Change-Id: If08cb12187e9694144d5c07d9f6fcd67142b8af9

7 years agoMerge "Add HwParcel::releaseParcel()"
Martijn Coenen [Thu, 16 Mar 2017 19:35:56 +0000 (19:35 +0000)]
Merge "Add HwParcel::releaseParcel()"

7 years agoAdd HwParcel::releaseParcel()
Martijn Coenen [Thu, 16 Mar 2017 17:46:42 +0000 (18:46 +0100)]
Add HwParcel::releaseParcel()

To be able to free native Parcel objects as soon
as a transaction is done.

Test: hidl_test_java
Bug: 36088202
Change-Id: I50b3eb7e9fe06958c64575923730d3467e73b9a5

7 years agoAdded configuration for VT downgrade/tear down when data disabled
Jack Yu [Wed, 16 Nov 2016 00:16:21 +0000 (16:16 -0800)]
Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: I5c71fc9336b39f114a924861a766ca5cb93d4c69
Change-Id: I5c71fc9336b39f114a924861a766ca5cb93d4c69

7 years agoMerge "Set system server's class loader for wrap.system_server"
tony.ys_liu [Thu, 16 Mar 2017 15:42:53 +0000 (15:42 +0000)]
Merge "Set system server's class loader for wrap.system_server"
am: 8d2d6bfa12

Change-Id: Iba4af152c9f29ad6e8c9bb1b0a1047e96d287c6b

7 years agoMerge "Set system server's class loader for wrap.system_server"
Treehugger Robot [Thu, 16 Mar 2017 15:33:32 +0000 (15:33 +0000)]
Merge "Set system server's class loader for wrap.system_server"

7 years agoMerge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running."
Elliott Hughes [Thu, 16 Mar 2017 05:40:47 +0000 (05:40 +0000)]
Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running."
am: ef9c425416

Change-Id: I0ea94267a6d6cfa137e77edde288632d04a71bcd

7 years agoMerge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running."
Elliott Hughes [Thu, 16 Mar 2017 05:31:23 +0000 (05:31 +0000)]
Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running."

7 years agoMerge "Support Signal strength offset"
Sooraj Sasindran [Thu, 16 Mar 2017 03:19:37 +0000 (03:19 +0000)]
Merge "Support Signal strength offset"
am: 98d499877f

Change-Id: I3087c3f8d6f975f399dfcf8aa8dd734f78caf69f

7 years agoMerge "Support Signal strength offset"
Sooraj Sasindran [Thu, 16 Mar 2017 03:13:29 +0000 (03:13 +0000)]
Merge "Support Signal strength offset"

7 years agoMerge "Add blocking and retrying wrappers for INetd uses."
Erik Kline [Thu, 16 Mar 2017 02:49:36 +0000 (02:49 +0000)]
Merge "Add blocking and retrying wrappers for INetd uses."
am: ba8c613e16

Change-Id: Iae8ea51852ed6991e3b9ed89297c8a932b9224f3

7 years agoMerge "Add blocking and retrying wrappers for INetd uses."
Treehugger Robot [Thu, 16 Mar 2017 02:42:15 +0000 (02:42 +0000)]
Merge "Add blocking and retrying wrappers for INetd uses."

7 years agoMerge "integrate portal webview to the default app"
Chen Xu [Thu, 16 Mar 2017 00:02:28 +0000 (00:02 +0000)]
Merge "integrate portal webview to the default app"
am: e3ece71f2e

Change-Id: I3c46e8bd47d087701b3c643e59bc9e373dab00bb

7 years agoMerge "integrate portal webview to the default app"
Chen Xu [Wed, 15 Mar 2017 23:52:52 +0000 (23:52 +0000)]
Merge "integrate portal webview to the default app"

7 years agoSet system server's class loader for wrap.system_server
tony.ys_liu [Wed, 14 Dec 2016 10:50:29 +0000 (18:50 +0800)]
Set system server's class loader for wrap.system_server

Root Cause: systemServer's class path is not set
  after set wrap.system_server property, and restart system_server,
  it shows a java.lang.RuntimeException:
    Missing class when invoking static main com.android.server.SystemServer

Solution: Correctly pass and parse a passed classpath.

Bug: 34692265
Test: adb root && adb shell stop && adb shell setprop wrap.system_server logwrapper && adb shell start
Change-Id: Ia6707dc05fa627af6cc28360d26b894487a6eff1

7 years agoSupport Signal strength offset
Sooraj Sasindran [Thu, 9 Mar 2017 07:43:17 +0000 (23:43 -0800)]
Support Signal strength offset

Support feature to offset LTE rsrp
for higher freaquency lte bands.

Test: Verified on device that signal bars increased
Bug=30628343
Merged-In: Id0b54901a1e8832fb48ba509e6a380c43f4c9497
Change-Id: Id0b54901a1e8832fb48ba509e6a380c43f4c9497

7 years agointegrate portal webview to the default app
fionaxu [Fri, 10 Mar 2017 18:16:09 +0000 (10:16 -0800)]
integrate portal webview to the default app

Based on the UX review feedback, we plan to implement portal webview
function inside the carrier default app instead of reusing the existing
portal app. This will give us more flexibility and control, also will
improve UX flow by getting rid of the some unwanted dialogues.

new added CaptivePortalLoginActivity is a copy paste from
com.android.captiveportallogin/CaptivePortalLoginActivity combined
with logic from deleted LaunchCaptivePortalActivity.
All webview UI was inherited from com.android.captiveportal

Test: Manual
Bug: 36002256
Merged-in: I2627d5a43039ce433006c058bb4f2c1a39113e59
Change-Id: If422fa12c5f24d9b9e2c9380b3edf94df74bb85f

7 years agoMerge "WiFi: Wifi service get configured networks use ParceledListSlice."
Roshan Pius [Wed, 15 Mar 2017 20:43:52 +0000 (20:43 +0000)]
Merge "WiFi: Wifi service get configured networks use ParceledListSlice."
am: 8b549c9539

Change-Id: I9ccfbfcf17590284aedd4449022b107c37e5aef2

7 years agoMerge "WiFi: Wifi service get configured networks use ParceledListSlice."
Roshan Pius [Wed, 15 Mar 2017 20:34:33 +0000 (20:34 +0000)]
Merge "WiFi: Wifi service get configured networks use ParceledListSlice."

7 years agoMerge "PackageManagerService: Fix ABI adjustment logging"
Andreas Gampe [Wed, 15 Mar 2017 20:06:36 +0000 (20:06 +0000)]
Merge "PackageManagerService: Fix ABI adjustment logging"
am: 844be62eef

Change-Id: I35f0affaef73033c37798eba41dfc1b992187176

7 years agoRestore SystemProperties.PROP_NAME_MAX to keep Kindle running.
Elliott Hughes [Wed, 15 Mar 2017 20:01:53 +0000 (13:01 -0700)]
Restore SystemProperties.PROP_NAME_MAX to keep Kindle running.

The limit has been lifted in O, but without this constant, Kindle crashes here:

  Caused by: java.lang.NoSuchFieldException: PROP_NAME_MAX
    at java.lang.Class.getField(Class.java:1607)
    at com.amazon.android.webkit.AmazonWebKitFactories$Implementation.<clinit>(AmazonWebKitFactories.java:59)

The code seems to want to truncate a system property name to avoid the
exception that SystemProperty.get threw if passed a name that was too long.

Bug: http://b/36095274
Test: select a word in Kindle
Change-Id: Id1881a8a7c6386400a1024beb0d1b741bdaefba7

7 years agoMerge "PackageManagerService: Fix ABI adjustment logging"
Treehugger Robot [Wed, 15 Mar 2017 19:54:09 +0000 (19:54 +0000)]
Merge "PackageManagerService: Fix ABI adjustment logging"

7 years agoPackageManagerService: Fix ABI adjustment logging
Andreas Gampe [Wed, 15 Mar 2017 17:09:57 +0000 (10:09 -0700)]
PackageManagerService: Fix ABI adjustment logging

Fix logging of "Adjusting ABI" to be tolerant to null
packages.

Bug: 36172429
Test: m
Test: manual
Change-Id: Ic6b9a8e09e58dce6be97e464fe3986c709f820de

7 years agoMerge "Change Czech Republic to Czechia"
Joachim Sauer [Wed, 15 Mar 2017 11:57:28 +0000 (11:57 +0000)]
Merge "Change Czech Republic to Czechia"
am: 027a67062e

Change-Id: I51fc6fde5647b1fd8ecc677da7f6ec7a248a3b38

7 years agoMerge "Change Czech Republic to Czechia"
Treehugger Robot [Wed, 15 Mar 2017 11:45:43 +0000 (11:45 +0000)]
Merge "Change Czech Republic to Czechia"

7 years agoAdd blocking and retrying wrappers for INetd uses.
Erik Kline [Tue, 14 Mar 2017 08:40:00 +0000 (17:40 +0900)]
Add blocking and retrying wrappers for INetd uses.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes

Change-Id: I1a8e15149bf9dbedc6a09c0d8ab6abb2ef4f8fee

7 years agoMerge "Add comment with packet tracker debugging tip"
Erik Kline [Wed, 15 Mar 2017 02:38:51 +0000 (02:38 +0000)]
Merge "Add comment with packet tracker debugging tip"
am: 40aa5ee583

Change-Id: I0f5f139f81af23ddc33e37ddf489a477e37c394f

7 years agoMerge "Add comment with packet tracker debugging tip"
Treehugger Robot [Wed, 15 Mar 2017 02:28:06 +0000 (02:28 +0000)]
Merge "Add comment with packet tracker debugging tip"

7 years agoMerge "hotspot2: update documentation for WifiManager#queryPasspointIcon"
Peter Qiu [Tue, 14 Mar 2017 23:07:28 +0000 (23:07 +0000)]
Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon"
am: 6493f3df6b

Change-Id: I40fc13a08425f2ada7e648342db92d83c4d59cba

7 years agoMerge "hotspot2: update documentation for WifiManager#queryPasspointIcon"
Treehugger Robot [Tue, 14 Mar 2017 22:45:56 +0000 (22:45 +0000)]
Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon"

7 years agoMerge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLo...
Svetoslav Ganov [Tue, 14 Mar 2017 19:07:22 +0000 (19:07 +0000)]
Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"
am: 14c7e67da8

Change-Id: Icfa9fc501806820545dd9df9d671fcdfe645b73f

7 years agoMerge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLo...
Svetoslav Ganov [Tue, 14 Mar 2017 18:58:28 +0000 (18:58 +0000)]
Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"

7 years agoMerge changes from topics 'Passpoint API update', 'Passpoint intent update'
Peter Qiu [Tue, 14 Mar 2017 16:24:11 +0000 (16:24 +0000)]
Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
am: 5df03b3d74

Change-Id: Ic1822a3203da5522a5a103c34fb45a6498cd6428

7 years agohotspot2: hide validate method for Passpoint configuration
Peter Qiu [Tue, 14 Mar 2017 16:22:28 +0000 (16:22 +0000)]
hotspot2: hide validate method for Passpoint configuration
am: b5ca6f36b5

Change-Id: I268b0db6c844ec1746b6374c87768f233b719b3f

7 years agoOsu: temporarily comment out the usage of deprecated intent definitions
Peter Qiu [Tue, 14 Mar 2017 16:21:06 +0000 (16:21 +0000)]
Osu: temporarily comment out the usage of deprecated intent definitions
am: 06b63dcb9f

Change-Id: I6c418dbecc72ac5c4e245fff06fabfe23b443c23

7 years agohotspot2: update Passpoint intent definitions
Peter Qiu [Tue, 14 Mar 2017 16:19:19 +0000 (16:19 +0000)]
hotspot2: update Passpoint intent definitions
am: 5679145d9a

Change-Id: I4e59efbcd9a9d33ceac8cc359155770c2de5a0fd

7 years agoMerge changes from topics 'Passpoint API update', 'Passpoint intent update'
Treehugger Robot [Tue, 14 Mar 2017 16:07:46 +0000 (16:07 +0000)]
Merge changes from topics 'Passpoint API update', 'Passpoint intent update'

* changes:
  hotspot2: update Passpoint configuration management APIs
  hotspot2: hide validate method for Passpoint configuration
  Osu: temporarily comment out the usage of deprecated intent definitions
  hotspot2: update Passpoint intent definitions

7 years agoAdd comment with packet tracker debugging tip
Erik Kline [Tue, 14 Mar 2017 11:03:14 +0000 (20:03 +0900)]
Add comment with packet tracker debugging tip

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - "adb shell dumpsys wifi ipmanager" shows the debugging tip

Change-Id: Ifcccbdd81a0fc8beb7801ec7c3f78e8a941bc72b

7 years agoMerge "Address some comments on IpManagerTest"
Erik Kline [Tue, 14 Mar 2017 06:08:34 +0000 (06:08 +0000)]
Merge "Address some comments on IpManagerTest"
am: b2afa1ede5

Change-Id: Ic986c23c693757b8311e0de0c0a94281db67f62d

7 years agoMerge "Address some comments on IpManagerTest"
Treehugger Robot [Tue, 14 Mar 2017 06:00:34 +0000 (06:00 +0000)]
Merge "Address some comments on IpManagerTest"

7 years agoAddress some comments on IpManagerTest
Erik Kline [Tue, 14 Mar 2017 04:00:27 +0000 (13:00 +0900)]
Address some comments on IpManagerTest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 26991160
Change-Id: Ib543874188537e31422206d67d1760762a7c85cd

7 years agoMerge "Skeleton of an IpManagerTest"
Erik Kline [Tue, 14 Mar 2017 03:11:15 +0000 (03:11 +0000)]
Merge "Skeleton of an IpManagerTest"
am: db4333a2c2

Change-Id: I5817c2458c222afb85389deaf22b43d245577b2a

7 years agoMerge "Skeleton of an IpManagerTest"
Treehugger Robot [Tue, 14 Mar 2017 03:02:19 +0000 (03:02 +0000)]
Merge "Skeleton of an IpManagerTest"

7 years agoSkeleton of an IpManagerTest
Erik Kline [Tue, 14 Mar 2017 01:01:58 +0000 (10:01 +0900)]
Skeleton of an IpManagerTest

Test: as follows
    - biult (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 26991160
Change-Id: Idddddf0c1a7a8d0a8acff8a5526b02a533d5f3ec

7 years agoMerge "carrier default app notification polish"
fionaxu [Tue, 14 Mar 2017 01:10:51 +0000 (01:10 +0000)]
Merge "carrier default app notification polish"
am: b2bb98e62d

Change-Id: I78101dd7dc4bd7f222c5e6cc095b7179ce03f362

7 years agoMerge "carrier default app notification polish"
Treehugger Robot [Tue, 14 Mar 2017 00:55:05 +0000 (00:55 +0000)]
Merge "carrier default app notification polish"

7 years agocarrier default app notification polish
fionaxu [Mon, 13 Mar 2017 23:01:12 +0000 (16:01 -0700)]
carrier default app notification polish

change notification string and app name

Bug: 36002256
Test: Manual
Change-Id: Iec2658850522585157bdc7edd7330ac930bf751d

7 years agohotspot2: update Passpoint configuration management APIs
Peter Qiu [Mon, 6 Mar 2017 18:47:55 +0000 (10:47 -0800)]
hotspot2: update Passpoint configuration management APIs

Address API Councils comment to update both
WifiManager#addOrUpdatePasspointConfiguration and
WifiManager#removePasspointConfiguration to return void and throw
exception on failure instead of returning a boolean.

Bug: 35858311,35856174
Test: make -j32
Change-Id: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
Merged-In: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95

7 years agohotspot2: hide validate method for Passpoint configuration
Peter Qiu [Fri, 3 Mar 2017 17:15:49 +0000 (09:15 -0800)]
hotspot2: hide validate method for Passpoint configuration

The validate method is used by Framework only, no need to expose
to app developers. So hide it.

Bug: 35756298
Test: make -j32
Change-Id: I15ccae472f30d7ae968816479f6ea35d90248fe0
Merged-In: I15ccae472f30d7ae968816479f6ea35d90248fe0

7 years agoOsu: temporarily comment out the usage of deprecated intent definitions
Peter Qiu [Mon, 13 Mar 2017 18:19:43 +0000 (11:19 -0700)]
Osu: temporarily comment out the usage of deprecated intent definitions

Bug: 35857805
Test: mmma frameworks/base/packages/Osu
Change-Id: Iadaede1806cfe7bcaf57ed185618a6de4451e321
Merged-In: Ie4ea352e11b10a7c1f8780557554486bc2b4fcef

7 years agoMerge "Bluetooth 5 spelling fixes"
Jakub Pawlowski [Mon, 13 Mar 2017 18:11:58 +0000 (18:11 +0000)]
Merge "Bluetooth 5 spelling fixes"
am: 5465fe0a2d

Change-Id: Ibef8ee6a56bf1f8c695e07e4ba61c015054eee13

7 years agoMerge "Bluetooth 5 spelling fixes"
Jakub Pawlowski [Mon, 13 Mar 2017 17:58:25 +0000 (17:58 +0000)]
Merge "Bluetooth 5 spelling fixes"

7 years agoBluetooth 5 spelling fixes
Jakub Pawlowski [Sat, 11 Mar 2017 00:07:59 +0000 (16:07 -0800)]
Bluetooth 5 spelling fixes

Bug: 30622771
Test: manual
Change-Id: I46b6486619cc7366e56b25ca48937e6792f53e1d
(cherry picked from commit 53501ad210dd5c65c7910a6b75b2b481e92dd22f)

7 years agoMerge "Fix the reset of boosted zygote thread priority."
Hiroshi Yamauchi [Mon, 13 Mar 2017 17:42:50 +0000 (17:42 +0000)]
Merge "Fix the reset of boosted zygote thread priority."
am: 83aceea07d

Change-Id: I6ebd30a631ae10ada65b3279ec66c41d3f50fb1f

7 years agohotspot2: update Passpoint intent definitions
Peter Qiu [Thu, 2 Mar 2017 17:35:34 +0000 (09:35 -0800)]
hotspot2: update Passpoint intent definitions

Address API Councils comment on the newly added intent definitions
for Passpoint events:
- Use a Parcelable class to represent icon info
- Document all extras that are included for an action
- Document that the new intents will only be sent to registered
  receivers, and not manifest receivers
- Rename extras to be more generic

While there, removed the deprecated hidden Passpoint intent
definitions.

Bug: 35857805
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
Merged-In: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5

7 years agoMerge "Fix the reset of boosted zygote thread priority."
Hiroshi Yamauchi [Mon, 13 Mar 2017 17:32:30 +0000 (17:32 +0000)]
Merge "Fix the reset of boosted zygote thread priority."

7 years agoFix the reset of boosted zygote thread priority.
Hiroshi Yamauchi [Thu, 2 Mar 2017 21:39:07 +0000 (13:39 -0800)]
Fix the reset of boosted zygote thread priority.

This fixes the unexpected priority 112 of the daemon threads
(eg. HeapTaskDaemon). The problem was that when the zygote main
thread's priority is reset, it directly calls setpriority() and fails
to update the priority value in java.lang.Thread, which in turn causes
any threads created by the thread to unexpectedly inherit the boosted
priority. Calling java.lang.Thread.setPriority instead fixes.

(cherry picked from commit 1e3db871e52e59c69edb1843df7f4aecb030bc6f)

Bug: 35801778
Bug: 28866384
Test: angler master userdebug boots and thread priorities checked.

Change-Id: I68a6ed7244a9067acc2749feca7f88422bf44b02

7 years agoWiFi: Wifi service get configured networks use ParceledListSlice.
zhangshuxiao [Mon, 13 Mar 2017 13:39:16 +0000 (21:39 +0800)]
WiFi: Wifi service get configured networks use ParceledListSlice.

The number of configurations will be more and more, some
users configured more than 600KB or even 1M, It will cause
the binder failed. Therefore, we use ParceledListSlice
to splits into multiple transactions when more than 64K.

binder: 1885: binder_alloc_buf size 1058080 failed, no address space

Test: more than 500 configurations.

Change-Id: I35b8bac478c6d9efa2fb8572fdc7ca22eb910609
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>
7 years agoMerge "Minor formatting cleanup to remove overlong line"
Hugo Benichi [Mon, 13 Mar 2017 07:31:54 +0000 (07:31 +0000)]
Merge "Minor formatting cleanup to remove overlong line"
am: d6998d4bd6

Change-Id: I3a4582ebfc1cb7436e570e37cacbc3cabf8c0182

7 years agoMerge "Minor formatting cleanup to remove overlong line"
Hugo Benichi [Mon, 13 Mar 2017 07:23:05 +0000 (07:23 +0000)]
Merge "Minor formatting cleanup to remove overlong line"

7 years agoMerge "ConnectivityManager: unhide methods with Handler argument"
Hugo Benichi [Mon, 13 Mar 2017 07:09:49 +0000 (07:09 +0000)]
Merge "ConnectivityManager: unhide methods with Handler argument"
am: e940d5458d

Change-Id: I470d68a25e62b9493ac7cfb5887e8345968f1097

7 years agoMerge "ConnectivityManager: unhide methods with Handler argument"
Hugo Benichi [Mon, 13 Mar 2017 06:58:29 +0000 (06:58 +0000)]
Merge "ConnectivityManager: unhide methods with Handler argument"

7 years agoMerge "Simple cleanups to Tethering"
Hugo Benichi [Mon, 13 Mar 2017 00:14:55 +0000 (00:14 +0000)]
Merge "Simple cleanups to Tethering"
am: 7eaa2ad172

Change-Id: I3bb7e4756eaa0b7e702ff7270beb7420b7b6aac5

7 years agoMerge "Simple cleanups to Tethering"
Hugo Benichi [Mon, 13 Mar 2017 00:03:58 +0000 (00:03 +0000)]
Merge "Simple cleanups to Tethering"

7 years agoMerge "Move mac_permissions to etc/selinux"
Jeff Vander Stoep [Sat, 11 Mar 2017 23:30:01 +0000 (23:30 +0000)]
Merge "Move mac_permissions to etc/selinux"
am: b063fe384f

Change-Id: Ia6da81ff48e749c8d3f4f150e81fc0c138e7763e

7 years agoMerge "Move mac_permissions to etc/selinux"
Treehugger Robot [Sat, 11 Mar 2017 23:23:09 +0000 (23:23 +0000)]
Merge "Move mac_permissions to etc/selinux"

7 years agoMove mac_permissions to etc/selinux
Jeff Vander Stoep [Sat, 11 Mar 2017 00:01:19 +0000 (16:01 -0800)]
Move mac_permissions to etc/selinux

Test: Build and boot Marlin
Test: See the following in the logs:
01-01 02:10:28.756  1345  1345 D SELinuxMMAC: Using policy file /system/etc/selinux/plat_mac_permissions.xml
01-01 02:10:28.787  1345  1345 D SELinuxMMAC: Using policy file /vendor/etc/selinux/nonplat_mac_permissions.xml
Bug: 36003167

Change-Id: I97479260eabe14c1b1dcc238d7322016f6b5c4dd

7 years agoMerge "Add a config for WiFi exponential backoff scan base interval"
Randy Pan [Fri, 10 Mar 2017 23:08:15 +0000 (23:08 +0000)]
Merge "Add a config for WiFi exponential backoff scan base interval"
am: c25e2b79b1

Change-Id: Ic924e478f1278ab0873f33984d3026a5ec63c91c

7 years agoMerge "Add a config for WiFi exponential backoff scan base interval"
Treehugger Robot [Fri, 10 Mar 2017 22:58:52 +0000 (22:58 +0000)]
Merge "Add a config for WiFi exponential backoff scan base interval"

7 years agowifi: add a flag indicating legacy Passpoint configuration
Peter Qiu [Fri, 10 Mar 2017 21:56:33 +0000 (13:56 -0800)]
wifi: add a flag indicating legacy Passpoint configuration

Bug: 36101691
Test: make -j32
Change-Id: I42df3160be9b2b863fededc1641482e5a39084e5

7 years agoMerge "Refactor code incompatible with Mockito 2.7.13"
Paul Duffin [Fri, 10 Mar 2017 20:43:07 +0000 (20:43 +0000)]
Merge "Refactor code incompatible with Mockito 2.7.13"
am: 2a3a4f81f9

Change-Id: I259dc2116f1ba7d409729d739404dca501f4a5e8

7 years agoMerge "Refactor code incompatible with Mockito 2.7.13"
Paul Duffin [Fri, 10 Mar 2017 20:33:20 +0000 (20:33 +0000)]
Merge "Refactor code incompatible with Mockito 2.7.13"

7 years agoAdd a config for WiFi exponential backoff scan base interval
Randy Pan [Fri, 10 Mar 2017 17:40:39 +0000 (09:40 -0800)]
Add a config for WiFi exponential backoff scan base interval

Bug: 36026947
Test: bulid and boot up the phone
Change-Id: I4971c1c7d0fc162ac5934becbdf28fba50d65c11

7 years agoMerge "[AWARE] Update network API: make open/encrypted explicit"
Etan Cohen [Fri, 10 Mar 2017 17:13:42 +0000 (17:13 +0000)]
Merge "[AWARE] Update network API: make open/encrypted explicit"
am: 3dee29581e

Change-Id: Ia77ef6835da6497a1641e1fda3e8de67f86b6690

7 years agoMerge "[AWARE] Update network API: make open/encrypted explicit"
Etan Cohen [Fri, 10 Mar 2017 17:03:20 +0000 (17:03 +0000)]
Merge "[AWARE] Update network API: make open/encrypted explicit"

7 years agoRefactor code incompatible with Mockito 2.7.13
Paul Duffin [Thu, 9 Mar 2017 18:49:41 +0000 (18:49 +0000)]
Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Merged-In: I96e3da967fad731fc8f39bde9db95f50ab7353fb
Change-Id: I445b32432eea8a1ccb2060a73460a882a9ebe76f

7 years agoMerge "polish the notification of the default carrier app"
fionaxu [Fri, 10 Mar 2017 09:52:22 +0000 (09:52 +0000)]
Merge "polish the notification of the default carrier app"
am: b224b318a0

Change-Id: I4bb9f08d155def15a79a4960f05650cb5d7615fd

7 years agoMerge "polish the notification of the default carrier app"
Treehugger Robot [Fri, 10 Mar 2017 09:44:02 +0000 (09:44 +0000)]
Merge "polish the notification of the default carrier app"

7 years agoMerge "decouple carrierdefaultapp from phone process"
fionaxu [Fri, 10 Mar 2017 09:40:59 +0000 (09:40 +0000)]
Merge "decouple carrierdefaultapp from phone process"
am: e32fc81c5d

Change-Id: I3b03e57609ab649f01a45a6b70edca1402f80b3e

7 years agoMerge "decouple carrierdefaultapp from phone process"
Treehugger Robot [Fri, 10 Mar 2017 09:33:08 +0000 (09:33 +0000)]
Merge "decouple carrierdefaultapp from phone process"

7 years agodecouple carrierdefaultapp from phone process
fionaxu [Fri, 10 Mar 2017 06:25:29 +0000 (22:25 -0800)]
decouple carrierdefaultapp from phone process

Bug: 36114351
Test: Manual
Change-Id: I679d97bd9854fe478499d1fac6225c3f954ecdbc

7 years agoSimple cleanups to Tethering
Hugo Benichi [Fri, 10 Mar 2017 05:20:57 +0000 (14:20 +0900)]
Simple cleanups to Tethering

- regroup together static final class fields, final instance fields, and
  mutable instance fields.
- uses correct Android naming conventions for instance fields.
- reorder imports correctly.

Test: no functional change.
Change-Id: If3d73bc28972a004c2ba3cc14d869a2a679abfce

7 years agoMerge "Disable a phone number log for user build"
Brad Ebinger [Thu, 9 Mar 2017 21:46:39 +0000 (21:46 +0000)]
Merge "Disable a phone number log for user build"
am: 59a40691a5

Change-Id: I9b2a14b29fe5e096b734b6e3f1d4b65806753646

7 years agoMerge "Disable a phone number log for user build"
Brad Ebinger [Thu, 9 Mar 2017 21:38:59 +0000 (21:38 +0000)]
Merge "Disable a phone number log for user build"