Adam Bookatz
065f4b7ea7
Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev
...
am: e332629667
2017-09-14 18:33:47 +00:00
Adam Bookatz
e332629667
Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev
...
* changes:
Disable screen-off RPM timing in BatteryStats
Added resource power manager stats to batterystats
2017-09-14 18:22:34 +00:00
Android Build Merger (Role)
24d8238137
Merge "Merge changes Ie2676b20,Ie8db6f85 am: 61901ddedd am: 4188432a7b am: 7d16886c7e" into oc-mr1-dev-plus-aosp
2017-09-14 18:06:03 +00:00
Hugo Benichi
6bc5c97e96
Merge changes Ie2676b20,Ie8db6f85 am: 61901ddedd am: 4188432a7b
...
am: 7d16886c7e
2017-09-14 18:02:14 +00:00
Siyamed Sinir
273dcbf053
Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev
...
am: ae90cfccee
2017-09-14 17:59:24 +00:00
Siyamed Sinir
ae90cfccee
Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev
2017-09-14 17:34:02 +00:00
Jan Althaus
654d8a3e6a
Change default smart select range for logging to [0,0]
...
am: ec3ded8686
2017-09-14 15:15:47 +00:00
Jiyong Park
6cc659cd9e
Merge "vendor apk is unbundled" into oc-mr1-dev
...
am: a26750e757
2017-09-14 14:51:57 +00:00
Hugo Benichi
7d16886c7e
Merge changes Ie2676b20,Ie8db6f85 am: 61901ddedd
...
am: 4188432a7b
2017-09-14 12:08:22 +00:00
Hugo Benichi
4188432a7b
Merge changes Ie2676b20,Ie8db6f85
...
am: 61901ddedd
2017-09-14 12:01:19 +00:00
Hugo Benichi
61901ddedd
Merge changes Ie2676b20,Ie8db6f85
...
* changes:
Connectivity metrics: add WakeupStats events
Connectivity metrics: collect NFLOG wakeup events
2017-09-14 11:53:02 +00:00
Jakub Pawlowski
dbc067bcc7
Merge "Bluetooth: thread-safe callback invocation" am: f8c7572b8f am: c416035448
...
am: eef8920a9f
2017-09-14 10:23:06 +00:00
Jakub Pawlowski
4eba1140f3
Merge "Bluetooth: fix GATT race conditions when using Handler" am: 06b29a87d7 am: 9054e03cf4
...
am: 79ce33fc96
2017-09-14 10:16:41 +00:00
Rubin Xu
bc92d94088
Merge "Refactor CompareResult<> class and its call sites" am: 60eae6e621 am: 89deab16f3
...
am: c345562746
2017-09-14 10:13:40 +00:00
TreeHugger Robot
b840785100
Merge "resolve merge conflicts of eb8a4ef5d3 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
2017-09-14 09:59:39 +00:00
Jan Althaus
ec3ded8686
Change default smart select range for logging to [0,0]
...
Bug: 64914512
Test: Manually tested that logs are correct. Will follow up with automated tests.
Change-Id: I5eb151f49f9dd665c6c76625ebb2b9c0be96a11d
2017-09-14 09:31:24 +02:00
Hugo Benichi
60c9f63b66
Connectivity metrics: add WakeupStats events
...
This patch defines a new WakeupStats event in ipconnectivity.proto and
populates these events from the NFLOG wakeup events stored in
NetdEventListenerService.
There is one WakeupStats object per known interface on which ingress
packets arrive and may wake the system up.
Example from $ adb shell dumpsys connmetrics list:
UPDATEME
...
WakeupStats(wlan0, total: 58, root: 0, system: 3, apps: 38, non-apps: 0, unrouted: 17, 6111s)
WakeupEvent(13:36:31.686, iface wlan0, uid -1)
WakeupEvent(13:38:50.846, iface wlan0, uid -1)
WakeupEvent(13:39:16.676, iface wlan0, uid 10065)
WakeupEvent(13:40:32.144, iface wlan0, uid 1000)
WakeupEvent(13:40:35.827, iface wlan0, uid 1000)
WakeupEvent(13:40:47.913, iface wlan0, uid 10004)
WakeupEvent(13:40:52.622, iface wlan0, uid 10014)
WakeupEvent(13:41:06.036, iface wlan0, uid 10004)
...
Bug: 34901696
Bug: 62179647
Test: runtest frameworks-net
Change-Id: Ie2676b20bfb411a1902f4942643df0c20e268d99
2017-09-14 13:29:56 +09:00
Jakub Pawlowski
05c1578c16
Bluetooth: thread-safe callback invocation
...
Bug: 65596701
Test: manual
Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7
Merged-In: I92a436328a3070ea842e8e652891e485406c2ed7
(cherry picked from commit 3eb569fc72
2017-09-14 02:37:45 +00:00
Jakub Pawlowski
d9ad6fc11a
Merge "Bluetooth: fix GATT race conditions when using Handler" into oc-mr1-dev
2017-09-14 02:32:28 +00:00
Dave Friedman
8be86f28f8
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed am: d1412d3d60
...
am: b8ae843a20
2017-09-14 02:22:00 +00:00
Andreas Gampe
8f4eab2fcc
resolve merge conflicts of eb8a4ef5d3 to oc-mr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia29e31d704982985264b40a78578a4c93d11bf3a
2017-09-13 19:20:34 -07:00
George Mount
42cb4b1d03
Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev
...
am: 465a956066
2017-09-14 02:19:59 +00:00
Sundeep Ghuman
bd89855f46
Merge "Change score cache eviction time to settings value." into oc-mr1-dev
...
am: 2193f912f3
2017-09-14 02:18:01 +00:00
Kurt Nelson
1933e5c645
Fix javadoc typo
...
am: 27616138bc
2017-09-14 01:49:08 +00:00
TreeHugger Robot
a26750e757
Merge "vendor apk is unbundled" into oc-mr1-dev
2017-09-14 01:35:42 +00:00
Dave Friedman
b8ae843a20
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed
...
am: d1412d3d60
2017-09-14 00:11:57 +00:00
Dave Friedman
1bfd76caf7
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed
...
am: d1412d3d60
2017-09-14 00:11:54 +00:00
Dave Friedman
d1412d3d60
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718
...
am: 4b3a4b58ed
2017-09-13 23:42:48 +00:00
TreeHugger Robot
465a956066
Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev
2017-09-13 23:17:37 +00:00
TreeHugger Robot
2193f912f3
Merge "Change score cache eviction time to settings value." into oc-mr1-dev
2017-09-13 23:12:21 +00:00
Jakub Pawlowski
93703a08c7
Bluetooth: fix GATT race conditions when using Handler
...
Bug: 65596701
Test: manual
Change-Id: Id703cea0543626bdd5a583da95615b650bbcc331
Merged-In: Id703cea0543626bdd5a583da95615b650bbcc331
2017-09-13 22:43:09 +00:00
Jakub Pawlowski
eef8920a9f
Merge "Bluetooth: thread-safe callback invocation" am: f8c7572b8f
...
am: c416035448
2017-09-13 22:36:14 +00:00
Jakub Pawlowski
79ce33fc96
Merge "Bluetooth: fix GATT race conditions when using Handler" am: 06b29a87d7
...
am: 9054e03cf4
2017-09-13 22:32:37 +00:00
Rubin Xu
c345562746
Merge "Refactor CompareResult<> class and its call sites" am: 60eae6e621
...
am: 89deab16f3
2017-09-13 22:26:02 +00:00
Bookatz
82b34117ee
Disable screen-off RPM timing in BatteryStats
...
RPM = resource power manager.
Fetching the rpm stats (specifically, the subsystem low power stats) is
slow... too slow to reasonably do each time the screen state changes.
Therefore, it is disabled until fetching this information can be done
more quickly. Consequently, the screen-off RPM values will be incorrect
until it is re-enabled; they are therefore not printed.
Bug: 65164435
Bug: 62549421
Test: manual
Change-Id: I54d54f244c69ee372f22ecd99f32570db4aeb222
2017-09-13 22:24:25 +00:00
Jakub Pawlowski
c416035448
Merge "Bluetooth: thread-safe callback invocation"
...
am: f8c7572b8f
2017-09-13 22:12:16 +00:00
Jakub Pawlowski
9054e03cf4
Merge "Bluetooth: fix GATT race conditions when using Handler"
...
am: 06b29a87d7
2017-09-13 22:08:00 +00:00
Rubin Xu
89deab16f3
Merge "Refactor CompareResult<> class and its call sites"
...
am: 60eae6e621
2017-09-13 21:59:11 +00:00
Nate Fischer
ffbb5666d4
Merge "WebView: document Safe Browsing and shouldInterceptRequest" into oc-mr1-dev
...
am: 563cd2d3ca
2017-09-13 20:35:03 +00:00
Sundeep Ghuman
1e98151104
Change score cache eviction time to settings value.
...
Reduce default eviction time from intended 24 hours (erroneously input
as 24 days) to 20 minutes.
Bug: b/63073866
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
Merged-In: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
2017-09-13 13:23:55 -07:00
Nicolas Geoffray
eb8a4ef5d3
resolve merge conflicts of e017dae587 to stage-aosp-master
...
am: 8dbb5e51c8
2017-09-13 20:22:55 +00:00
George Mount
3ceb116d4c
Fix problem with empty AnimatorSet during fragment removal.
...
Bug: 65354043
When an empty AnimatorSet is used in a fragment animation,
it can end immediately. This CL properly detects this
case and handles it properly.
Test: manual, ran fragment CTS
Change-Id: I63bee3818106f9c8e86cdc94af61d6bc8407c789
2017-09-13 13:17:18 -07:00
Bookatz
50df711a51
Added resource power manager stats to batterystats
...
Currently Resource Power Management (e.g. VMIN time) is reported in the
batterystats history each time the battery level changes. We need this
information in the batterystats checkin, and need to be able to
differentiate time spent in each power state/voter, total as well as
when the screen is off.
The RPM information is obtained via a JNI call to the appropriate HALs.
Batterystats report version is increased to 26.
Bug: 62549421
Test: manual
Change-Id: I0c384eb3950714d8a0aa1353a4bf965330ebc8c1
2017-09-13 10:54:54 -07:00
Kurt Nelson
27616138bc
Fix javadoc typo
...
Change-Id: Id851e1752eba2f57ce7360619fee3b14417b053f
Docs: Fix typo in public StrictMode javadoc
Bug: 62204662
Test: make ds-docs
2017-09-13 10:41:50 -07:00
Jakub Pawlowski
3eb569fc72
Bluetooth: thread-safe callback invocation
...
Bug: 65596701
Test: manual
Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7
2017-09-13 17:31:43 +00:00
Jakub Pawlowski
eb6b3da4fc
Bluetooth: fix GATT race conditions when using Handler
...
Bug: 65596701
Test: manual
Change-Id: Id703cea0543626bdd5a583da95615b650bbcc331
2017-09-13 17:31:24 +00:00
Dave Friedman
4b3a4b58ed
Docs: Updating ANDROID_ID information to reflect Android O changes.
...
Bug: 38270718
Test: Verified on local build.
Change-Id: If4f86d261ae950cc14579aeba65c36a289cdf56c
2017-09-13 08:47:46 -07:00
Nicolas Geoffray
8dbb5e51c8
resolve merge conflicts of e017dae587 to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7008986501028ec9bee0505d41aae3ff27872b50
2017-09-13 11:08:36 +01:00
Rubin Xu
60eae6e621
Merge "Refactor CompareResult<> class and its call sites"
2017-09-13 09:35:04 +00:00
Siyamed Sinir
dcb33f1618
Fix maxLines/lines properties for BoringLayout
...
Line height calculation with maxLines set to zero displayed a single
line when BoringLayout was used. This CL fixes it to show zero lines.
Test: Added related CTS tests to TextViewTest and EditTextText
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Bug: 65435738
Change-Id: Ic21eb50b31666b2dcc2398278010fa072ea1ff67
2017-09-13 09:05:53 +00:00
