TreeHugger Robot
891f481ef8
Merge "Refactoring: Deprecate Paint.mNativeTypeface."
2017-08-08 19:48:05 +00:00
Jakub Pawlowski
06ae9c665b
Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)
...
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.
Test: compilation test
Change-Id: I9a6db8832c9ec3215c648e325d67278832ef22cc
2017-08-08 19:04:13 +00:00
Seigo Nonaka
318ca04079
Refactoring: Deprecate Paint.mNativeTypeface.
...
Bug: 64269689
Test: m checkbuild
Test: bit CtsGraphicsTestCases:*
Test: bit CtsViewTestCases:*
Test: bit CtsTextTestCases:*
Change-Id: Idc9f2b4612741be949204cd06efc41e1738d6587
2017-08-08 18:07:28 +00:00
TreeHugger Robot
a7d731d5fe
Merge changes from topics 'roozbeh-b31537595-thirdtry', 'roozbeh-b64372088'
...
* changes:
Make ellipsize retry if text doesn't fit
Reset StaticLayout.mEllipsized during generate()
2017-08-08 17:53:05 +00:00
Fyodor Kupolov
88f14dd257
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev am: 3102245b62
...
am: 7aaf486267
2017-08-08 17:03:42 +00:00
Fyodor Kupolov
7aaf486267
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
...
am: 3102245b62
2017-08-08 16:55:10 +00:00
Fyodor Kupolov
3102245b62
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
2017-08-08 16:46:24 +00:00
Hugo Benichi
97af984806
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e33 am: 43581b8759" into oc-mr1-dev-plus-aosp
...
am: 6af25a5ef6
2017-08-08 16:30:16 +00:00
Todd Kennedy
b6ff3774fc
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev am: 8c18e1faf8
...
am: 3ff3e75fb2
2017-08-08 16:23:09 +00:00
Android Build Merger (Role)
6af25a5ef6
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e33 am: 43581b8759" into oc-mr1-dev-plus-aosp
2017-08-08 16:12:29 +00:00
Hugo Benichi
7d2690a91f
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e33
...
am: 43581b8759
2017-08-08 16:10:52 +00:00
Todd Kennedy
3ff3e75fb2
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
...
am: 8c18e1faf8
2017-08-08 16:06:17 +00:00
Android Build Merger (Role)
279c26fa24
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e33" into oc-mr1-dev
2017-08-08 16:03:17 +00:00
Hugo Benichi
de3b32c277
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
...
am: 5e24152e33
2017-08-08 16:01:10 +00:00
Hugo Benichi
43581b8759
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
...
am: 5e24152e33
2017-08-08 16:01:07 +00:00
TreeHugger Robot
8c18e1faf8
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
2017-08-08 15:58:41 +00:00
TreeHugger Robot
5e24152e33
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
2017-08-08 15:52:39 +00:00
Adrian Roos
4c3ec15c18
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev am: 956491b867
...
am: eb83d9c0cc
2017-08-08 12:07:55 +00:00
Adrian Roos
eb83d9c0cc
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev
...
am: 956491b867
2017-08-08 12:02:27 +00:00
TreeHugger Robot
956491b867
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev
2017-08-08 11:53:46 +00:00
Bookatz
bb41329717
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev am: 26e02181a0
...
am: 8344812329
2017-08-08 06:17:04 +00:00
Bookatz
8344812329
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev
...
am: 26e02181a0
2017-08-08 06:11:30 +00:00
TreeHugger Robot
26e02181a0
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev
2017-08-08 06:03:18 +00:00
Todd Poynor
589ce7dfc5
Merge "thermalservice: Add ThermalService java interfaces" into oc-mr1-dev
...
am: 590f519f24
2017-08-08 01:23:35 +00:00
TreeHugger Robot
590f519f24
Merge "thermalservice: Add ThermalService java interfaces" into oc-mr1-dev
2017-08-08 01:15:41 +00:00
Philip P. Moltmann
615fefc04a
Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev am: fdaad13803
...
am: f288de8421
2017-08-08 01:07:17 +00:00
Philip P. Moltmann
f288de8421
Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev
...
am: fdaad13803
2017-08-08 00:54:48 +00:00
Tomasz Wasilczyk
98ea4bfa1d
Merge "Change VENDOR program types to range." into oc-mr1-dev am: ecacb9850c
...
am: 24d0f84bf1
2017-08-08 00:49:24 +00:00
TreeHugger Robot
fdaad13803
Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev
...
* changes:
Allow to read all params used to create session.
Allow to transfer+seal a install session
2017-08-08 00:45:48 +00:00
Tomasz Wasilczyk
24d0f84bf1
Merge "Change VENDOR program types to range." into oc-mr1-dev
...
am: ecacb9850c
2017-08-08 00:41:04 +00:00
Tomasz Wasilczyk
ecacb9850c
Merge "Change VENDOR program types to range." into oc-mr1-dev
2017-08-08 00:35:09 +00:00
Calin Juravle
152cc62627
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev am: 284b584499
...
am: b2963f3351
2017-08-08 00:32:36 +00:00
Calin Juravle
b2963f3351
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev
...
am: 284b584499
2017-08-08 00:24:40 +00:00
Hugo Benichi
ad5e2827ea
NetworkStats: more robust subtraction for deltas
...
This patch ensures that subtract() between two NetworkStats object will
return a delta with no negative entries in all cases.
When the stats delta contains some negative values, there are clamped to
0. Some logging is added when this happens.
This is what's expected by NetworkStatsHistory#recordData().
Bug: 64365917
Test: runtest frameworks-net
Change-Id: I16e97e73f600225f80e0ce517e80c07c6f399196
2017-08-08 09:19:05 +09:00
Calin Juravle
284b584499
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev
2017-08-08 00:17:44 +00:00
Felipe Leme
3bec59a777
Merge "Minor Autofill changes after API council review." into oc-mr1-dev am: be3e4a6285
...
am: a9adf37e1d
2017-08-08 00:01:28 +00:00
Felipe Leme
a9adf37e1d
Merge "Minor Autofill changes after API council review." into oc-mr1-dev
...
am: be3e4a6285
2017-08-07 23:53:09 +00:00
Sudheer Shanka
b60349a5e1
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
...
am: e913d8235c
2017-08-07 23:43:22 +00:00
Adam Bookatz
ce58090c00
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev am: 0a1ae1bc56
...
am: e4fa69b956
2017-08-07 23:42:05 +00:00
TreeHugger Robot
be3e4a6285
Merge "Minor Autofill changes after API council review." into oc-mr1-dev
2017-08-07 23:35:56 +00:00
Adam Bookatz
e4fa69b956
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev
...
am: 0a1ae1bc56
2017-08-07 23:33:44 +00:00
Sudheer Shanka
e913d8235c
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
2017-08-07 23:32:50 +00:00
Adam Bookatz
0a1ae1bc56
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev
2017-08-07 23:22:31 +00:00
Roozbeh Pournader
e88b5df5b7
Make ellipsize retry if text doesn't fit
...
This fixes the cases where the replacement of parts of text with
ellipsis may result in more-than-expected width of text due to
contextual width changes in the font, such as kerning or Arabic
shaping.
The calculations in TextUtils.ellipsize() and StaticLayout are fixed
to recalculate the new width and reduce it further until the text
actuall fits. BoringLayout and DynamicLayout get fixed too since
they use the other two implementations indirectly.
Also reverse a recently-introduced incorrect check for
multi-character ellipsis in Layout.java.
Fixes: 31537595
Fixes: 64156587
Test: Manual (Arabic edge cases ellipsize correctly)
Test: bit CtsTextTestCases:*
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Test: bit CtsWidgetTestCases:android.widget.cts.CheckedTextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.AutoCompleteTextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.MultiAutoCompleteTextViewTest
Test: bit FrameworksCoreTests:android.text.
Test: adb shell am instrument -w com.android.documentsui.tests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iaddcc8b01c78d477e2c29b339d321c9631426f34
2017-08-07 16:22:00 -07:00
Todd Poynor
875e5c7451
thermalservice: Add ThermalService java interfaces
...
Binder service ThermalService broadcasts thermal events to registered
listeners.
Test: manual: marlin with modified thermal-engine.conf and temporary
java thermal event listener
Bug: 30982366
Change-Id: I11f7fd18feff3b9af0eecc3fd3a13d54c0b97ff0
(cherry picked from commit dd05582eab
2017-08-07 23:08:36 +00:00
Andrii Kulian
4e61506474
Merge "Merge "Add black frame behind app window" into oc-dr1-dev am: cbdaf04101 am: cdcc9dd0dd" into oc-mr1-dev-plus-aosp
...
am: 5c6f9676cb
2017-08-07 22:44:41 +00:00
Siyamed Sinir
a19cd51d2c
Reset StaticLayout.mEllipsized during generate()
...
StaticLayout.mEllipsized and mMaxLineHeight was set for proper
calculation of static ellipsized text height. However, since
DynamicLayout uses a static instance of StaticLayout, and nobody reset
the mEllipsized, this caused configuration discrepancies for different
DynamicLayout instances.
Test: bit -t CtsTextTestCases:android.text.cts.DynamicLayoutTest
Test: bit -t CtsTextTestCases:android.text.cts.StaticLayoutTest
Fixes: 64372088
Bug: 64312574
Change-Id: I8ea6697d29da2ccbb433b64f17b4d1d6f254e8e1
2017-08-07 15:35:06 -07:00
Andrii Kulian
cdea2b5ab8
Merge "Add black frame behind app window" into oc-dr1-dev am: cbdaf04101
...
am: cdcc9dd0dd
2017-08-07 22:29:34 +00:00
Andrii Kulian
66994114e7
Merge "Add black frame behind app window" into oc-dr1-dev
...
am: cbdaf04101
2017-08-07 22:21:08 +00:00
Andrii Kulian
cdcc9dd0dd
Merge "Add black frame behind app window" into oc-dr1-dev
...
am: cbdaf04101
2017-08-07 22:20:21 +00:00
