OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Move CompanionDeviceManagerService to a place of its own" into oc-dev
Eugene Susla [Wed, 19 Apr 2017 21:28:03 +0000 (21:28 +0000)]
Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev
am: 992541027b

Change-Id: Ie45e68269e37bb65a9eca4bda3a38019f8e12162

7 years agoMerge "Fix compose shader child local matrix mutation" into oc-dev
Chris Craik [Wed, 19 Apr 2017 21:25:59 +0000 (21:25 +0000)]
Merge "Fix compose shader child local matrix mutation" into oc-dev
am: 611fae13df

Change-Id: I76a5398f300ccac27fe70e7f7377d0ea8c779cbe

7 years agoMerge "Don't show starting window for overlay activities" into oc-dev
Wale Ogunwale [Wed, 19 Apr 2017 21:24:04 +0000 (21:24 +0000)]
Merge "Don't show starting window for overlay activities" into oc-dev
am: 57d0c0bb43

Change-Id: I104e28f967d72eb0ef533a6ae3e0a85d6f87d3df

7 years agoMerge "Flesh out more API docs." into oc-dev
Jeff Sharkey [Wed, 19 Apr 2017 21:22:10 +0000 (21:22 +0000)]
Merge "Flesh out more API docs." into oc-dev
am: 3a427c3bd9

Change-Id: I2031389cf3de22134af6ca48c0537e7ec3d150bc

7 years agoMerge "Only send HOST_STATE intents when host mode is used." into oc-dev
Jerry Zhang [Wed, 19 Apr 2017 21:19:58 +0000 (21:19 +0000)]
Merge "Only send HOST_STATE intents when host mode is used." into oc-dev
am: a73f9f874a

Change-Id: Idafd3b20e6780cc51dd18c327d8aeaa4247fa06f

7 years agoMerge "Up the character limit for thermal strings" into oc-dev
Salvador Martinez [Wed, 19 Apr 2017 21:18:03 +0000 (21:18 +0000)]
Merge "Up the character limit for thermal strings" into oc-dev
am: 95cdc61248

Change-Id: Iee52d2a14946363c709a6b87907b264a7b28b349

7 years agoMerge "Handle shared libraries for split apks." into oc-dev
Jeff Hao [Wed, 19 Apr 2017 21:14:03 +0000 (21:14 +0000)]
Merge "Handle shared libraries for split apks." into oc-dev
am: e2c6cbbd72

Change-Id: I70e963fad3a4b21d85f898d676b8a6694afdb4c9

7 years agoMerge "Move CompanionDeviceManagerService to a place of its own" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:42:31 +0000 (20:42 +0000)]
Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev

7 years agoMerge "Fix compose shader child local matrix mutation" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:41:02 +0000 (20:41 +0000)]
Merge "Fix compose shader child local matrix mutation" into oc-dev

7 years agoMerge "Don't show starting window for overlay activities" into oc-dev
Wale Ogunwale [Wed, 19 Apr 2017 20:36:36 +0000 (20:36 +0000)]
Merge "Don't show starting window for overlay activities" into oc-dev

7 years agoMerge "Flesh out more API docs." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:31:01 +0000 (20:31 +0000)]
Merge "Flesh out more API docs." into oc-dev

7 years agoMerge "Only send HOST_STATE intents when host mode is used." into oc-dev
Jerry Zhang [Wed, 19 Apr 2017 20:28:03 +0000 (20:28 +0000)]
Merge "Only send HOST_STATE intents when host mode is used." into oc-dev

7 years agoMerge "Make javadoc of companion service name more like others" into oc-dev
Eugene Susla [Wed, 19 Apr 2017 20:26:14 +0000 (20:26 +0000)]
Merge "Make javadoc of companion service name more like others" into oc-dev
am: 4d95e40bb3

Change-Id: I93645144f78139c95ca4e8b9bf61efcfb25296bf

7 years agoMerge "Up the character limit for thermal strings" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:24:14 +0000 (20:24 +0000)]
Merge "Up the character limit for thermal strings" into oc-dev

7 years agoMerge "Some folks like sending null fields." into oc-dev
Jeff Sharkey [Wed, 19 Apr 2017 20:19:28 +0000 (20:19 +0000)]
Merge "Some folks like sending null fields." into oc-dev
am: 9a1967e157

Change-Id: I90ea9660add142eb9286791134103f346f155add

7 years agoMerge "Add comment to Typeface.Builder about file descriptor." into oc-dev
Seigo Nonaka [Wed, 19 Apr 2017 20:17:00 +0000 (20:17 +0000)]
Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev
am: f3157e1692

Change-Id: I912f0a6b525c5f4ed111d0b6302915f57639dd9a

7 years agoMerge "Handle shared libraries for split apks." into oc-dev
Jeff Hao [Wed, 19 Apr 2017 20:16:18 +0000 (20:16 +0000)]
Merge "Handle shared libraries for split apks." into oc-dev

7 years agoMerge "Make javadoc of companion service name more like others" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:14:59 +0000 (20:14 +0000)]
Merge "Make javadoc of companion service name more like others" into oc-dev

7 years agoMerge "Add unit test for Skia path behavior" into oc-dev
Matt Sarett [Wed, 19 Apr 2017 20:12:28 +0000 (20:12 +0000)]
Merge "Add unit test for Skia path behavior" into oc-dev
am: dc3ab163d3

Change-Id: I64831f6f383aa8149c8fb2cdc432702fa2fcc13e

7 years agoMerge "Some folks like sending null fields." into oc-dev
Jeff Sharkey [Wed, 19 Apr 2017 20:11:23 +0000 (20:11 +0000)]
Merge "Some folks like sending null fields." into oc-dev

7 years agoMerge "Add comment to Typeface.Builder about file descriptor." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:08:53 +0000 (20:08 +0000)]
Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev

7 years agoMerge "Add unit test for Skia path behavior" into oc-dev
Matt Sarett [Wed, 19 Apr 2017 20:03:49 +0000 (20:03 +0000)]
Merge "Add unit test for Skia path behavior" into oc-dev

7 years agoMerge "Improve ViewDebug reporting for focus properties" into oc-dev
Evan Rosky [Wed, 19 Apr 2017 19:56:38 +0000 (19:56 +0000)]
Merge "Improve ViewDebug reporting for focus properties" into oc-dev
am: 4ab21012a7

Change-Id: I8f5fa248a28b495c225d598eb9f5a98b8c5123f9

7 years agoMerge "Force data usage bottom label to be LTR." into oc-dev
Fan Zhang [Wed, 19 Apr 2017 19:51:18 +0000 (19:51 +0000)]
Merge "Force data usage bottom label to be LTR." into oc-dev
am: 3a8d8db6ad

Change-Id: Ie8e37f05211172eb710ff737eebb3aba530a34d2

7 years agoMerge "Improve ViewDebug reporting for focus properties" into oc-dev
Evan Rosky [Wed, 19 Apr 2017 19:50:24 +0000 (19:50 +0000)]
Merge "Improve ViewDebug reporting for focus properties" into oc-dev

7 years agoMerge "Bring up the QS state colors to increase contrast" into oc-dev
Jason Monk [Wed, 19 Apr 2017 19:49:08 +0000 (19:49 +0000)]
Merge "Bring up the QS state colors to increase contrast" into oc-dev
am: 214a8bdaee

Change-Id: Iea5e9c408fbcc74b176b5a33395bcbdebba121ee

7 years agoMerge "Force data usage bottom label to be LTR." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:43:53 +0000 (19:43 +0000)]
Merge "Force data usage bottom label to be LTR." into oc-dev

7 years agoMerge "Bring up the QS state colors to increase contrast" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:43:02 +0000 (19:43 +0000)]
Merge "Bring up the QS state colors to increase contrast" into oc-dev

7 years agoForce data usage bottom label to be LTR.
Fan Zhang [Tue, 18 Apr 2017 22:15:21 +0000 (15:15 -0700)]
Force data usage bottom label to be LTR.

The bottom label has to be LTR to be in sync with the main view above
it, which does not support RTL.

Change-Id: Ib5cccd1cccb249dad0badd36f4d491faf0bbb562
Fix: 37222561
Test: visual

7 years agoMerge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
Abodunrinwa Toki [Wed, 19 Apr 2017 19:25:10 +0000 (19:25 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
am: ef0512a87a

Change-Id: Ibe0a7a52ab7122d720fc95f1dd6d8fe8d45c9a50

7 years agoMerge "TextClassifierImpl: Fix empty locale list issue." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:20:39 +0000 (19:20 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev

7 years agoMerge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
George Mount [Wed, 19 Apr 2017 19:14:08 +0000 (19:14 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
am: 681ff5c7d8

Change-Id: I97976893f65b5f688f0319e5eaba5610bede73f4

7 years agoMerge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev
Wei Wang [Wed, 19 Apr 2017 19:11:02 +0000 (19:11 +0000)]
Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev
am: b1f7358d98

Change-Id: I611cfae89e9d9e2be740cd8c130bf57bcf4cca11

7 years agoMerge "Fix FragmentTransaction.show() to show the fragment." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:06:04 +0000 (19:06 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev

7 years agoMerge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:00:54 +0000 (19:00 +0000)]
Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev

7 years agoMerge "Fix issue where the notification could snap to the menu while its invisible...
Mady Mellor [Wed, 19 Apr 2017 19:00:49 +0000 (19:00 +0000)]
Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev
am: 043ae355e9

Change-Id: I0f7d6ba47b6bacd2002a97b89b5c2bf5102ae9e7

7 years agoMerge "Update snooze visuals to match latest design" into oc-dev
Mady Mellor [Wed, 19 Apr 2017 18:58:59 +0000 (18:58 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev
am: c1d9cdfe79

Change-Id: I1bb219553b05f87d4dce8ae2d43aa2fd80486bb1

7 years agoMerge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
Zheng Zhang [Wed, 19 Apr 2017 18:56:57 +0000 (18:56 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am: 5b84ba3b15  -s ours am: 74b8c15d2b  -s ours
am: 9996f8589d  -s ours

Change-Id: I743cd5c400a4c4a43938621349a6a7917d2deaaf

7 years agoMerge "Merge "Adds getLayoutInflater() to return a cached value." into oc-dev am...
Android Build Merger (Role) [Wed, 19 Apr 2017 18:54:25 +0000 (18:54 +0000)]
Merge "Merge "Adds getLayoutInflater() to return a cached value." into oc-dev am: f3ff7b8207" into oc-dev-plus-aosp

7 years agoMerge "Adds getLayoutInflater() to return a cached value." into oc-dev
George Mount [Wed, 19 Apr 2017 18:53:02 +0000 (18:53 +0000)]
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
am: f3ff7b8207

Change-Id: I447d517cba4f694896dc9319ba7b93dda4b1d01f

7 years agoMerge "Merge "Adding consistent platform PiP action asset." into oc-dev am: d1a1c8004...
Android Build Merger (Role) [Wed, 19 Apr 2017 18:51:01 +0000 (18:51 +0000)]
Merge "Merge "Adding consistent platform PiP action asset." into oc-dev am: d1a1c8004e" into oc-dev-plus-aosp

7 years agoMerge "Adding consistent platform PiP action asset." into oc-dev
Winson Chung [Wed, 19 Apr 2017 18:50:11 +0000 (18:50 +0000)]
Merge "Adding consistent platform PiP action asset." into oc-dev
am: d1a1c8004e

Change-Id: Ia94a684ca81bd50dd4cb51ebb816c4ac99f24a89

7 years agoMerge "Merge "Handle edge-case where no focusables exist" into oc-dev am: f4c31bf67b...
Android Build Merger (Role) [Wed, 19 Apr 2017 18:48:28 +0000 (18:48 +0000)]
Merge "Merge "Handle edge-case where no focusables exist" into oc-dev am: f4c31bf67b" into oc-dev-plus-aosp

7 years agoMerge "Handle edge-case where no focusables exist" into oc-dev
Evan Rosky [Wed, 19 Apr 2017 18:47:10 +0000 (18:47 +0000)]
Merge "Handle edge-case where no focusables exist" into oc-dev
am: f4c31bf67b

Change-Id: I463f9cc2852cf085dc278fc080a583828d4311a9

7 years agoMerge "Merge "Swap back content alphas for light and dark." into oc-dev am: e262cc234...
Android Build Merger (Role) [Wed, 19 Apr 2017 18:45:29 +0000 (18:45 +0000)]
Merge "Merge "Swap back content alphas for light and dark." into oc-dev am: e262cc234b" into oc-dev-plus-aosp

7 years agoMerge "Swap back content alphas for light and dark." into oc-dev
Jason Monk [Wed, 19 Apr 2017 18:44:48 +0000 (18:44 +0000)]
Merge "Swap back content alphas for light and dark." into oc-dev
am: e262cc234b

Change-Id: I98a6e0ff1df55d3f6804869d40abe23aa2b7686e

7 years agoMerge "Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev am: 4132f...
Android Build Merger (Role) [Wed, 19 Apr 2017 18:44:19 +0000 (18:44 +0000)]
Merge "Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev am: 4132f86041" into oc-dev-plus-aosp

7 years agoMerge "Avoid acquiring a lock on the InputReader thread" into oc-dev
Yohei Yukawa [Wed, 19 Apr 2017 18:43:37 +0000 (18:43 +0000)]
Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev
am: 4132f86041

Change-Id: Ibb27f00525d08a45d41b8b345a4644be4ced2dbe

7 years agoMerge "Merge "Add missing services to incident_report" into oc-dev am: f431ea56e1...
Android Build Merger (Role) [Wed, 19 Apr 2017 18:43:02 +0000 (18:43 +0000)]
Merge "Merge "Add missing services to incident_report" into oc-dev am: f431ea56e1" into oc-dev-plus-aosp

7 years agoMerge "Fix issue where the notification could snap to the menu while its invisible...
TreeHugger Robot [Wed, 19 Apr 2017 18:42:31 +0000 (18:42 +0000)]
Merge "Fix issue where the notification could snap to the menu while its invisible" into oc-dev

7 years agoMerge "Add missing services to incident_report" into oc-dev
Makoto Onuki [Wed, 19 Apr 2017 18:42:14 +0000 (18:42 +0000)]
Merge "Add missing services to incident_report" into oc-dev
am: f431ea56e1

Change-Id: I87237a2a5108aae2e2402c74217ec5adc27306f1

7 years agoMerge "Update snooze visuals to match latest design" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 18:41:44 +0000 (18:41 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev

7 years agoMerge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am...
Android Build Merger (Role) [Wed, 19 Apr 2017 18:41:46 +0000 (18:41 +0000)]
Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am: 83c9413b75" into oc-dev-plus-aosp

7 years agoMerge "Fix issue with fontScale changes not taking effect" into oc-dev
Adam Lesinski [Wed, 19 Apr 2017 18:41:00 +0000 (18:41 +0000)]
Merge "Fix issue with fontScale changes not taking effect" into oc-dev
am: 83c9413b75

Change-Id: I8afef55cae842c94c24c7cece1b8c5c90e6841c1

7 years agoMerge "Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev am: 26e1d91939...
Android Build Merger (Role) [Wed, 19 Apr 2017 18:40:39 +0000 (18:40 +0000)]
Merge "Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev am: 26e1d91939" into oc-dev-plus-aosp

7 years agoMerge "AAPT: Auto-alias application adaptive-icon" into oc-dev
Adam Lesinski [Wed, 19 Apr 2017 18:39:46 +0000 (18:39 +0000)]
Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev
am: 26e1d91939

Change-Id: I1c2ddb6f4d88b30f04fa23caeb60799fbee255cf

7 years agoMerge "Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip...
Android Build Merger (Role) [Wed, 19 Apr 2017 18:39:25 +0000 (18:39 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am: 5b84ba3b15  -s ours am: 74b8c15d2b  -s ours am: 86c579678e  -s ours" into oc-dev-plus-aosp

7 years agoMerge "Internal copy of Palette API." into oc-dev
Lucas Dupin [Wed, 19 Apr 2017 18:37:41 +0000 (18:37 +0000)]
Merge "Internal copy of Palette API." into oc-dev
am: 8b4cca11f3

Change-Id: Ie4ad73e57ca0b44d87986038874287ca6bab2f6d

7 years agoMerge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
Zheng Zhang [Wed, 19 Apr 2017 18:37:35 +0000 (18:37 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am: 5b84ba3b15  -s ours am: 74b8c15d2b  -s ours
am: 86c579678e  -s ours

Change-Id: Ia4338b4f043d07bbe1f38bbb0d1e86115cf9645d

7 years agoMerge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host...
Sunny Goyal [Wed, 19 Apr 2017 18:33:04 +0000 (18:33 +0000)]
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev
am: 7790695bf2

Change-Id: I3520dc3c3a5cbe933894764e2d3f7ac9df11582e

7 years agoMerge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
Zheng Zhang [Wed, 19 Apr 2017 18:32:55 +0000 (18:32 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am: 5b84ba3b15  -s ours
am: 74b8c15d2b  -s ours

Change-Id: I4e023353faf1cbded69661da7013785bd130297c

7 years agoMerge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
Zheng Zhang [Wed, 19 Apr 2017 18:31:30 +0000 (18:31 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am: 5b84ba3b15  -s ours
am: 74b8c15d2b  -s ours

Change-Id: I8f4523d90480e3b56bf223468ba42157fe6e97eb

7 years agoMerge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
Zheng Zhang [Wed, 19 Apr 2017 18:26:33 +0000 (18:26 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
am: 5b84ba3b15  -s ours

Change-Id: Ic447d9ee4910f467e8ca6dad7d02693846e4fab8

7 years agoMerge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f
Robert Greenwalt [Wed, 19 Apr 2017 18:24:03 +0000 (11:24 -0700)]
Merge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f

Change-Id: I86d5e87cc3884d8fc3eb326a92b8871ef0926aa6

7 years agoMerge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
TreeHugger Robot [Wed, 19 Apr 2017 18:21:43 +0000 (18:21 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev

7 years agoMerge "Adds getLayoutInflater() to return a cached value." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 18:15:31 +0000 (18:15 +0000)]
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev

7 years agoMerge "Adding consistent platform PiP action asset." into oc-dev
Winson Chung [Wed, 19 Apr 2017 18:10:16 +0000 (18:10 +0000)]
Merge "Adding consistent platform PiP action asset." into oc-dev

7 years agoMerge "Handle edge-case where no focusables exist" into oc-dev
Evan Rosky [Wed, 19 Apr 2017 18:08:23 +0000 (18:08 +0000)]
Merge "Handle edge-case where no focusables exist" into oc-dev

7 years agoMerge "Swap back content alphas for light and dark." into oc-dev
Jason Monk [Wed, 19 Apr 2017 18:07:04 +0000 (18:07 +0000)]
Merge "Swap back content alphas for light and dark." into oc-dev

7 years agoHandle shared libraries for split apks.
Jeff Hao [Thu, 6 Apr 2017 00:09:59 +0000 (17:09 -0700)]
Handle shared libraries for split apks.

As we dexopt all the code paths of a package, we now append the code
paths to the list of shared libraries. These paths are passed as
relative paths since the apks are staged during installation, and are
not where they will be at runtime.

Part of a multi-project change.

Bug: 34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests

(cherry-picked from commit 832641bb7205126829d425401a5262ab2e26fa80)

Change-Id: I28b1f8db6035ec62a5947679ed09013b1f9523a2

7 years agoFix compose shader child local matrix mutation
Chris Craik [Wed, 19 Apr 2017 17:38:14 +0000 (10:38 -0700)]
Fix compose shader child local matrix mutation

Bug: 37495696
Test: cts-tradefed run singleCommand cts-dev --module CtsGraphicsTestCases --test android.graphics.cts.ComposeShaderTest

Adds back the verify step that discards a stale native ComposeShader if a child
changes.

Change-Id: I44f40c1edfdb7633994a69efb583cf28ee2c26b2

7 years agoMerge "Handle shared libraries for split apks." am: 9487dff8ab am: dae160f51b
Jeff Hao [Wed, 19 Apr 2017 17:52:27 +0000 (17:52 +0000)]
Merge "Handle shared libraries for split apks." am: 9487dff8ab am: dae160f51b
am: 98f62d8aa0  -s ours

Change-Id: I014165037e367e1012a21e288f21194f5036585a

7 years agoFlesh out more API docs.
Jeff Sharkey [Wed, 19 Apr 2017 00:19:16 +0000 (18:19 -0600)]
Flesh out more API docs.

Flesh out docs for Context.getCacheDir(), Intent.addFlags(),
Intent.removeFlags(), and PackageManager.setApplicationCategoryHint().

Test: builds, boots
Bug: 374704733732777435812899
Change-Id: Ided031185258a89c3e275d65c162d537065ad49e

7 years agoMerge "Avoid acquiring a lock on the InputReader thread" into oc-dev
Yohei Yukawa [Wed, 19 Apr 2017 17:37:13 +0000 (17:37 +0000)]
Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev

7 years agoMerge "Add missing services to incident_report" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:33:55 +0000 (17:33 +0000)]
Merge "Add missing services to incident_report" into oc-dev

7 years agoMerge "Fix issue with fontScale changes not taking effect" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:32:25 +0000 (17:32 +0000)]
Merge "Fix issue with fontScale changes not taking effect" into oc-dev

7 years agoMerge "AAPT: Auto-alias application adaptive-icon" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:32:02 +0000 (17:32 +0000)]
Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev

7 years agoMerge "Handle shared libraries for split apks." am: 9487dff8ab
Jeff Hao [Wed, 19 Apr 2017 17:30:06 +0000 (17:30 +0000)]
Merge "Handle shared libraries for split apks." am: 9487dff8ab
am: dae160f51b

Change-Id: I3b8fd7be7bf987858df229cfd95ca8d4dc170b54

7 years agoSome folks like sending null fields.
Jeff Sharkey [Wed, 19 Apr 2017 17:22:02 +0000 (11:22 -0600)]
Some folks like sending null fields.

Test: cts-tradefed run commandAndExit cts-dev -m CtsContentTestCases -t android.content.pm.cts.ComponentInfoTest
Bug: 37495524
Change-Id: I9040534d717ac70d580bd2a7f5488369ab7c3a47

7 years agoMerge "Internal copy of Palette API." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 17:24:02 +0000 (17:24 +0000)]
Merge "Internal copy of Palette API." into oc-dev

7 years agoMerge "Handle shared libraries for split apks."
Jeff Hao [Wed, 19 Apr 2017 17:21:36 +0000 (17:21 +0000)]
Merge "Handle shared libraries for split apks."
am: 9487dff8ab

Change-Id: I3414ba72ba8e3c3fc2d169a2a892c851d2577f3b

7 years agoMerge "Handle shared libraries for split apks."
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Handle shared libraries for split apks."

7 years agoBring up the QS state colors to increase contrast
Jason Monk [Wed, 19 Apr 2017 17:11:11 +0000 (13:11 -0400)]
Bring up the QS state colors to increase contrast

Test: visual
Change-Id: I5182e3dae7be89bf38d0ed33e3cbefedc664c718
Fixes: 37443237

7 years agoMerge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host...
Sunny Goyal [Wed, 19 Apr 2017 17:10:37 +0000 (17:10 +0000)]
Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev

7 years agoMerge "Mark Restricted APN connections as restricted." into oc-dev
Robert Greenwalt [Wed, 19 Apr 2017 17:09:30 +0000 (17:09 +0000)]
Merge "Mark Restricted APN connections as restricted." into oc-dev

7 years agoDO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123.
Zheng Zhang [Wed, 19 Apr 2017 01:16:33 +0000 (18:16 -0700)]
DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123.

HFP profile config landed late in Emerald development, and was committed
as version 122 there.
When it merged to master, there were conflicts since 122 was already
taken, so it was resolved as version 123.
We didn't catch the subtle bug then:
This means Emerald devices will reset HFP profile config in error once
they upgrade to Feldspar.
Correct this by merging 122, and making 123 a no-op.

Bug: 37338202
Change-Id: Ibf4c824d27300641fd1bb15f5884baf056bd8d7e

7 years agoMerge "MediaSessionService: Nullify the media button sesison when it's removed" into...
Jaewan Kim [Wed, 19 Apr 2017 16:49:54 +0000 (16:49 +0000)]
Merge "MediaSessionService: Nullify the media button sesison when it's removed" into oc-dev
am: 3d5f41bb03

Change-Id: I136548911db0faf018fef046a0a81323c45479de

7 years agoMerge "MediaSessionService: Nullify the media button sesison when it's removed" into...
TreeHugger Robot [Wed, 19 Apr 2017 16:42:38 +0000 (16:42 +0000)]
Merge "MediaSessionService: Nullify the media button sesison when it's removed" into oc-dev

7 years agoMerge "RecoverySystem: Enable the package compatibility verification." into oc-dev
Tao Bao [Wed, 19 Apr 2017 16:38:58 +0000 (16:38 +0000)]
Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev
am: a532f4d7f8

Change-Id: Ia44184bcefda25a8cbf362d4b911713669bace32

7 years agoMerge "RecoverySystem: Enable the package compatibility verification." into oc-dev
Tao Bao [Wed, 19 Apr 2017 16:30:22 +0000 (16:30 +0000)]
Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev

7 years agoMerge "Read by UUID for PTS tests (1/5)" am: 7826c08e21 am: 0c9c0969cc
Jakub Pawlowski [Wed, 19 Apr 2017 16:20:37 +0000 (16:20 +0000)]
Merge "Read by UUID for PTS tests (1/5)" am: 7826c08e21 am: 0c9c0969cc
am: 8359e191ae

Change-Id: I435d7755d39068730089764916de56b23411cc49

7 years agoMerge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev
Keun-young Park [Wed, 19 Apr 2017 16:16:54 +0000 (16:16 +0000)]
Merge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev
am: f04390ed49

Change-Id: I6c1a80a4a74e44973f08cefe7c7e392ea6e109a6

7 years agoMerge "Read by UUID for PTS tests (1/5)" am: 7826c08e21
Jakub Pawlowski [Wed, 19 Apr 2017 16:13:50 +0000 (16:13 +0000)]
Merge "Read by UUID for PTS tests (1/5)" am: 7826c08e21
am: 0c9c0969cc

Change-Id: Ia850b9ad1d0d2e92a2c987c2c1cd24a44f7cfb3f

7 years agoMerge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev
Keun-young Park [Wed, 19 Apr 2017 16:12:02 +0000 (16:12 +0000)]
Merge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev

7 years agoMerge "RecoverySystem: Verify the package compatibility." into oc-dev
Tao Bao [Wed, 19 Apr 2017 16:05:25 +0000 (16:05 +0000)]
Merge "RecoverySystem: Verify the package compatibility." into oc-dev
am: e3872a4fc9

Change-Id: I120d13b68e837c6ebb60baf8d3fe3aecb495159f

7 years agoMerge "Read by UUID for PTS tests (1/5)"
Jakub Pawlowski [Wed, 19 Apr 2017 16:04:45 +0000 (16:04 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
am: 7826c08e21

Change-Id: I380a38460b1e00f405fdde0683c40dbc9c5b3807

7 years agoMerge "RecoverySystem: Verify the package compatibility." into oc-dev
Tao Bao [Wed, 19 Apr 2017 15:54:18 +0000 (15:54 +0000)]
Merge "RecoverySystem: Verify the package compatibility." into oc-dev

7 years agoSwap back content alphas for light and dark.
Jason Monk [Wed, 19 Apr 2017 14:49:37 +0000 (10:49 -0400)]
Swap back content alphas for light and dark.

Someone may have accidentally switched them...

Change-Id: If9039398548a7ce9d7f38941ba774a05e8bedcb8
Fixes: 37483431
Test: visual

7 years agoDon't show starting window for overlay activities
Wale Ogunwale [Wed, 19 Apr 2017 13:05:13 +0000 (06:05 -0700)]
Don't show starting window for overlay activities

Since they are just overlaying other activities in the task.

Change-Id: I5d9b8e22c9858e282fc36ed4c3f7aff9f9b7654d
Fixes: 37199644
Test: manual

7 years agoFix FragmentTransaction.show() to show the fragment.
George Mount [Wed, 19 Apr 2017 14:29:45 +0000 (07:29 -0700)]
Fix FragmentTransaction.show() to show the fragment.

Bug 37413327

When there was an animation and the fragment transaction wasn't
optimized, the fragment visiiblity wasn't being set during show().

Test: I0fd4029a02d6c9f082011bf56f0d3c8245803f68
Change-Id: Idc2c74ae2fc4759a755a5988ce6ca1b39ef8d554