Commit Graph

78602 Commits

Author SHA1 Message Date
Robert Quattlebaum
eadb452d72 NetworkCapabilities: Added support for TRANSPORT_LOWPAN
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.

Bug: b/33073713
Test: builds
Change-Id: I50d9b8df1a0270e06c28f001adf6c52a142a85af
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689

(cherry pick from commit 557e0c38b9)
2017-07-11 15:52:37 +09:00
Ruchi Kandoi
4d08be4a52 Merge changes from topic 'NCI-2.0'
am: 430dded515

Change-Id: I264533bf8782ea66bd6959ca08f9699985273c9f
2017-07-06 22:48:20 +00:00
Love Khanna
93d313b0a0 NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
am: e7ecebae11

Change-Id: Ic91ecb6a8dcb8529efda8eb0cdc99ca7758b66e6
2017-07-06 22:47:08 +00:00
Ruchi Kandoi
430dded515 Merge changes from topic 'NCI-2.0'
* changes:
  AID suffix registration.
  NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
2017-07-06 22:41:29 +00:00
Fyodor Kupolov
481d92c517 Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a
2017-07-06 18:21:54 +00:00
Fyodor Kupolov
09b6988e27 Merge "Fix ContentObserver unregister issue" 2017-07-06 18:07:04 +00:00
Love Khanna
e910e8bf86 AID suffix registration.
Test: compiles.

Change-Id: I0ab02599814722055d77eef29e734bfd45e8d1ee
2017-07-06 10:31:27 -07:00
Mathieu Chartier
b355b7f446 Merge "ProcessStats: fix uss average value offset" 2017-07-06 03:13:52 +00:00
daqi
2df4e144a9 Fix ContentObserver unregister issue
[Cause of Defect]
In the ContentObserver callback procedure, the binder thread
has no sync mechanism with handler thread.
The ContentObserver#onChange method can get called after
ContentResolver#unregisterContentObserver called in the
very low probability.

Bug: https://issuetracker.google.com/issues/63154326
Test: manual - check https://github.com/nanjingdaqi/ContentObserverDemo
Change-Id: I0e3831eba7a9cc1a5bf0d30abe5dd0ec8259b0d4
Signed-off-by: daqi <daqi@xiaomi.com>
2017-07-06 10:09:21 +08:00
Hugo Benichi
0537f16516 Merge "ConnectivityManager: allow usage of TYPE_NONE"
am: 279f32ded5

Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962
2017-07-05 14:33:35 +00:00
Hugo Benichi
16f0a9436a ConnectivityManager: allow usage of TYPE_NONE
This patch allows to use TYPE_NONE for the legacy network type variable
of NetworkInfo. This usage is "safe" with respect to legacy APIs using
network types as most of them already returns null or do nothing for
TYPE_NONE.

Of the existing APIs in ConnectivityManager that accept a network type
argument, those which were already returning null or doing nothing for
TYPE_NONE are:
  getNetworkInfo(int)
  getNetworkForType(int)
  stopUsingNetworkFeature(int, String)
  networkCapabilitiesForType(int)
  requestRouteToHostAddress(int, InetAddress)
  reportInetCondition(int, int)
  isNetworkSupported(int)
  getLinkProperties(int)

Only setProvisioningNotificationVisible needs an additional guard
against TYPE_NONE.

Bug: 30088447
Bug: 62844794
Test: runtest frameworks-net
Change-Id: I112596fcd03d3c2cd42a2a84d265adb38e3944bb
2017-07-05 21:30:52 +09:00
Roland Levillain
d3f26b6731 Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
am: 10c314e19a

Change-Id: I49221522c1a9a6e7d4ae72529c1a47b736e26a39
2017-07-04 11:31:30 +00:00
Roland Levillain
afd69a0d57 Revert "ConnectivityManager: allow usage of TYPE_NONE"
This CL is breaking some internal builds.

This reverts commit 726931ebf4.

Change-Id: Ie79214808d84c73f54a525f515b4c90a3fb23542
2017-07-04 11:14:03 +00:00
Hugo Benichi
2c856480a0 Merge changes I90c211dc,I4455f272
am: a0ff4efc8b

Change-Id: I502d978ff636a00979d2083c39381bf600d3d6da
2017-07-04 09:35:51 +00:00
Treehugger Robot
a0ff4efc8b Merge changes I90c211dc,I4455f272
* changes:
  ConnectivityServiceTest: more informative assert failures
  ConnectivityManager: allow usage of TYPE_NONE
2017-07-04 09:22:07 +00:00
Hugo Benichi
726931ebf4 ConnectivityManager: allow usage of TYPE_NONE
This patch allows to use TYPE_NONE for the legacy network type variable
of NetworkInfo. This usage is "safe" with respect to legacy APIs using
network types as most of them already returns null or do nothing for
TYPE_NONE.

Of the existing APIs in ConnectivityManager that accept a network type
argument, those which were already returning null or doing nothing for
TYPE_NONE are:
  getNetworkInfo(int)
  getNetworkForType(int)
  stopUsingNetworkFeature(int, String)
  networkCapabilitiesForType(int)
  requestRouteToHostAddress(int, InetAddress)
  reportInetCondition(int, int)
  isNetworkSupported(int)
  getLinkProperties(int)

Only setProvisioningNotificationVisible needs an additional guard
against TYPE_NONE.

Bug: 30088447
Bug: 62844794
Test: runtest frameworks-net
Change-Id: I4455f2726d06406047086368628c1f253d854d8d
2017-07-04 16:22:59 +09:00
Neil Fuller
06c2f8e346 Merge "Add dumpsys support to RulesManagerService"
am: 348a1d635d

Change-Id: Ib1b44ce174b625f2223dff72081ccfc7b2a9b390
2017-07-03 09:41:47 +00:00
Neil Fuller
87b1128ddc Add dumpsys support to RulesManagerService
Override the dump method so RuleManagerService can dump its state
into logs. Crude argument support has been added for dumping
specific fields in an easy to process way (for test scripts to use).

Tested with:
make -j30 FrameworksServicesTests
adb install -r -g \
  "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
  com.android.frameworks.servicestests \
  "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above.
Test: Manual; adb shell dumpsys timezone [-format_state piscotz]
Bug: 31008728
Change-Id: I0ad83aa245232ed0b983ceacd8accfb876824d6f
2017-06-30 18:18:07 +01:00
ShuJie Wang
7999f4bc2f ProcessStats: fix uss average value offset
Test: make framework -j8

Change-Id: If8f9c46293bb36fbbd2ebde5eace2d45cc6d4a12
Signed-off-by: ShuJie Wang <wangshujie@xiaomi.com>
2017-06-30 18:03:39 +08:00
Love Khanna
e7ecebae11 NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
As per NCI2.0 LF_T3T_PMM is a part of LF_T3T_IDENTIFIER.
Since it is required for each LF_T3T_IDENTIFIER entry,
It can be taken from application.

Test: Compiles.

Change-Id: Icc168592c292d869a4c331dd28fe43b4d75c9a41
2017-06-29 18:45:49 -07:00
Jack He
9fd5d0da1e Merge "Support battery level reporting via Apple VSC (1/2)"
am: 874af710b7

Change-Id: Id65e6e11308c66893cb701af8909df9fee3a131f
2017-06-29 17:53:10 +00:00
Jack He
679d0bc8f9 Support battery level reporting via Apple VSC (1/2)
* Add related constants to BluetoothHeadset

Bug: 35874078
Test: make, test with supporting headsets
Change-Id: I9f49ea28efdf6de0e751a377d879fe13a47655d5
2017-06-29 17:43:32 +00:00
Jack He
c286110c1a Merge "Support battery level reporting via Plantronics XEVENT (1/2)"
am: c79c4240ec

Change-Id: I6aa50e541763adfa9ebe738d98d86152cf0cd1d5
2017-06-29 17:25:26 +00:00
Jack He
0fcbba25b7 Support battery level reporting via Plantronics XEVENT (1/2)
* Add related constants to BluetoothHeadset

Bug: 35874078
Test: make, test with supporting headsets
Change-Id: Ied089a065bf9caa0d03f681950fefa2ea990bb3e
2017-06-29 17:17:14 +00:00
Neil Fuller
93b232db41 Merge "Use sendBroadcastAsUser rather than sendBroadcast"
am: d129a14647

Change-Id: I76324b2d983887dbdac4b26e518a68d8c4035a47
2017-06-29 11:37:13 +00:00
Treehugger Robot
d129a14647 Merge "Use sendBroadcastAsUser rather than sendBroadcast" 2017-06-29 11:29:37 +00:00
Andre Eisenbach
df1831d2ee Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)"
am: 5790bae2f4

Change-Id: I480ef38d5aa61aa153ee53d325e8b249c1eab222
2017-06-29 08:39:40 +00:00
Jack He
73795440a5 HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
* Per HFP 1.7.1 spec page 102 of 144
  EXTRA_HF_INDICATORS_IND_ID should be int
  EXTRA_HF_INDICATORS_IND_VALUE should be int

Bug: 35874078
Test: make, PTS test, unit tests
runtest -c com.android.bluetooth.btservice.RemoteDevicesTest bluetooth

Change-Id: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
2017-06-29 08:30:37 +00:00
Jack He
96f98f255b Merge "Add APIs to get remote device's battery level (1/2)"
am: ceaccbfe70

Change-Id: Ic3253ef666632aaaffe8e1547dc563cd3bca9e37
2017-06-28 08:32:54 +00:00
Jack He
1d312bfa78 Add APIs to get remote device's battery level (1/2)
* Add BluetoothDevice.getBatteryLevel() API to retreive battery level
  information of remote device
* Add BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent to notify user
  that remote device's battery level has changed

Bug: 35874078
Test: make, pair with devices and use them
Change-Id: I41051ee25383f5f3a1e505aef6f8c526385f58bd
2017-06-27 16:53:09 -07:00
Neil Fuller
23eb3a19b8 Use sendBroadcastAsUser rather than sendBroadcast
According to messages in the logcat sendBroadcastAsUser
is the better option.

Test: Manual
Bug: 31008728
Change-Id: I06bcd3c53878fc2b1b817337ea8719fcc4975501
2017-06-27 19:04:50 +01:00
Selim Cinek
12a2a7d0f1 Merge "Fixed an issue in the contrast calculation" into oc-dev
am: 9bf5c0c3e1

Change-Id: Ic93f722459de8da30b9b2f8971dfd0b650e37f10
2017-06-24 00:55:48 +00:00
Selim Cinek
9bf5c0c3e1 Merge "Fixed an issue in the contrast calculation" into oc-dev 2017-06-24 00:44:13 +00:00
Selim Cinek
4c80791919 Fixed an issue in the contrast calculation
The parameters were passed the wrong way around.

Test: manual inspection
Fixes: 62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
2017-06-23 17:29:50 -07:00
Hugo Benichi
c729ff8253 Merge changes I193297e0,I43beb966
* changes:
  NetworkCapabilities: Added support for TRANSPORT_LOWPAN
  Connectivity metrics: serialize networkId, transports, ifname
2017-06-24 00:01:24 +00:00
Vladimir Marko
17bb92fe14 Merge "Rename Binder.destroy() to Binder.destroyBinder()." am: a634b38c8e
am: 1b4b326128

Change-Id: I165243924444f89ee880072c55eba012ccf1d149
2017-06-23 10:55:48 +00:00
Vladimir Marko
a634b38c8e Merge "Rename Binder.destroy() to Binder.destroyBinder()." 2017-06-23 10:36:02 +00:00
Robert Quattlebaum
5f9157651e NetworkCapabilities: Added support for TRANSPORT_LOWPAN
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.

Bug: b/33073713
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689

(cherry pick from commit 557e0c38b9)

Change-Id: I21f9b41b8b31c63ceeb1bc9c965f6da2614c356a

Test: runtest frameworks-net (not in original commit message)
2017-06-23 16:08:45 +09:00
Hugo Benichi
6a9bb8e84a Connectivity metrics: serialize networkId, transports, ifname
This patch adds translation from ConnectivityMetricsEvent to
IpConnectivityEvent of recently added fields:
 - top-level network id
 - top-level ifname
 - transports

Also adds inference of link layer from transports or ifname.

At the moment these new fields are not populated in
ConnectivityMetricsEvent. Follow-up patches will fill this gap for
the events of the android.net.metrics package.

Test: new unit tests, $ runtest frameworks-net passes
Bug: 34901696
Merged-In: I563a6a3183470bdfaabb7c781a1beaf6b1058bf0

(partial cherry pick from commit 73fd4d1faf)

Change-Id: I6a00270e73a1bd07f23c367f2394d90a43ced47a

Test: runtest frameworks-net (not in original commit message)
2017-06-23 16:07:38 +09:00
Seigo Nonaka
ba12631bba Merge "Stop loading other package's font by default." into oc-dev
am: 824d75e0e1

Change-Id: I5518dbd8b5d8a4548ea00bbfca0e3aee87880ee7
2017-06-23 04:23:44 +00:00
Marie Janssen
f71b0bedcf Merge "Bluetooth: minor documentation fix to de-confuse" am: 5a56873612
am: 3205ff1331

Change-Id: I0cd44ad8d22da154d0bf666b9075a3fcbc655439
2017-06-23 03:38:17 +00:00
Marie Janssen
5a56873612 Merge "Bluetooth: minor documentation fix to de-confuse" 2017-06-23 03:17:37 +00:00
Seigo Nonaka
80f6a985c3 Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.

This CL contains Iac2a6fb3d82ef23d5ca6ee33f4aaa9ed28455271 by manual
merging to handle repository split.

Bug: 62813533
Bug: 62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
2017-06-22 19:07:17 -07:00
Felipe Leme
472b4c834f Improved documentation for AutofillService package:
am: 2ef19c1d73

Change-Id: Iac283d34da149829a25313d0910f2564b347e332
2017-06-23 00:36:37 +00:00
Felipe Leme
2ef19c1d73 Improved documentation for AutofillService package:
- Moved (and expanded) overall documentation from FillResponse to
  AutofillService.
- Improved SaveInfo documentation.
- Improved FillRequest documentation.
- Improved Dataset documentation.

Bug: 37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML

Change-Id: I157893deac06a5ed5e1cb7fd082da485f227b9ee
2017-06-22 15:25:31 -07:00
Rob Carr
874b6402af Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am: 82b41e460c

Change-Id: I14f6fe76b3a24266432a8bc7286d1ae5da8f719d
2017-06-22 22:19:45 +00:00
Rob Carr
82b41e460c Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev 2017-06-22 22:08:10 +00:00
Neil Fuller
af32c3d234 Merge "Fix code and test related to rules version check" am: a3579d4b84
am: c506ade205

Change-Id: Ia72b94700d1a65de769beace27e699e62aedcd9f
2017-06-22 21:49:28 +00:00
Treehugger Robot
a3579d4b84 Merge "Fix code and test related to rules version check" 2017-06-22 21:23:54 +00:00
Marie Janssen
553c8c7753 Bluetooth: minor documentation fix to de-confuse
It was somewhat unclear which is the preferred method of retrieving a
BluetoothAdapter.  Make it clear that using BluetoothManager is
preferred, and remove references to the old method in BluetoothManager
docs since it is only avaialable in API 18 or higher.

Test: recompile, check that documentation is updated
Fix: 33355430
Change-Id: Ia20b4e45dca03bc2f13c2ab477799b89c5e14f45
2017-06-22 20:49:55 +00:00