OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "HwBinder: Clean up code, add logging"
Andreas Gampe [Thu, 26 Oct 2017 02:03:47 +0000 (02:03 +0000)]
Merge "HwBinder: Clean up code, add logging"
am: 28ed91161d

Change-Id: Ie7d511812c6dc419ca793c28a4cee1150a90bd66

6 years agoMerge "HwBinder: Clean up code, add logging"
Treehugger Robot [Thu, 26 Oct 2017 01:52:40 +0000 (01:52 +0000)]
Merge "HwBinder: Clean up code, add logging"

6 years agoMerge "Convert framework-protos to Android.bp"
Colin Cross [Thu, 26 Oct 2017 01:11:13 +0000 (01:11 +0000)]
Merge "Convert framework-protos to Android.bp"
am: d4609af986

Change-Id: I6ebf88a0931b7f9f49ac8044deb46b100129bb9f

6 years agoMerge "Convert framework-protos to Android.bp"
Colin Cross [Thu, 26 Oct 2017 01:01:08 +0000 (01:01 +0000)]
Merge "Convert framework-protos to Android.bp"

6 years agoMerge "Fix issue #64224738: Document return value of IBinder.transact()"
Hans Boehm [Thu, 26 Oct 2017 00:12:52 +0000 (00:12 +0000)]
Merge "Fix issue #64224738: Document return value of IBinder.transact()"
am: ceb336fc8a

Change-Id: Ibcd3386a93a3bb5de8fb84a178678dab67beb464

6 years agoMerge "Fix issue #64224738: Document return value of IBinder.transact()"
Hans Boehm [Thu, 26 Oct 2017 00:01:12 +0000 (00:01 +0000)]
Merge "Fix issue #64224738: Document return value of IBinder.transact()"

6 years agoMerge "android.os.HwBinder: fix native static method signature"
Yifan Hong [Wed, 25 Oct 2017 22:29:45 +0000 (22:29 +0000)]
Merge "android.os.HwBinder: fix native static method signature"
am: 65944e79b2

Change-Id: I09295da4a6021bd02c5c5e89d1d4ce3a8be82c96

6 years agoMerge "android.os.HwBinder: fix native static method signature"
Treehugger Robot [Wed, 25 Oct 2017 22:08:36 +0000 (22:08 +0000)]
Merge "android.os.HwBinder: fix native static method signature"

6 years agoHwBinder: Clean up code, add logging
Andreas Gampe [Wed, 25 Oct 2017 20:03:24 +0000 (13:03 -0700)]
HwBinder: Clean up code, add logging

Used ScopedUtfChars to handle lifetime, and correctly throw NPE. It
is illegal to call JNI String functions with a null argument.

Output the service name when starting a thread pool to aid debugging.

Bug: 68217725
Test: m
Test: Device boots
Change-Id: Ie40d3e77a63918330ef1a8a9e0c294f2c451a52a

6 years agoFix issue #64224738: Document return value of IBinder.transact()
Dianne Hackborn [Tue, 1 Aug 2017 00:38:53 +0000 (17:38 -0700)]
Fix issue #64224738: Document return value of IBinder.transact()

Also add appropriate @NonNull and @Nullable annotations.

Test: built

Change-Id: I22de48105ef685baf594cfc004dd3e27e2ba09e9
Merged-In: I22de48105ef685baf594cfc004dd3e27e2ba09e9
(cherry picked from commit 4cd650c0085e6dd20d3f46c5b668e54537f887cf)

6 years agoMerge "Fix dial emergency call redial issue by China Unicom."
Brad Ebinger [Wed, 25 Oct 2017 20:50:54 +0000 (20:50 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom."
am: 3ab81b9694

Change-Id: I3895caab83c75a8f0d0251da6154d5a93fe09694

6 years agoMerge "Fix dial emergency call redial issue by China Unicom."
Brad Ebinger [Wed, 25 Oct 2017 20:36:17 +0000 (20:36 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom."

6 years agoandroid.os.HwBinder: fix native static method signature
Yifan Hong [Wed, 25 Oct 2017 20:19:22 +0000 (13:19 -0700)]
android.os.HwBinder: fix native static method signature

Test: pass
Change-Id: I54c384abaad7c7aafab31836f34edee5c7c75aac

6 years agoMerge "Make it possible to dial an operator specific code"
Jordan Liu [Wed, 25 Oct 2017 18:40:33 +0000 (18:40 +0000)]
Merge "Make it possible to dial an operator specific code"
am: f4f4ba3d42

Change-Id: I9af399f6ab0d5f95e76b0fd3cc769acc6a75a5b5

6 years agoMerge "Make it possible to dial an operator specific code"
Jordan Liu [Wed, 25 Oct 2017 18:22:31 +0000 (18:22 +0000)]
Merge "Make it possible to dial an operator specific code"

6 years agoMerge "Improve NetworkCapabilities docs."
Jeff Sharkey [Wed, 25 Oct 2017 17:25:17 +0000 (17:25 +0000)]
Merge "Improve NetworkCapabilities docs."
am: 14a51058b1

Change-Id: Ib3c6dd78c7ed41526a734fbc91a81cb4c7fae6d7

6 years agoMerge "Improve NetworkCapabilities docs."
Treehugger Robot [Wed, 25 Oct 2017 17:16:03 +0000 (17:16 +0000)]
Merge "Improve NetworkCapabilities docs."

6 years agoMerge "Switch to listening for CarrierConfig changes for provisioning rechecks"
Erik Kline [Wed, 25 Oct 2017 13:47:31 +0000 (13:47 +0000)]
Merge "Switch to listening for CarrierConfig changes for provisioning rechecks"
am: c21effd526

Change-Id: I58dfd65873b65a59b832afea88f8d246b088aa6b

6 years agoMerge "Switch to listening for CarrierConfig changes for provisioning rechecks"
Treehugger Robot [Wed, 25 Oct 2017 13:37:40 +0000 (13:37 +0000)]
Merge "Switch to listening for CarrierConfig changes for provisioning rechecks"

6 years agoMerge "Revert "HIDL Java getService now the same as C++.""
Steven Moreland [Wed, 25 Oct 2017 05:17:19 +0000 (05:17 +0000)]
Merge "Revert "HIDL Java getService now the same as C++.""
am: 65d1e549b6

Change-Id: I545166bd11ee2a38b43743ebb4559429e1b22349

6 years agoMerge changes from topic "keystorebp"
Colin Cross [Wed, 25 Oct 2017 05:07:24 +0000 (05:07 +0000)]
Merge changes from topic "keystorebp"
am: a12eab69d1

Change-Id: I4a6f7f84d683582d126a6370e1cf3ae6ee9f4b19

6 years agoExport AIDL for keystore Android.bp.
Jeff Sharkey [Wed, 25 Oct 2017 05:01:29 +0000 (05:01 +0000)]
Export AIDL for keystore Android.bp.
am: 01478ec183

Change-Id: Ie2308e809410e1c8237095c7f74bce08b8f76397

6 years agoMerge "Revert "HIDL Java getService now the same as C++.""
Steven Moreland [Wed, 25 Oct 2017 04:50:08 +0000 (04:50 +0000)]
Merge "Revert "HIDL Java getService now the same as C++.""

6 years agoRevert "HIDL Java getService now the same as C++."
Steven Moreland [Wed, 25 Oct 2017 04:46:26 +0000 (04:46 +0000)]
Revert "HIDL Java getService now the same as C++."

Appears to be causing problems on 2017 devices.

This reverts commit c1f00f8cd895e38c74ed1cb1adff33065ccecd06.

Change-Id: I6c1717a612bfa3fe63f08160a1db652c284f6ba4

6 years agoMerge changes from topic "keystorebp"
Colin Cross [Wed, 25 Oct 2017 04:43:08 +0000 (04:43 +0000)]
Merge changes from topic "keystorebp"

* changes:
  Convert lockregioncodeinjection to Android.bp
  Export AIDL for keystore Android.bp.

6 years agoImprove NetworkCapabilities docs.
Jeff Sharkey [Wed, 25 Oct 2017 03:25:50 +0000 (21:25 -0600)]
Improve NetworkCapabilities docs.

Add IntDef for constants, and rely on new auto-documentation feature
to expand all of them at usage sites.

Test: docs-only change
Bug: 64133169
Change-Id: I8a6b5f54c8eb9d4fc7ae3d0d3fb673d52320664b

6 years agoMerge changes I119cf83a,Icc5a1e38,If07a04d3
Andreas Gampe [Wed, 25 Oct 2017 02:53:19 +0000 (02:53 +0000)]
Merge changes I119cf83a,Icc5a1e38,If07a04d3
am: 61e3189ec7

Change-Id: I2ef7c49b23314a5cb94671bba0d3891b6b7c3920

6 years agoMerge changes I119cf83a,Icc5a1e38,If07a04d3
Treehugger Robot [Wed, 25 Oct 2017 02:34:18 +0000 (02:34 +0000)]
Merge changes I119cf83a,Icc5a1e38,If07a04d3

* changes:
  Binder: Update to new ScopedLocalRef
  Binder: Clean up JNI code
  Binder: Change reaction to Error

6 years agoMerge "HIDL Java getService now the same as C++."
Steven Moreland [Wed, 25 Oct 2017 02:02:44 +0000 (02:02 +0000)]
Merge "HIDL Java getService now the same as C++."
am: 0c41ad872f

Change-Id: I9e161fd316d0bae5f3e4449adcb454924531fe11

6 years agoMerge "HIDL Java getService now the same as C++."
Treehugger Robot [Wed, 25 Oct 2017 01:53:16 +0000 (01:53 +0000)]
Merge "HIDL Java getService now the same as C++."

6 years agoConvert framework-protos to Android.bp
Colin Cross [Tue, 24 Oct 2017 23:21:22 +0000 (16:21 -0700)]
Convert framework-protos to Android.bp

See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: Id7992ff0cc5d631b64c1fa8e82e8a130ea508236

6 years agoBinder: Update to new ScopedLocalRef
Andreas Gampe [Thu, 21 Sep 2017 17:55:59 +0000 (10:55 -0700)]
Binder: Update to new ScopedLocalRef

Follow-up to commit 625e0007ac07c5aefb4b3d486575ab916116c129 and
commit fac8cb2405999d18aefd75387a5bbdb0c6160e7f.

(cherry picked from commit 8571ec370da1b629aa8eb7267f139f1610627857)

Bug: 64689630
Test: m
Merged-In: I119cf83a5a54c15973ed3701ee448a9590bb404d
Change-Id: I119cf83a5a54c15973ed3701ee448a9590bb404d

6 years agoBinder: Clean up JNI code
Andreas Gampe [Sat, 9 Sep 2017 00:44:05 +0000 (17:44 -0700)]
Binder: Clean up JNI code

Factor out Error handling code and clean up. Use ScopedLocalRef,
fix minor logic issues.

(cherry picked from commit 625e0007ac07c5aefb4b3d486575ab916116c129)

Bug: 64689630
Test: m
Test: manual test
Merged-In: Icc5a1e38fa66aa79d87d0abb81acef6918ca78f5
Change-Id: Icc5a1e38fa66aa79d87d0abb81acef6918ca78f5

6 years agoBinder: Change reaction to Error
Andreas Gampe [Sat, 9 Sep 2017 00:44:05 +0000 (17:44 -0700)]
Binder: Change reaction to Error

Instead of aborting immediately with a native error, try to call
Thread.dispatchUncaughtException to trigger a Java-side abort.
Only fall back to the old strategy if this fails.

(cherry picked from commit 1cd76f5c93bc1e2409c880cade19a323cd999aed)

Bug: 64689630
Test: m
Test: manual test
Merged-In: If07a04d3769f3b9181c4736220333df9a2871a16
Change-Id: If07a04d3769f3b9181c4736220333df9a2871a16

6 years agoExport AIDL for keystore Android.bp.
Jeff Sharkey [Mon, 23 Oct 2017 22:04:31 +0000 (16:04 -0600)]
Export AIDL for keystore Android.bp.

Test: builds, boots
Bug: 67041047
Change-Id: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1
Merged-In: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1
(cherry picked from commit 0c686e78ad2fbfc9e814bdd3abc5bd66c858c60f)

6 years agoConvert lockregioncodeinjection to Android.bp
Colin Cross [Fri, 20 Oct 2017 20:00:58 +0000 (13:00 -0700)]
Convert lockregioncodeinjection to Android.bp

See build/soong/README.md for more information

Test: m checkbuild
Change-Id: I78e91a70e786df8e6722c6ec3fe762371e8f475a

6 years agoMake it possible to dial an operator specific code
Kazuya Ohshiro [Wed, 27 Sep 2017 07:02:55 +0000 (16:02 +0900)]
Make it possible to dial an operator specific code

Added a new array config that indicating list of
FAC (feature access codes) to dial as a normal call.

Test: manual - Checked that special codes which configured in
CarrierConfig are dialed as a normal call.
Bug: 67664279

Change-Id: I1c4b60ae4f28c25e55b38563fe445f831793d466

6 years agoMerge "Copy layout file of preference category from Settings."
Malcolm Chen [Tue, 24 Oct 2017 22:32:30 +0000 (22:32 +0000)]
Merge "Copy layout file of preference category from Settings."
am: 03c6030ce9  -s ours

Change-Id: Ibacd6e572b31105fe3afe1a904c15ed1d610fc41

6 years agoMerge "Copy layout file of preference category from Settings."
Treehugger Robot [Tue, 24 Oct 2017 22:22:57 +0000 (22:22 +0000)]
Merge "Copy layout file of preference category from Settings."

6 years agoCopy layout file of preference category from Settings.
Malcolm Chen [Thu, 1 Jun 2017 23:35:43 +0000 (16:35 -0700)]
Copy layout file of preference category from Settings.

Platform packages other than Settings may also use this layout to
be consistent with Settings.

Test: manual
bug: 62200881
Change-Id: I9e45772abac5aacfabbbafb38e287d0b523ef694
Merged-In: I9e45772abac5aacfabbbafb38e287d0b523ef694

6 years agoMerge "Return a port from bindToPort() in IpSecService"
Benedict Wong [Tue, 24 Oct 2017 16:44:59 +0000 (16:44 +0000)]
Merge "Return a port from bindToPort() in IpSecService"
am: 9305fb7ea1

Change-Id: I51705d5db6af560f2423ef7861bfde6734632ec9

6 years agoMerge "Return a port from bindToPort() in IpSecService"
Benedict Wong [Tue, 24 Oct 2017 16:31:21 +0000 (16:31 +0000)]
Merge "Return a port from bindToPort() in IpSecService"

6 years agoMerge "Use ASM6 Opcodes everywhere in locked_region_code_injection"
Benoit Lamarche [Tue, 24 Oct 2017 08:54:09 +0000 (08:54 +0000)]
Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection"
am: 5aa4dafa58

Change-Id: Ic8f892399cdfa746a2fab4a841469f41f0fe98f5

6 years agoMerge "Use ASM6 Opcodes everywhere in locked_region_code_injection"
Benoit Lamarche [Tue, 24 Oct 2017 08:42:10 +0000 (08:42 +0000)]
Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection"

6 years agoMerge "Preserve order of shared library files"
Paul Duffin [Tue, 24 Oct 2017 07:59:35 +0000 (07:59 +0000)]
Merge "Preserve order of shared library files"
am: 596bb64796

Change-Id: I95c1cd65ded3b3d14b7f916c8a10825399e7b8ec

6 years agoMerge "Preserve order of shared library files"
Paul Duffin [Tue, 24 Oct 2017 07:48:13 +0000 (07:48 +0000)]
Merge "Preserve order of shared library files"

6 years agoMerge changes from topic "bt_get_cod"
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:27:23 +0000 (06:27 +0000)]
Merge changes from topic "bt_get_cod"
am: 35dc02004c

Change-Id: Iec67ef3cc9c990b4d5285b23b51972915cbbd335

6 years agoMerge changes from topic "bt_get_cod"
Treehugger Robot [Tue, 24 Oct 2017 06:14:37 +0000 (06:14 +0000)]
Merge changes from topic "bt_get_cod"

* changes:
  Add missing intents to protected broadcasts
  Get Bluetooth Class of Device

6 years agoMerge "Persist Bluetooth CoD config value across reboot"
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:13:48 +0000 (06:13 +0000)]
Merge "Persist Bluetooth CoD config value across reboot"
am: ba45409c92

Change-Id: I4d28d0b1b52e587285d3b92b66fdc4b6c1b38720

6 years agoAdd missing intents to protected broadcasts
Pulkit Bhuwalka [Tue, 26 Sep 2017 02:19:46 +0000 (19:19 -0700)]
Add missing intents to protected broadcasts

Intents broadcasted by the Bluetooth stack need to be added to protected
broadcasts else they complain with errors in the log since Bluetooth is
considered a system process. A few of these intents, especially AVRCP
intents were missing in the list.

Bug: None
Test: Verified errors don't show up after introducing the intents while
playing on a sink device.

Change-Id: Ie283c50243d9a1bac3fd937f58bc1ddc20867d2f

6 years agoGet Bluetooth Class of Device
Pulkit Bhuwalka [Wed, 20 Sep 2017 22:10:45 +0000 (15:10 -0700)]
Get Bluetooth Class of Device

Adds API to fetch Bluetooth CoD value of the stack. The API is hidden to
only be used by System code.

Bug: 36015415
Test: Verified fetching of COD from test app on flashed device, after modification
and after after reboot.

Change-Id: Ie35ecf141704c2aac46678da7cabdc7203a088f2

6 years agoMerge "Persist Bluetooth CoD config value across reboot"
Treehugger Robot [Tue, 24 Oct 2017 06:05:45 +0000 (06:05 +0000)]
Merge "Persist Bluetooth CoD config value across reboot"

6 years agoMerge "NetdEventListener: add rolling log of connect and dns stats"
Hugo Benichi [Tue, 24 Oct 2017 00:14:48 +0000 (00:14 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats"
am: 64ef2a4d28

Change-Id: I7f25f4ed42f0aecea7a1bb09b8c65a5d2e4a84cd

6 years agoMerge "NetdEventListener: add rolling log of connect and dns stats"
Hugo Benichi [Mon, 23 Oct 2017 23:54:53 +0000 (23:54 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats"

6 years agoMerge "Change Bluetooth HID Profile Name (1/6)"
Hansong Zhang [Mon, 23 Oct 2017 22:33:50 +0000 (22:33 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)"
am: 8218b219f3

Change-Id: Ic085deaa070b4008b34d03b507f81a5df220764a

6 years agoMerge "Change Bluetooth HID Profile Name (1/6)"
Treehugger Robot [Mon, 23 Oct 2017 22:22:41 +0000 (22:22 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)"

6 years agoChange Bluetooth HID Profile Name (1/6)
Hansong Zhang [Fri, 20 Oct 2017 22:55:59 +0000 (15:55 -0700)]
Change Bluetooth HID Profile Name (1/6)

Make the Bluetooth HID profile name consistent with the Bluetooth HID service
name.

BluetoothInputHost → BluetoothHidDevice
BluetoothInputDevice → BluetoothHidHost
IBluetoothInputHost → IBluetoothHidDevice
IBluetoothInputDevice → IBluetoothHidHost
BluetoothProfile.INPUT_HOST → BluetoothProfile.HID_DEVICE
BluetoothProfile.INPUT_DEVICE → BluetoothProfile.HID_HOST

(Cherry-picked from commit c26c76c63d933f8057f795d05624f91b811c8c71)
Merged-In: Iadb890a54dd3d6868b87514472bbac6bb0c6179f
Bug: 68055651
Test: make
Change-Id: Iadb890a54dd3d6868b87514472bbac6bb0c6179f

6 years agoMerge "Add config to display VM number as default number of CF"
Jordan Liu [Mon, 23 Oct 2017 20:39:20 +0000 (20:39 +0000)]
Merge "Add config to display VM number as default number of CF"
am: 3e26cb18fb

Change-Id: Ie332a31b699b375d7a9ff56f314346546244010e

6 years agoMerge "Add config to display VM number as default number of CF"
Jordan Liu [Mon, 23 Oct 2017 20:27:28 +0000 (20:27 +0000)]
Merge "Add config to display VM number as default number of CF"

6 years agoPreserve order of shared library files
Paul Duffin [Mon, 2 Oct 2017 09:23:25 +0000 (10:23 +0100)]
Preserve order of shared library files

Shared libraries are stored in a list so order is preserved. However,
when they are resolved to files, e.g. for use as a class path the
file names are added to an ArraySet which loses the order. Presumably
they are added to a Set to eliminate duplicates. This switches to a
LinkedHashSet which will preserve the order in which the files are
added while still avoiding duplicates.

It is possible that this could cause app compatibility issues as the
order in which shared libraries is being added is changing. Problems can
only arise if two libraries whose order changes have duplicate classes
and/or resources. In that case the app was only working by luck, as the
order provided by ArraySet is based on the numerical order of hash
codes.

This was found while investigating performance regressions in
GoogleDialer, unfortunately it does not fix the regressions.

Bug: 65552462
Test: flash -w and systrace GoogleDialer to ensure correct order
Change-Id: I0e94471cc481437712f7cf0dab63d88f50cf3b14
Merged-In: Ia01ce4821fa53e4785716b72c4f87a0b0ab4dcc8

6 years agoUse ASM6 Opcodes everywhere in locked_region_code_injection
Benoit Lamarche [Mon, 23 Oct 2017 09:21:01 +0000 (11:21 +0200)]
Use ASM6 Opcodes everywhere in locked_region_code_injection

And use the same constant everywhere.

Test: treehugger
Bug: 67676752
Change-Id: I5735aba76266118471677f962fab50dbb0be187b

6 years agoHIDL Java getService now the same as C++.
Steven Moreland [Mon, 23 Oct 2017 07:09:33 +0000 (00:09 -0700)]
HIDL Java getService now the same as C++.

getService: wait for service if it is declared in the manifest
tryGetService: only return if the service is immediately available

Bug: 67981006
Test: hidl_test_java
Change-Id: I4485b84f0fde98851cf5f64d198a8c5410795c8c

6 years agoPersist Bluetooth CoD config value across reboot
Pulkit Bhuwalka [Tue, 26 Sep 2017 00:55:12 +0000 (17:55 -0700)]
Persist Bluetooth CoD config value across reboot

Create new Settings key for storage and update the API doc.

Bug: 36015415
Test: Verified by storing a value through a test app and restarting the
machine to ensure it's picked up.

Change-Id: I94aa054e525c4656bb3a824a29cae9c88f8904e0

6 years agoMerge "Use final release of ASM 6.0"
Colin Cross [Sun, 22 Oct 2017 01:46:39 +0000 (01:46 +0000)]
Merge "Use final release of ASM 6.0"
am: d5d697b023

Change-Id: I94524349eaa38c020d932f301fe36f99952862bc

6 years agoMerge "Use final release of ASM 6.0"
Colin Cross [Sun, 22 Oct 2017 01:37:11 +0000 (01:37 +0000)]
Merge "Use final release of ASM 6.0"

6 years agoNetdEventListener: add rolling log of connect and dns stats
Hugo Benichi [Wed, 27 Sep 2017 14:28:59 +0000 (23:28 +0900)]
NetdEventListener: add rolling log of connect and dns stats

This patch adds a rolling time order logs of basic statistics of
connect and dns, grouped by network id and including:
 - average error rate
 - average latency
 - max latency
 - total number of operations

The log is segmented in buckets of 5 minutes, and covers the last 4
hours.

Note that only blocking connect() calls latencies are recorded with the
current netd logging infrastructure.

Example of logs:
05:30:00.000: {netId=100, WIFI, dns avg=92ms max=525ms err=00.0% tot=37, connect avg=0ms max=23ms err=00.0% tot=25}
05:35:00.000: {netId=100, WIFI, dns avg=94ms max=537ms err=05.3% tot=57, connect avg=0ms max=0ms err=00.0% tot=69}
05:40:00.000: {netId=100, WIFI, dns avg=220ms max=350ms err=00.0% tot=4, connect avg=0ms max=0ms err=00.0% tot=2}
05:45:00.000: {netId=100, WIFI, dns avg=112ms max=113ms err=00.0% tot=1, connect avg=0ms max=0ms err=00.0% tot=1}
05:50:00.000: {netId=100, WIFI, dns avg=131ms max=269ms err=00.0% tot=2, connect avg=0ms max=0ms err=00.0% tot=1}

Bug: 65700460
Test: runtest frameworks-net
Change-Id: I54e76d18fbaaa92639fb675f93ea90b7615fd6bf

6 years agoMerge "Add Runnable mechanism to WakeupMessage"
Etan Cohen [Sat, 21 Oct 2017 02:17:30 +0000 (02:17 +0000)]
Merge "Add Runnable mechanism to WakeupMessage"
am: 5964b55654

Change-Id: Iab0414f644223d69602e8e93a636eaa46137d873

6 years agoMerge "Add Runnable mechanism to WakeupMessage"
Etan Cohen [Sat, 21 Oct 2017 02:04:50 +0000 (02:04 +0000)]
Merge "Add Runnable mechanism to WakeupMessage"

6 years agoMerge "Check success before registering DeathRecipient"
Hall Liu [Fri, 20 Oct 2017 23:22:13 +0000 (23:22 +0000)]
Merge "Check success before registering DeathRecipient"
am: b6c4bc311a

Change-Id: Ie4a8f3ea3374d30a6a4dd9d22d9d48df0075c560

6 years agoMerge "Check success before registering DeathRecipient"
Hall Liu [Fri, 20 Oct 2017 23:10:09 +0000 (23:10 +0000)]
Merge "Check success before registering DeathRecipient"

6 years agoAdd Runnable mechanism to WakeupMessage
Etan Cohen [Fri, 20 Oct 2017 04:12:34 +0000 (21:12 -0700)]
Add Runnable mechanism to WakeupMessage

The WakeupMessage object provides a mechanism to create an Alarm
which will wake-up the device and deliver a message to a Handler.

Add a Runnable mechanism as an alternative to the message.

Bug: 67276378
Test: unit test
Change-Id: Icf5f03b2b25a340273f9d3fcd09f182216ea6238

6 years agoMerge "Remove @Presubmit from SettingsBackupTest.Java"
Ben Schwartz [Fri, 20 Oct 2017 20:25:37 +0000 (20:25 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java"
am: 3c48bd72aa

Change-Id: I5a4f7c33ccb0a9ddff2778726055c7c059dfa281

6 years agoMerge "Remove @Presubmit from SettingsBackupTest.Java"
Treehugger Robot [Fri, 20 Oct 2017 20:14:43 +0000 (20:14 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java"

6 years agoRemove @Presubmit from SettingsBackupTest.Java
Ben Schwartz [Fri, 20 Oct 2017 17:41:12 +0000 (13:41 -0400)]
Remove @Presubmit from SettingsBackupTest.Java

It appears to be causing problems on some build bots.

Test: Problem can only be reproduced after merge...
Change-Id: I7c9c1c7a54f0e2981faecbf9793eef888f5c97d1

6 years agoUse final release of ASM 6.0
Colin Cross [Fri, 20 Oct 2017 19:57:56 +0000 (12:57 -0700)]
Use final release of ASM 6.0

Test: m checkbuild
Change-Id: I8b39c7887763a1a5efce2622421906f9b2e1994a

6 years agoMerge "Refactored area update info support"
Jack Yu [Fri, 20 Oct 2017 19:30:02 +0000 (19:30 +0000)]
Merge "Refactored area update info support"
am: b1092bfd55  -s ours

Change-Id: Ib616989cf16ef67118145d59845c7db764dc5ee9

6 years agoMerge "Refactored area update info support"
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"

6 years agoMerge "Add link_type for temp_layoutlib"
Dan Willemsen [Fri, 20 Oct 2017 18:27:58 +0000 (18:27 +0000)]
Merge "Add link_type for temp_layoutlib"
am: d0b0e8cc86  -s ours

Change-Id: Ic84faa1292e8e52abff9ce62e992e7d00b7cb5e2

6 years agoMerge "Add link_type for temp_layoutlib"
Dan Willemsen [Fri, 20 Oct 2017 18:14:56 +0000 (18:14 +0000)]
Merge "Add link_type for temp_layoutlib"

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 16:00:01 +0000 (16:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:39:37 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:37:34 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:36:20 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:35:38 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:34:59 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:33:25 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:32:39 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:31:30 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:31:01 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:29:19 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:28:04 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:27:19 +0000 (15:27 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:23:26 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Add a global setting to disable DNS over TLS"
Ben Schwartz [Fri, 20 Oct 2017 15:08:55 +0000 (15:08 +0000)]
Merge "Add a global setting to disable DNS over TLS"
am: 4a906c167b

Change-Id: Ie0f5586342b32c9e7c745ab9697b44158a920233

6 years agoMerge "Add a global setting to disable DNS over TLS"
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a global setting to disable DNS over TLS"

6 years agoMerge "more O_CLOEXEC"
Nick Kralevich [Fri, 20 Oct 2017 14:53:14 +0000 (14:53 +0000)]
Merge "more O_CLOEXEC"
am: 9f8ed6500a

Change-Id: I7d07ad29cddeac5f44cc5a918e33b0a9068d29c0

6 years agoMerge "more O_CLOEXEC"
Treehugger Robot [Fri, 20 Oct 2017 14:44:26 +0000 (14:44 +0000)]
Merge "more O_CLOEXEC"

6 years agoSwitch to listening for CarrierConfig changes for provisioning rechecks
Erik Kline [Thu, 12 Oct 2017 13:16:01 +0000 (22:16 +0900)]
Switch to listening for CarrierConfig changes for provisioning rechecks

This change switches the signal used for provisioning rechecks from:

    ACTION_SIM_STATE_CHANGED

to:

    ACTION_CARRIER_CONFIG_CHANGED

Additionally:
    - reexamine carrier config overrides during provisioning re-checks
      (this just was never happening before).
    - refactor shared code out to VersionedBroadcastListener

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net
Bug: 63400667
Bug: 67755969
Change-Id: Ib9d222eb7ca0e0dd988a1bd97ab32059189ada2c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 09:23:10 +0000 (02:23 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I54b9c45224a393b5724a8964858817e3247ece54

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 09:06:39 +0000 (02:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I1786cdac7dae8737ba1f7ea7665a62dfcfc2d7f2