OSDN Git Service

android-x86/frameworks-base.git
7 years agoFix double bolding
Seigo Nonaka [Tue, 2 May 2017 05:17:36 +0000 (22:17 -0700)]
Fix double bolding

resolveStyle increases minikinStyle's weight value based on Skia's style
value. Since we compute Skia's style based on given weight value, we
should not add extra bold weight to minikinStyle.

This CL also fixes misunderstanding of base weight.
The base weight is only used for computing weight relative to the
weighted alias. Thus, base weight should not be updated except for
createWeightAlias method.

To be clear, this CL changes the function names but keeps the same
semantics as before.

Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests
Test: am instrument -w -e class android.graphics.cts.TypefaceTest\
      android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Bug: 37880319

Change-Id: Ied73189b11792fb062da46f45afd2db664e6ecb4

7 years agoMerge "Remove controller connection API" into oc-dev am: daefe1dcc7
Daniel Nicoara [Mon, 8 May 2017 16:48:21 +0000 (16:48 +0000)]
Merge "Remove controller connection API" into oc-dev am: daefe1dcc7
am: 41950bc2c6

Change-Id: I48855908fe4fc4c284bc84b0d99bae5a82099c5d

7 years agoMerge "Remove controller connection API" into oc-dev
Daniel Nicoara [Mon, 8 May 2017 16:38:56 +0000 (16:38 +0000)]
Merge "Remove controller connection API" into oc-dev
am: daefe1dcc7

Change-Id: Ic46c8ed4e41b80927f74b2fa96ed997f6b581134

7 years agoMerge "Remove controller connection API" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 16:30:30 +0000 (16:30 +0000)]
Merge "Remove controller connection API" into oc-dev

7 years agoMerge "Destroy Allocation right away on exception" am: 52bc790f61 am: a37bef769a...
Yang Ni [Mon, 8 May 2017 16:22:04 +0000 (16:22 +0000)]
Merge "Destroy Allocation right away on exception" am: 52bc790f61 am: a37bef769a am: fd9f091995
am: 26a5164479

Change-Id: I5017653d4a19b6a0e111f5ae5f0905cf7a5e7d2c

7 years agoMerge "Destroy Allocation right away on exception" am: 52bc790f61 am: a37bef769a
Yang Ni [Mon, 8 May 2017 16:12:37 +0000 (16:12 +0000)]
Merge "Destroy Allocation right away on exception" am: 52bc790f61 am: a37bef769a
am: fd9f091995

Change-Id: Ie83694e722af77c7fc324b8b850e4308f093ab04

7 years agoMerge "Destroy Allocation right away on exception" am: 52bc790f61
Yang Ni [Mon, 8 May 2017 16:06:39 +0000 (16:06 +0000)]
Merge "Destroy Allocation right away on exception" am: 52bc790f61
am: a37bef769a

Change-Id: Id67163535eeaa36d1cd9edd34d19ed04858d62a2

7 years agoMerge "Destroy Allocation right away on exception"
Yang Ni [Mon, 8 May 2017 16:00:34 +0000 (16:00 +0000)]
Merge "Destroy Allocation right away on exception"
am: 52bc790f61

Change-Id: I2724dd4adf68aa8330b10b8f596d9d7db3619e03

7 years agoMerge "Destroy Allocation right away on exception"
Yang Ni [Mon, 8 May 2017 15:52:07 +0000 (15:52 +0000)]
Merge "Destroy Allocation right away on exception"

7 years agoMerge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev am:...
Michael Wright [Mon, 8 May 2017 14:59:21 +0000 (14:59 +0000)]
Merge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev am: 00487cf936
am: b9e1b02f72

Change-Id: I65e4b422849689cf5cfbac6a5c2d4f06fcc9bc8d

7 years agoMerge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev
Michael Wright [Mon, 8 May 2017 14:53:51 +0000 (14:53 +0000)]
Merge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev
am: 00487cf936

Change-Id: Iee08e297248aa57179a434f81f27e3e7924aa201

7 years agoMerge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 14:49:20 +0000 (14:49 +0000)]
Merge "Also log the value of the IAEs thrown in VibrationEffect" into oc-dev

7 years agoMerge "Fix broken Backspace/ForwardDelete tests" into oc-dev am: 2880a4b41f
Andrei Stingaceanu [Mon, 8 May 2017 13:34:17 +0000 (13:34 +0000)]
Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev am: 2880a4b41f
am: 1fadfb0765

Change-Id: If8e0edfd2f1e1aeaa0831863fb2cd6b83a252083

7 years agoMerge "Fix broken Backspace/ForwardDelete tests" into oc-dev
Andrei Stingaceanu [Mon, 8 May 2017 13:28:16 +0000 (13:28 +0000)]
Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev
am: 2880a4b41f

Change-Id: I1c114c411d97aba08ecfb390c28ceb18eee4cbbd

7 years agoMerge "Fix broken Backspace/ForwardDelete tests" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 13:21:27 +0000 (13:21 +0000)]
Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev

7 years agoMerge "Don't yell when calling into SystemUI" into oc-dev am: 5286b96576
Jorim Jaggi [Mon, 8 May 2017 13:04:56 +0000 (13:04 +0000)]
Merge "Don't yell when calling into SystemUI" into oc-dev am: 5286b96576
am: f5b8b9ccd8

Change-Id: Iee07bce280068961c29544eddbc2facd1d608462

7 years agoMerge "Don't yell when calling into SystemUI" into oc-dev
Jorim Jaggi [Mon, 8 May 2017 12:58:05 +0000 (12:58 +0000)]
Merge "Don't yell when calling into SystemUI" into oc-dev
am: 5286b96576

Change-Id: I9e84ae5c1729bd417d449d18eec0449c40029a2c

7 years agoMerge "Don't yell when calling into SystemUI" into oc-dev
Jorim Jaggi [Mon, 8 May 2017 12:51:42 +0000 (12:51 +0000)]
Merge "Don't yell when calling into SystemUI" into oc-dev

7 years agoMerge "Clear Gatekeeper state before a new enrollment" into oc-dev am: a5f08d340d
Rubin Xu [Mon, 8 May 2017 12:17:09 +0000 (12:17 +0000)]
Merge "Clear Gatekeeper state before a new enrollment" into oc-dev am: a5f08d340d
am: d9404903ee  -s ours

Change-Id: Ide8a223f128b506943f238f865af86d0a7ca85e8

7 years agoMerge "Clear Gatekeeper state before a new enrollment" into oc-dev
Rubin Xu [Mon, 8 May 2017 12:10:17 +0000 (12:10 +0000)]
Merge "Clear Gatekeeper state before a new enrollment" into oc-dev
am: a5f08d340d

Change-Id: I4d94dd962459c8a565eb2efc7d26afe80e14786b

7 years agoMerge "Clear Gatekeeper state before a new enrollment" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 12:02:45 +0000 (12:02 +0000)]
Merge "Clear Gatekeeper state before a new enrollment" into oc-dev

7 years agoMerge "Remove obsolete DEXOPT_SAFEMODE."
Nicolas Geoffray [Mon, 8 May 2017 10:35:28 +0000 (10:35 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."

7 years agoMerge "Defeat @Nullable String[] with empty list." into oc-dev am: 5a421ad0ef
Jeff Sharkey [Sun, 7 May 2017 17:56:40 +0000 (17:56 +0000)]
Merge "Defeat @Nullable String[] with empty list." into oc-dev am: 5a421ad0ef
am: 22343c42d2

Change-Id: Id56528c56ec4520591c00b53faf6b4de7380b891

7 years agoMerge "No quota-level details for public volumes." into oc-dev am: 4566cb5756
Jeff Sharkey [Sun, 7 May 2017 17:54:32 +0000 (17:54 +0000)]
Merge "No quota-level details for public volumes." into oc-dev am: 4566cb5756
am: da61aba219

Change-Id: I30d0d4e9a9d686fe13e71f5360683bd546d7f5c5

7 years agoMerge "Defeat @Nullable String[] with empty list." into oc-dev
Jeff Sharkey [Sun, 7 May 2017 17:49:39 +0000 (17:49 +0000)]
Merge "Defeat @Nullable String[] with empty list." into oc-dev
am: 5a421ad0ef

Change-Id: Iad313a998a159049cfc55fff978b47be93f5e834

7 years agoMerge "No quota-level details for public volumes." into oc-dev
Jeff Sharkey [Sun, 7 May 2017 17:45:36 +0000 (17:45 +0000)]
Merge "No quota-level details for public volumes." into oc-dev
am: 4566cb5756

Change-Id: Ib778a428d4f43b976b13ab21aee021bb9beb7d79

7 years agoMerge "Defeat @Nullable String[] with empty list." into oc-dev
Jeff Sharkey [Sun, 7 May 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Defeat @Nullable String[] with empty list." into oc-dev

7 years agoMerge "No quota-level details for public volumes." into oc-dev
Jeff Sharkey [Sun, 7 May 2017 17:38:15 +0000 (17:38 +0000)]
Merge "No quota-level details for public volumes." into oc-dev

7 years agoMerge "Only clear state for force stopped fill service" into oc-dev am: 6bfcc82a4b
Svet Ganov [Sun, 7 May 2017 01:44:32 +0000 (01:44 +0000)]
Merge "Only clear state for force stopped fill service" into oc-dev am: 6bfcc82a4b
am: eebdc4eb66

Change-Id: I6ae48f6a8cc457b57e4a414629aedf7cdae3df49

7 years agoMerge "Only clear state for force stopped fill service" into oc-dev
Svet Ganov [Sun, 7 May 2017 01:33:11 +0000 (01:33 +0000)]
Merge "Only clear state for force stopped fill service" into oc-dev
am: 6bfcc82a4b

Change-Id: I4bc2190dba1afc2274547a00984635cbbc3a4b6b

7 years agoMerge "Only clear state for force stopped fill service" into oc-dev
TreeHugger Robot [Sun, 7 May 2017 01:17:02 +0000 (01:17 +0000)]
Merge "Only clear state for force stopped fill service" into oc-dev

7 years agoMerge "Fix issue #38037532: Toasts cause apps to become foreground" into oc-dev am...
Dianne Hackborn [Sun, 7 May 2017 01:15:16 +0000 (01:15 +0000)]
Merge "Fix issue #38037532: Toasts cause apps to become foreground" into oc-dev am: 1801f688b9
am: 1d1a8c512c

Change-Id: I7c07a165dd882c9d9918c10d9d7071c4f9b9c646

7 years agoMerge "Fix issue #38037532: Toasts cause apps to become foreground" into oc-dev
Dianne Hackborn [Sun, 7 May 2017 01:07:41 +0000 (01:07 +0000)]
Merge "Fix issue #38037532: Toasts cause apps to become foreground" into oc-dev
am: 1801f688b9

Change-Id: Ib812e0357e50b5af010552d0ef18d27e071370b2

7 years agoMerge "Fix issue #38037532: Toasts cause apps to become foreground" into oc-dev
Dianne Hackborn [Sun, 7 May 2017 00:59:06 +0000 (00:59 +0000)]
Merge "Fix issue #38037532: Toasts cause apps to become foreground" into oc-dev

7 years agoOnly clear state for force stopped fill service
Svet Ganov [Sat, 6 May 2017 23:12:16 +0000 (16:12 -0700)]
Only clear state for force stopped fill service

Test: manual

bug:37785814

Change-Id: I5e40a284788bacf1ebae5ddefffb93b1a5b47d39

7 years agoMerge "Add call super" into oc-dev am: a41a968f10
Svet Ganov [Sat, 6 May 2017 23:05:12 +0000 (23:05 +0000)]
Merge "Add call super" into oc-dev am: a41a968f10
am: c13d648d4b

Change-Id: I93f57d5bfeaad9c94f6b7460734125cc259624b0

7 years agoMerge "Add call super" into oc-dev
Svet Ganov [Sat, 6 May 2017 22:54:33 +0000 (22:54 +0000)]
Merge "Add call super" into oc-dev
am: a41a968f10

Change-Id: I864d2ec8d19e37ee1cd849d6cefb216df79ff6dd

7 years agoMerge "Add call super" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 22:46:37 +0000 (22:46 +0000)]
Merge "Add call super" into oc-dev

7 years agoAdd call super
Svet Ganov [Sat, 6 May 2017 02:38:45 +0000 (19:38 -0700)]
Add call super

Test: manual

bug:37775067

Change-Id: I50a50f1fbdb7e9c087c72ad0be3b767aeab9572a

7 years agoMerge "Draw rectangle shadow fast in low elevation cases"
TreeHugger Robot [Sat, 6 May 2017 19:54:01 +0000 (19:54 +0000)]
Merge "Draw rectangle shadow fast in low elevation cases"

7 years agoMerge "Updated tonal palette algorithm"
TreeHugger Robot [Sat, 6 May 2017 19:24:01 +0000 (19:24 +0000)]
Merge "Updated tonal palette algorithm"

7 years agoDraw rectangle shadow fast in low elevation cases
Charlie Tsai [Fri, 5 May 2017 10:51:47 +0000 (11:51 +0100)]
Draw rectangle shadow fast in low elevation cases

When the elevation is not high, the shadow is similar
to just add some dark lines on the edges and corners of
rectangle views. Using simple algorithm can also improve
the performance and save more memory.

Test: The render result of unit test is updated.
Bug: 37906145

Change-Id: I28758f868ee6e24e4552368bddfb7ac10fe0a205

7 years agoMerge "Increase timeout for flaky testCACertLoader()"
TreeHugger Robot [Sat, 6 May 2017 16:19:55 +0000 (16:19 +0000)]
Merge "Increase timeout for flaky testCACertLoader()"

7 years agoMerge "Prune abandoned autofill sessions" into oc-dev am: 0271dfd814
Philip P. Moltmann [Sat, 6 May 2017 16:04:28 +0000 (16:04 +0000)]
Merge "Prune abandoned autofill sessions" into oc-dev am: 0271dfd814
am: 25b3e07877

Change-Id: I838d612ed3768f86a3207189454bcdfb7311d7ab

7 years agoMerge "Prune abandoned autofill sessions" into oc-dev
Philip P. Moltmann [Sat, 6 May 2017 15:57:57 +0000 (15:57 +0000)]
Merge "Prune abandoned autofill sessions" into oc-dev
am: 0271dfd814

Change-Id: I3bde59a5bf68a9cf4cb328c39bdbf22292b0ed86

7 years agoMerge "Prune abandoned autofill sessions" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 15:51:44 +0000 (15:51 +0000)]
Merge "Prune abandoned autofill sessions" into oc-dev

7 years agoMerge "Properly translate text locations to screen coords" into oc-dev am: 2a86bad94c
Phil Weaver [Sat, 6 May 2017 15:46:00 +0000 (15:46 +0000)]
Merge "Properly translate text locations to screen coords" into oc-dev am: 2a86bad94c
am: c89c9dd3a9

Change-Id: I873787374ca65c0d18bf0c62416c4ffd4db69ef3

7 years agoMerge "Properly translate text locations to screen coords" into oc-dev
Phil Weaver [Sat, 6 May 2017 15:40:20 +0000 (15:40 +0000)]
Merge "Properly translate text locations to screen coords" into oc-dev
am: 2a86bad94c

Change-Id: I268464c67b76de2a5c467a8cbb60b4dbee784b47

7 years agoMerge "Properly translate text locations to screen coords" into oc-dev
Phil Weaver [Sat, 6 May 2017 15:29:19 +0000 (15:29 +0000)]
Merge "Properly translate text locations to screen coords" into oc-dev

7 years agoIncrease timeout for flaky testCACertLoader()
phweiss [Sat, 6 May 2017 14:21:51 +0000 (16:21 +0200)]
Increase timeout for flaky testCACertLoader()

Bug: 37535489
Bug: 38045871
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java
Change-Id: I5778082973af7c6d4d719b83e334fec552b0a89e

7 years agoMerge "Get wallpaper colors from thumbnail"
Lucas Dupin [Sat, 6 May 2017 04:07:17 +0000 (04:07 +0000)]
Merge "Get wallpaper colors from thumbnail"

7 years agoMerge "Merge "Audio service: always unduck focus requester when granted" into oc...
Android Build Merger (Role) [Sat, 6 May 2017 03:33:53 +0000 (03:33 +0000)]
Merge "Merge "Audio service: always unduck focus requester when granted" into oc-dev am: 8e3a8a7027 am: f306510be0"

7 years agoMerge "Implement step and scan calls of ITuner."
Tomasz Wasilczyk [Sat, 6 May 2017 03:32:53 +0000 (03:32 +0000)]
Merge "Implement step and scan calls of ITuner."

7 years agoMerge "Audio service: always unduck focus requester when granted" into oc-dev am...
Jean-Michel Trivi [Sat, 6 May 2017 03:32:48 +0000 (03:32 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev am: 8e3a8a7027
am: f306510be0

Change-Id: I21a3b1a63aefbe27883454682db70baa77cc4292

7 years agoMerge "Convert libandroid and libandroid_runtime to Android.bp" am: d308803b82 am...
Colin Cross [Sat, 6 May 2017 03:31:00 +0000 (03:31 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp" am: d308803b82 am: 06a6e81c1d am: fb18f4cfed  -s ours
am: f89107022b  -s ours

Change-Id: I8d94acca20ef57885cda5cafa31c0f498c756741

7 years agoMerge "Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a am: d3861...
nharold [Sat, 6 May 2017 03:25:24 +0000 (03:25 +0000)]
Merge "Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a am: d38615b846 am: 63a79edbe0  -s ours" into oc-dev-plus-aosp
am: 22ac87f20c

Change-Id: I8943df82ccc0f45f5d2b8bfd3c59c68403086744

7 years agoMerge "Audio service: always unduck focus requester when granted" into oc-dev
Jean-Michel Trivi [Sat, 6 May 2017 03:09:15 +0000 (03:09 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev
am: 8e3a8a7027

Change-Id: I724cabd147d86d34dc8b76cbbe083500e9b994f5

7 years agoMerge "Convert libandroid and libandroid_runtime to Android.bp" am: d308803b82 am...
Colin Cross [Sat, 6 May 2017 03:05:18 +0000 (03:05 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp" am: d308803b82 am: 06a6e81c1d
am: fb18f4cfed  -s ours

Change-Id: I8b61ee0eedd7c0c9b217ab943200db330925bd0e

7 years agoMerge "Audio service: always unduck focus requester when granted" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 03:03:07 +0000 (03:03 +0000)]
Merge "Audio service: always unduck focus requester when granted" into oc-dev

7 years agoMerge "Hide from the world that ssaid is in a dedicated table" into oc-dev am: 71c999febb
Svetoslav Ganov [Sat, 6 May 2017 03:01:19 +0000 (03:01 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev am: 71c999febb
am: e5d03623e7

Change-Id: If390f389b270c1c35f1ee60c09b2cf5bfecd1df1

7 years agoMerge "Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a am: d3861...
Android Build Merger (Role) [Sat, 6 May 2017 02:58:25 +0000 (02:58 +0000)]
Merge "Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a am: d38615b846 am: 63a79edbe0  -s ours" into oc-dev-plus-aosp

7 years agoMerge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a am: d38615b846
nharold [Sat, 6 May 2017 02:54:22 +0000 (02:54 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a am: d38615b846
am: 63a79edbe0  -s ours

Change-Id: I601b62fd047d2b446de3d6c67c18bcc0a56316f9

7 years agoMerge "Hide from the world that ssaid is in a dedicated table" into oc-dev
Svetoslav Ganov [Sat, 6 May 2017 02:51:45 +0000 (02:51 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev
am: 71c999febb

Change-Id: I91b9e3bea2335b01c6f0d52500a3b3775c62d163

7 years agoMerge "Hide from the world that ssaid is in a dedicated table" into oc-dev
Svetoslav Ganov [Sat, 6 May 2017 02:41:50 +0000 (02:41 +0000)]
Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev

7 years agoMerge "Report less data in structure to autofill provider" into oc-dev am: d19113b390
Philip P. Moltmann [Sat, 6 May 2017 02:37:00 +0000 (02:37 +0000)]
Merge "Report less data in structure to autofill provider" into oc-dev am: d19113b390
am: 889b15b4c2

Change-Id: Id60c55e06e94c3f639703beda9b249dcf0f8bd6c

7 years agoMerge "Offer to wait until broadcasts have drained." into oc-dev am: 6f4aab2c01
Jeff Sharkey [Sat, 6 May 2017 02:29:03 +0000 (02:29 +0000)]
Merge "Offer to wait until broadcasts have drained." into oc-dev am: 6f4aab2c01
am: 8c921a8f14

Change-Id: Ia55b3b9666b2683e880e07071b53645ba309a57c

7 years agoMerge "Convert libandroid and libandroid_runtime to Android.bp" am: d308803b82
Colin Cross [Sat, 6 May 2017 02:25:51 +0000 (02:25 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp" am: d308803b82
am: 06a6e81c1d

Change-Id: Ib613e9f89275c2af534c0b341f6c1c14c9af819a

7 years agoMerge "Convert libandroid and libandroid_runtime to Android.bp"
Colin Cross [Sat, 6 May 2017 02:19:49 +0000 (02:19 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp"
am: d308803b82

Change-Id: I90804cba65863d6194d7dd683024b43297357f19

7 years agoMerge "Call ActivityManager to request activity relaunch" into oc-dev am: 748405a0f5
Fyodor Kupolov [Sat, 6 May 2017 02:19:41 +0000 (02:19 +0000)]
Merge "Call ActivityManager to request activity relaunch" into oc-dev am: 748405a0f5
am: f9c94ddef7

Change-Id: I85cde24fb6a40a61d2a38c915599d1716d88c0b8

7 years agoMerge "Report less data in structure to autofill provider" into oc-dev
Philip P. Moltmann [Sat, 6 May 2017 02:19:39 +0000 (02:19 +0000)]
Merge "Report less data in structure to autofill provider" into oc-dev
am: d19113b390

Change-Id: I492245dee87450b1b54fef2c06c600ac290adffe

7 years agoMerge "Prevent crashes when user is stopping" into oc-dev am: b4656dafc1
Fyodor Kupolov [Sat, 6 May 2017 02:17:39 +0000 (02:17 +0000)]
Merge "Prevent crashes when user is stopping" into oc-dev am: b4656dafc1
am: ada0568c76

Change-Id: I6f0c5a58d59c709d31345234056ad6eca0800b1e

7 years agoMerge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev am: 4972daf992
Roozbeh Pournader [Sat, 6 May 2017 02:09:13 +0000 (02:09 +0000)]
Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev am: 4972daf992
am: 230e3beda5

Change-Id: Iafd6e9cb942210cb422453570c8ae54d11d50356

7 years agoMerge "Offer to wait until broadcasts have drained." into oc-dev
Jeff Sharkey [Sat, 6 May 2017 02:08:27 +0000 (02:08 +0000)]
Merge "Offer to wait until broadcasts have drained." into oc-dev
am: 6f4aab2c01

Change-Id: Id6045353ed2293ece7ecdb7697904fa7993a7ed3

7 years agoMerge "Report less data in structure to autofill provider" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 02:07:54 +0000 (02:07 +0000)]
Merge "Report less data in structure to autofill provider" into oc-dev

7 years agoMerge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a
nharold [Sat, 6 May 2017 02:06:27 +0000 (02:06 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a
am: d38615b846

Change-Id: Ib24d0d0f98ca59684e64ea9a85dd230d17143cb8

7 years agoGet wallpaper colors from thumbnail
Lucas Dupin [Wed, 3 May 2017 19:42:58 +0000 (12:42 -0700)]
Get wallpaper colors from thumbnail

Live wallpapers now have a default color extraciton implementation.
We'll try to pick colors from their thumbnails.

Bug: 37952518
Test: manual
Change-Id: I2915cbab673e39cd5e4686fe8e271ac2d4587436

7 years agoMerge "Call ActivityManager to request activity relaunch" into oc-dev
Fyodor Kupolov [Sat, 6 May 2017 02:06:04 +0000 (02:06 +0000)]
Merge "Call ActivityManager to request activity relaunch" into oc-dev
am: 748405a0f5

Change-Id: I2780805663b223d82b1b7d3582ae5850c30c7b7d

7 years agoMerge "Prevent crashes when user is stopping" into oc-dev
Fyodor Kupolov [Sat, 6 May 2017 02:04:01 +0000 (02:04 +0000)]
Merge "Prevent crashes when user is stopping" into oc-dev
am: b4656dafc1

Change-Id: Ic350bed31bd9d92f377bbe88aa5d8142984ec5f9

7 years agoMerge "Convert libandroid and libandroid_runtime to Android.bp"
Treehugger Robot [Sat, 6 May 2017 02:02:44 +0000 (02:02 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp"

7 years agoMerge "Offer to wait until broadcasts have drained." into oc-dev
Jeff Sharkey [Sat, 6 May 2017 01:58:07 +0000 (01:58 +0000)]
Merge "Offer to wait until broadcasts have drained." into oc-dev

7 years agoMerge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev
Roozbeh Pournader [Sat, 6 May 2017 01:56:05 +0000 (01:56 +0000)]
Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev
am: 4972daf992

Change-Id: I8e24a7b278150bbb8b1e4b629f1d3473a732e7b9

7 years agoMerge changes from topic 'sms-files-move-opt-to-base'
nharold [Sat, 6 May 2017 01:55:40 +0000 (01:55 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base'
am: abcc43d86a

Change-Id: Ib61b38a3fd065c3906e2e3f0863b83f2f4b740f4

7 years agoMerge "Call ActivityManager to request activity relaunch" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:52:10 +0000 (01:52 +0000)]
Merge "Call ActivityManager to request activity relaunch" into oc-dev

7 years agoMerge changes from topic 'sms-files-move-opt-to-base'
nharold [Sat, 6 May 2017 01:45:35 +0000 (01:45 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base'

* changes:
  Move newFromRil() function to a utility class
  Remove dependency on telephony-common from services/core
  Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
  Port Utility Functions from DefaultPhoneNotifier
  Remove dependency on IccConstants from SmsManager
  Move files from frameworks/opt/telephony to frameworks/base

7 years agoMerge "Prevent crashes when user is stopping" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:44:11 +0000 (01:44 +0000)]
Merge "Prevent crashes when user is stopping" into oc-dev

7 years agoUpdated tonal palette algorithm
Lucas Dupin [Fri, 5 May 2017 21:37:13 +0000 (14:37 -0700)]
Updated tonal palette algorithm

Brought over new palette definitions and picking
adjascent gradient colors.

Fixes: 37985946
Test: visual
Change-Id: I2a59c6d3147bfdb90b7710a93bb3d5e41f9ef364

7 years agoMerge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev

7 years agoMerge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev...
Jean-Michel Trivi [Sat, 6 May 2017 01:32:12 +0000 (01:32 +0000)]
Merge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev am: 288f085aba
am: 0af6d8050e

Change-Id: I5686551990266e49b2fd69a00c4edcba08acc7b5

7 years agoMerge "LightsService: open hal less aggressively" into oc-dev am: 19419d00fb
Steven Moreland [Sat, 6 May 2017 01:27:54 +0000 (01:27 +0000)]
Merge "LightsService: open hal less aggressively" into oc-dev am: 19419d00fb
am: cce18b4496

Change-Id: I43367b23753f33ad5f611c2a43a13238592c666e

7 years agoMerge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev
Jean-Michel Trivi [Sat, 6 May 2017 01:25:27 +0000 (01:25 +0000)]
Merge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev
am: 288f085aba

Change-Id: I3b3ec60bcd86d647100f5c1cbc12836ab95e77ee

7 years agoMerge "LightsService: open hal less aggressively" into oc-dev
Steven Moreland [Sat, 6 May 2017 01:21:39 +0000 (01:21 +0000)]
Merge "LightsService: open hal less aggressively" into oc-dev
am: 19419d00fb

Change-Id: Ia88a9c94e32074484aa24b3d06353709c458115b

7 years agoMerge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev
Jean-Michel Trivi [Sat, 6 May 2017 01:16:38 +0000 (01:16 +0000)]
Merge "AudioAudioPolicyFocusListener and ducking enforced by framework" into oc-dev

7 years agoMerge "LightsService: open hal less aggressively" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:15:38 +0000 (01:15 +0000)]
Merge "LightsService: open hal less aggressively" into oc-dev

7 years agoMove newFromRil() function to a utility class
Nathan Harold [Wed, 25 Jan 2017 01:08:34 +0000 (17:08 -0800)]
Move newFromRil() function to a utility class

Remove a dependency on frameworks/opt from SmsMessage for CDMA

-Code move to frameworks/opt/telephony../cdma/SmsMessageConverter

Bug: 33414487
Test: Manually verified GSM and CDMA SMS: MO and MT
Change-Id: I730d292c4aad6524b03b18c0751738a73a71ecf7

7 years agoRemove dependency on telephony-common from services/core
Nathan Harold [Wed, 14 Dec 2016 19:40:03 +0000 (11:40 -0800)]
Remove dependency on telephony-common from services/core

After migrating all the dependencies from frameworks/opt/telephony
to frameworks/base, the dependency is no longer needed and should
never have been created in the first place. Happily removed.

Bug: 33414487
Test: compilation
Change-Id: I261da4c6b819b3c960ce56d2cab5c80cb34e852e

7 years agoMove OTASP_* Consts from ServiceStateTracker to TelephonyManager
Nathan Harold [Wed, 14 Dec 2016 19:24:48 +0000 (11:24 -0800)]
Move OTASP_* Consts from ServiceStateTracker to TelephonyManager

-Move the OTASP_* constants from SST
-Update references to those constants in TelephonyRegistry

Bug: 33414487
Test: compilation
Change-Id: I9516a8dfa9623d69d7e051749815e91ed3d013fa

7 years agoPort Utility Functions from DefaultPhoneNotifier
Nathan Harold [Wed, 14 Dec 2016 18:48:00 +0000 (10:48 -0800)]
Port Utility Functions from DefaultPhoneNotifier

-Move static utility functions from frameworks/opt/telephony/
 ..DefaultPhoneNotifier to a new utility class in frameworks/base

-Update TelephonyRegistry to point to the new functions.

Bug: 33414487
Test: compilation
Change-Id: I36a113cb5122569d451ec3a2dfa71d72d590fa52

7 years agoRemove dependency on IccConstants from SmsManager
Nathan Harold [Wed, 14 Dec 2016 03:03:09 +0000 (19:03 -0800)]
Remove dependency on IccConstants from SmsManager

-Redefine the length of the SmsRecord in SmsManager

Bug: 33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546

7 years agoMove files from frameworks/opt/telephony to frameworks/base
Nathan Harold [Wed, 26 Apr 2017 01:27:08 +0000 (18:27 -0700)]
Move files from frameworks/opt/telephony to frameworks/base

Bug: 37688438
Test: compilation, boot on aosp_bullhead
Merged-In: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Change-Id: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe

7 years agoConvert libandroid and libandroid_runtime to Android.bp
Colin Cross [Sat, 6 May 2017 01:09:40 +0000 (01:09 +0000)]
Convert libandroid and libandroid_runtime to Android.bp
am: af737306f9

Change-Id: I58751f64dac08af9574665669b17849a6eb43c58