OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Add assistant-provided snooze options to snooze menu"
TreeHugger Robot [Thu, 26 Jan 2017 20:01:30 +0000 (20:01 +0000)]
Merge "Add assistant-provided snooze options to snooze menu"

7 years agoMerge "Integration of the AAC codec for A2DP source" am: 22f97c83fb am: f23e80bb9b...
Pavlin Radoslavov [Thu, 26 Jan 2017 19:42:16 +0000 (19:42 +0000)]
Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb am: f23e80bb9b am: d364208388
am: 78798cc13d

Change-Id: Ic645f9ee2eb090fc805a25a1449642dad021db4e

7 years agoMerge "Add a hidden flag to control Settings UI"
TreeHugger Robot [Thu, 26 Jan 2017 19:36:30 +0000 (19:36 +0000)]
Merge "Add a hidden flag to control Settings UI"

7 years agoMerge "allow clearing fields for LogMaker reuse"
TreeHugger Robot [Thu, 26 Jan 2017 19:33:43 +0000 (19:33 +0000)]
Merge "allow clearing fields for LogMaker reuse"

7 years agoMerge "Integration of the AAC codec for A2DP source" am: 22f97c83fb am: f23e80bb9b
Pavlin Radoslavov [Thu, 26 Jan 2017 19:31:07 +0000 (19:31 +0000)]
Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb am: f23e80bb9b
am: d364208388

Change-Id: Ice6067732c4a94d30410a8f90cbea51b869539eb

7 years agoMerge "Integration of the AAC codec for A2DP source" am: 22f97c83fb
Pavlin Radoslavov [Thu, 26 Jan 2017 19:25:37 +0000 (19:25 +0000)]
Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb
am: f23e80bb9b

Change-Id: If2d85eba17f7ece5b3d19e3ee8fc86b7cf9bc062

7 years agoMerge "Integration of the AAC codec for A2DP source"
Pavlin Radoslavov [Thu, 26 Jan 2017 19:20:08 +0000 (19:20 +0000)]
Merge "Integration of the AAC codec for A2DP source"
am: 22f97c83fb

Change-Id: I22838db2b87f83a3832f78d74d08a6f988264284

7 years agoMerge "Integration of the AAC codec for A2DP source"
Treehugger Robot [Thu, 26 Jan 2017 19:12:54 +0000 (19:12 +0000)]
Merge "Integration of the AAC codec for A2DP source"

7 years agoMerge "Change configuration's color mode based on the display's color mode"
TreeHugger Robot [Thu, 26 Jan 2017 18:56:19 +0000 (18:56 +0000)]
Merge "Change configuration's color mode based on the display's color mode"

7 years agoMerge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."
TreeHugger Robot [Thu, 26 Jan 2017 18:08:36 +0000 (18:08 +0000)]
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."

7 years agoAdd assistant-provided snooze options to snooze menu
Mady Mellor [Wed, 25 Jan 2017 23:29:39 +0000 (15:29 -0800)]
Add assistant-provided snooze options to snooze menu

Test: manual via Assistant app
Change-Id: Ie77181601a20e46774d009c7ecea65e99434ebd3

7 years agoMerge "Update PIP minimize to edge gesture"
Mady Mellor [Thu, 26 Jan 2017 18:05:41 +0000 (18:05 +0000)]
Merge "Update PIP minimize to edge gesture"

7 years agoMerge "wifi: WifiManager API change for supporting Passpoint Release 2"
TreeHugger Robot [Thu, 26 Jan 2017 18:04:44 +0000 (18:04 +0000)]
Merge "wifi: WifiManager API change for supporting Passpoint Release 2"

7 years agoallow clearing fields for LogMaker reuse
Chris Wren [Wed, 25 Jan 2017 19:50:37 +0000 (14:50 -0500)]
allow clearing fields for LogMaker reuse

Bug: 34705522
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Change-Id: I00a1ef279740c890ff8b059be97c4463c9f1af0e

7 years agoMerge "Fixing crash in SystemUI fetching task description icons."
Winson Chung [Thu, 26 Jan 2017 17:40:06 +0000 (17:40 +0000)]
Merge "Fixing crash in SystemUI fetching task description icons."

7 years agoAdd a hidden flag to control Settings UI
songchenxi [Thu, 19 Jan 2017 22:18:41 +0000 (14:18 -0800)]
Add a hidden flag to control Settings UI

This flag is to enable link to permission in location settings UI
Test: A new string value added

Bug: 34400189
Change-Id: Ie2adeba9634a0e2426b28683da09ad1765b25a3d

7 years agoMerge "Notify DexManager about new package installs"
Calin Juravle [Thu, 26 Jan 2017 17:31:28 +0000 (17:31 +0000)]
Merge "Notify DexManager about new package installs"

7 years agoMerge "Add separate roaming icon for status bar + QS"
TreeHugger Robot [Thu, 26 Jan 2017 17:12:59 +0000 (17:12 +0000)]
Merge "Add separate roaming icon for status bar + QS"

7 years agoIntegration of the AAC codec for A2DP source
Pavlin Radoslavov [Sat, 14 Jan 2017 08:41:05 +0000 (00:41 -0800)]
Integration of the AAC codec for A2DP source

Test: A2DP streaming to AAC headsets
Bug: 30958229
Change-Id: I1b530f1c5c495b8231fd68bed788d4567096683d

7 years agoMerge "Launch work lock scrim as clear_top not single_top"
TreeHugger Robot [Thu, 26 Jan 2017 16:41:40 +0000 (16:41 +0000)]
Merge "Launch work lock scrim as clear_top not single_top"

7 years agoMerge "Change batch finalization timeout mechanism from Handler#sendMessageDelayed...
Michal Karpinski [Thu, 26 Jan 2017 15:15:10 +0000 (15:15 +0000)]
Merge "Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm"

7 years agoMerge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMess...
Michal Karpinski [Thu, 26 Jan 2017 15:05:01 +0000 (15:05 +0000)]
Merge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm" into nyc-mr2-dev am: c399e4d964
am: 666e59f911  -s ours

Change-Id: Ie934c7a6e884eb13a23a620c43bab68b989cb454

7 years agoAdd separate roaming icon for status bar + QS
Jason Monk [Mon, 19 Dec 2016 20:36:13 +0000 (15:36 -0500)]
Add separate roaming icon for status bar + QS

Now data + roaming will be shown at the same time.

Test: runtest systemui
Bug: 31205845
Change-Id: I8fe167a0909c952ad0824e24e178857df2541554

7 years agoDO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDela...
Michal Karpinski [Thu, 26 Jan 2017 15:04:01 +0000 (15:04 +0000)]
DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm am: 1710e5f079
am: 6bf0344e60  -s ours

Change-Id: I36505cd9cd17d1f4c540a39fc0c115c5470d52d0

7 years agoMerge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMess...
Michal Karpinski [Thu, 26 Jan 2017 14:58:41 +0000 (14:58 +0000)]
Merge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm" into nyc-mr2-dev
am: c399e4d964

Change-Id: I9658d27ee9a694c580204f0e041991d754f93130

7 years agoDO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDela...
Michal Karpinski [Thu, 26 Jan 2017 14:58:36 +0000 (14:58 +0000)]
DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm
am: 1710e5f079

Change-Id: I6ffab66a6464f7fbb337d6bcb1431a0a960e25e3

7 years agoMerge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMess...
Michal Karpinski [Thu, 26 Jan 2017 14:52:16 +0000 (14:52 +0000)]
Merge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm" into nyc-mr2-dev

7 years agoUpdate PIP minimize to edge gesture
Mady Mellor [Mon, 23 Jan 2017 18:08:35 +0000 (10:08 -0800)]
Update PIP minimize to edge gesture

Updates gesture to match prototype:
- If you fling towards the current edge the PIP is on it is minimized
- Dragging far enough to left or right edge minimizes PIP

Test: manual
Change-Id: I56664e16505b461ad37b181cbb89ee4c6e371aa2

7 years agoMerge "Adjustments to PIP heuristics to snapping along edges of screen"
Mady Mellor [Thu, 26 Jan 2017 14:36:49 +0000 (14:36 +0000)]
Merge "Adjustments to PIP heuristics to snapping along edges of screen"

7 years agoMerge "New constructor for Notification.Builder takes a channelId."
Geoffrey Pitsch [Thu, 26 Jan 2017 14:15:13 +0000 (14:15 +0000)]
Merge "New constructor for Notification.Builder takes a channelId."

7 years agoMerge "Animate starting work challenge from work lock"
TreeHugger Robot [Thu, 26 Jan 2017 12:49:25 +0000 (12:49 +0000)]
Merge "Animate starting work challenge from work lock"

7 years agoDO NOT MERGE Change batch finalization timeout mechanism from
Michal Karpinski [Wed, 25 Jan 2017 16:53:12 +0000 (16:53 +0000)]
DO NOT MERGE Change batch finalization timeout mechanism from
Handler#sendMessageDelayed() to a wakeful alarm

Messages sent with Handler#sendMessageDelayed() didn't get delivered
until the device woke up after being idle, which resulted in
potentially very long windows of logs accumulation and highly possible
network log loss from before the device becaming idle.

Bug: 34157435
Test: manual with decreased timeout over a few timeout iterations
Change-Id: I22d9cc743acb1a478d2da5407c5718e7f95e89cb

7 years agoChange batch finalization timeout mechanism from
Michal Karpinski [Wed, 25 Jan 2017 16:53:12 +0000 (16:53 +0000)]
Change batch finalization timeout mechanism from
Handler#sendMessageDelayed() to a wakeful alarm

Messages sent with Handler#sendMessageDelayed() didn't get delivered
until the device woke up after being idle, which resulted in
potentially very long windows of logs accumulation and highly possible
network log loss from before the device becaming idle.

Bug: 34157435
Test: manual with decreased timeout over a few timeout iterations
Change-Id: I50b29b9f132856a629e28f46c022f21976bd92fb

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e39...
ltrochtova [Thu, 26 Jan 2017 10:04:30 +0000 (10:04 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e396382 am: c0118ac10e am: 3db1ff462a
am: a0f229263a

Change-Id: Iccc3f7679e2d400f683d43c3d612197fba402f33

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e39...
ltrochtova [Thu, 26 Jan 2017 09:58:53 +0000 (09:58 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e396382 am: c0118ac10e
am: 3db1ff462a

Change-Id: I846e7d5b84fb953f93256c8c6d2ca18d37199f1f

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e396382
ltrochtova [Thu, 26 Jan 2017 09:53:23 +0000 (09:53 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e396382
am: c0118ac10e

Change-Id: I2aede50aba4c693f6bc45d2e53a0f4b7d8303c32

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed."
ltrochtova [Thu, 26 Jan 2017 09:48:23 +0000 (09:48 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
am: 2c1e396382

Change-Id: I132bdd6aee36e32ddbcfdc8f38aed1e88424297e

7 years agoMerge "Don't offer the BT sharing option to the user if BT is disallowed."
ltrochtova [Thu, 26 Jan 2017 09:41:51 +0000 (09:41 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."

7 years agoMerge "Clear the calling ID in dump()."
TreeHugger Robot [Thu, 26 Jan 2017 08:31:35 +0000 (08:31 +0000)]
Merge "Clear the calling ID in dump()."

7 years agoMerge "Add an intent that asks the launcher to make a channel browsable."
TreeHugger Robot [Thu, 26 Jan 2017 08:30:10 +0000 (08:30 +0000)]
Merge "Add an intent that asks the launcher to make a channel browsable."

7 years agoMerge "media: Add new MediaMuxer constructor that takes FileDescriptor."
TreeHugger Robot [Thu, 26 Jan 2017 08:21:58 +0000 (08:21 +0000)]
Merge "media: Add new MediaMuxer constructor that takes FileDescriptor."

7 years agoMerge "Implement Account Discovery API."
Dmitry Dementyev [Thu, 26 Jan 2017 07:53:56 +0000 (07:53 +0000)]
Merge "Implement Account Discovery API."

7 years agoMerge "Revert "Revert "Remove View.setTooltip/getTooltip"""
TreeHugger Robot [Thu, 26 Jan 2017 07:39:48 +0000 (07:39 +0000)]
Merge "Revert "Revert "Remove View.setTooltip/getTooltip"""

7 years agoMerge "Adding an api for apps to check whether they can install apps"
TreeHugger Robot [Thu, 26 Jan 2017 07:35:28 +0000 (07:35 +0000)]
Merge "Adding an api for apps to check whether they can install apps"

7 years agoMerge "Relax permission for shared storage UUID."
TreeHugger Robot [Thu, 26 Jan 2017 07:33:28 +0000 (07:33 +0000)]
Merge "Relax permission for shared storage UUID."

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 36f8170bbc...
Android Build Merger (Role) [Thu, 26 Jan 2017 07:22:52 +0000 (07:22 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 36f8170bbc  -s ours am: 4ad5263a52  -s ours"

7 years agoMerge "Implement pointer capture API"
TreeHugger Robot [Thu, 26 Jan 2017 07:22:21 +0000 (07:22 +0000)]
Merge "Implement pointer capture API"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 36f8170bbc -s ours
Bill Yi [Thu, 26 Jan 2017 07:22:18 +0000 (07:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 36f8170bbc  -s ours
am: 4ad5263a52  -s ours

Change-Id: I6c73a4ef1c7111e1dccc993dd0018315e49697a6

7 years agoImport translations. DO NOT MERGE am: 30b5edfd23 -s ours
Bill Yi [Thu, 26 Jan 2017 07:21:24 +0000 (07:21 +0000)]
Import translations. DO NOT MERGE am: 30b5edfd23  -s ours
am: 4b6ec5fc6a  -s ours

Change-Id: Ic842d3d523fe0d30d7eea7f389862a60fd18a062

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 6201ee5c68 -s ours
Bill Yi [Thu, 26 Jan 2017 07:20:29 +0000 (07:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 6201ee5c68  -s ours
am: 5aa8230eb4  -s ours

Change-Id: I9f0c210dc6dfeb8bc60f924309199e50a5e99838

7 years agoImport translations. DO NOT MERGE am: 9c0c94c1b5 -s ours
Bill Yi [Thu, 26 Jan 2017 07:19:34 +0000 (07:19 +0000)]
Import translations. DO NOT MERGE am: 9c0c94c1b5  -s ours
am: 530f10fb47  -s ours

Change-Id: I9966efeaa61f54af7c3cac10d388c9e4c56e555d

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 26 Jan 2017 07:16:06 +0000 (07:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 36f8170bbc  -s ours

Change-Id: If96f86dd128b899982a82f27a54b3682c86123b0

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 26 Jan 2017 07:16:01 +0000 (07:16 +0000)]
Import translations. DO NOT MERGE
am: 30b5edfd23  -s ours

Change-Id: I8e401e5b1cdfa7506384c1aeab219697360bcf79

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 26 Jan 2017 07:14:41 +0000 (07:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 6201ee5c68  -s ours

Change-Id: I02412d6d4a77f847f3eef6e822664cc10dd6768e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 26 Jan 2017 07:14:36 +0000 (07:14 +0000)]
Import translations. DO NOT MERGE
am: 9c0c94c1b5  -s ours

Change-Id: I8c629cb66f2c962598e4ec221432c6d0c1ab6a85

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 26 Jan 2017 07:11:08 +0000 (07:11 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 26 Jan 2017 07:10:23 +0000 (07:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 26 Jan 2017 07:08:11 +0000 (07:08 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 26 Jan 2017 07:07:36 +0000 (07:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 26 Jan 2017 07:04:43 +0000 (07:04 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Notification Channels come to SystemUI's own notifications."
TreeHugger Robot [Thu, 26 Jan 2017 06:57:14 +0000 (06:57 +0000)]
Merge "Notification Channels come to SystemUI's own notifications."

7 years agoMerge "Do not remove file_cache when exiting demo mode"
TreeHugger Robot [Thu, 26 Jan 2017 06:43:11 +0000 (06:43 +0000)]
Merge "Do not remove file_cache when exiting demo mode"

7 years agoMerge "Refine the comparator for the animation event sorting"
Doris Liu [Thu, 26 Jan 2017 06:38:30 +0000 (06:38 +0000)]
Merge "Refine the comparator for the animation event sorting"

7 years agoMerge "Adapt the paddings of colored notifications"
Selim Cinek [Thu, 26 Jan 2017 06:13:14 +0000 (06:13 +0000)]
Merge "Adapt the paddings of colored notifications"

7 years agoMerge "TIF: Add more fields for guide view on launcher"
TreeHugger Robot [Thu, 26 Jan 2017 06:00:53 +0000 (06:00 +0000)]
Merge "TIF: Add more fields for guide view on launcher"

7 years agoMerge "Remove binder call from fingerprint HIDL interface."
Jim Miller [Thu, 26 Jan 2017 05:38:44 +0000 (05:38 +0000)]
Merge "Remove binder call from fingerprint HIDL interface."

7 years agoRelax permission for shared storage UUID.
Jeff Sharkey [Thu, 26 Jan 2017 05:16:52 +0000 (22:16 -0700)]
Relax permission for shared storage UUID.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 2794881730927649
Change-Id: Ia5217718a22020787fc3e3fd21584f22a8be7611

7 years agoMerge "ExifInterface: Accept decimal values for RATIONAL formats"
Hyundo Moon [Thu, 26 Jan 2017 04:55:56 +0000 (04:55 +0000)]
Merge "ExifInterface: Accept decimal values for RATIONAL formats"

7 years agoMerge "Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:55:37 +0000 (04:55 +0000)]
Merge "Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7" into nyc-mr2-dev-plus-aosp am: 5c44db22bc"

7 years agoMerge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am:...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:55:18 +0000 (04:55 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7 am: 51493d3915"

7 years agoMerge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am:...
Elliot Waite [Thu, 26 Jan 2017 04:54:28 +0000 (04:54 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7" into nyc-mr2-dev-plus-aosp
am: 5c44db22bc

Change-Id: I8977abc0f27e906cc9ef5aac11bd0aa07e13cd2e

7 years agoMerge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50...
Elliot Waite [Thu, 26 Jan 2017 04:54:18 +0000 (04:54 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7
am: 51493d3915

Change-Id: I963846ab58574620bd5140d1f64175086ced5416

7 years agoMerge "Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:53:53 +0000 (04:53 +0000)]
Merge "Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018" into nyc-mr2-dev-plus-aosp am: 174a1f97e2"

7 years agoMerge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am:...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:53:36 +0000 (04:53 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018 am: 210d818222"

7 years agoMerge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am:...
Elliot Waite [Thu, 26 Jan 2017 04:52:42 +0000 (04:52 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018" into nyc-mr2-dev-plus-aosp
am: 174a1f97e2

Change-Id: I4f1b1810827d454c7e74d08198d918682f292134

7 years agoMerge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50...
Elliot Waite [Thu, 26 Jan 2017 04:52:34 +0000 (04:52 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018
am: 210d818222

Change-Id: Iae8b5750a1b1001d490ec1bca9eaea841a95634f

7 years agoMerge "Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:52:01 +0000 (04:52 +0000)]
Merge "Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369" into nyc-mr2-dev-plus-aosp am: 33af3282b0"

7 years agoMerge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:51:43 +0000 (04:51 +0000)]
Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369 am: 55697fa1af"

7 years agoMerge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369...
Elliot Waite [Thu, 26 Jan 2017 04:50:50 +0000 (04:50 +0000)]
Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369" into nyc-mr2-dev-plus-aosp
am: 33af3282b0

Change-Id: I97ca6bd39bb30d2a940e49429452b8842a81698d

7 years agoMerge "Update IS_OMTP_VOICEMAIL value to "is_omtp_voicemail" in API"
Brian Carlstrom [Thu, 26 Jan 2017 04:50:41 +0000 (04:50 +0000)]
Merge "Update IS_OMTP_VOICEMAIL value to "is_omtp_voicemail" in API"

7 years agoFix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369
Elliot Waite [Thu, 26 Jan 2017 04:50:42 +0000 (04:50 +0000)]
Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369
am: 55697fa1af

Change-Id: If23a8945a3ebec0595464937f54b0b4d4765268e

7 years agoMerge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:50:14 +0000 (04:50 +0000)]
Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9 am: 9b21265b2c"

7 years agoFix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9
Elliot Waite [Thu, 26 Jan 2017 04:49:33 +0000 (04:49 +0000)]
Fix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9
am: 9b21265b2c

Change-Id: If246ebdb36cf2832d5a6c42cbe752e290b6fb6e8

7 years agoMerge "Add notification channel groups."
TreeHugger Robot [Thu, 26 Jan 2017 04:49:29 +0000 (04:49 +0000)]
Merge "Add notification channel groups."

7 years agoMerge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am:...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:46:37 +0000 (04:46 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: b69d7554d7" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am:...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:46:21 +0000 (04:46 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50
Elliot Waite [Thu, 26 Jan 2017 04:45:59 +0000 (04:45 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50
am: b69d7554d7

Change-Id: I3222069c804f524d29eebb0bde502aec5a92c04f

7 years agoMerge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50
Elliot Waite [Thu, 26 Jan 2017 04:45:49 +0000 (04:45 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50
am: 44cafbb018

Change-Id: I77fd396040a31c69d98e3ca9d2bddd4f2632419f

7 years agoMerge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am: 0645c...
Pavlin Radoslavov [Thu, 26 Jan 2017 04:45:45 +0000 (04:45 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am: 0645c21163 am: b3f1eaa504 am: e667f7795f
am: 0946c26b39

Change-Id: Idd92101991a52af343a8479ef944a8396f4ab887

7 years agoMerge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369...
Android Build Merger (Role) [Thu, 26 Jan 2017 04:45:36 +0000 (04:45 +0000)]
Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369" into nyc-mr2-dev-plus-aosp

7 years agoFix @links in reference docs. am: 54de77470d am: ab978c035e
Elliot Waite [Thu, 26 Jan 2017 04:44:56 +0000 (04:44 +0000)]
Fix @links in reference docs. am: 54de77470d am: ab978c035e
am: de2557f369

Change-Id: I3d4637ec03906dd520edaeadecdfe2fd4faa471b

7 years agoFix @links in reference docs. am: 54de77470d am: ab978c035e
Elliot Waite [Thu, 26 Jan 2017 04:44:54 +0000 (04:44 +0000)]
Fix @links in reference docs. am: 54de77470d am: ab978c035e
am: 28ba4722a9

Change-Id: I98177a8cf0a20677e140406bb7371474ca259e5b

7 years agoMerge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2...
Steve McKay [Thu, 26 Jan 2017 04:44:46 +0000 (04:44 +0000)]
Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev am: 32e6da5b84
am: ea02035c4d  -s ours

Change-Id: I8c9cbbf10e1058180bdbb127d9657c4f6fe9c886

7 years agoDO NOT MERGE: Allow launcher icon to be config'd in overlay. am: 24cd592b24
Steve McKay [Thu, 26 Jan 2017 04:41:50 +0000 (04:41 +0000)]
DO NOT MERGE: Allow launcher icon to be config'd in overlay. am: 24cd592b24
am: 1552895f55  -s ours

Change-Id: Ic8916aee1861f93883c51afe9da1b09a7eb1a467

7 years agoMerge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4
Elliot Waite [Thu, 26 Jan 2017 04:40:54 +0000 (04:40 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4
am: 6cc3802e50

Change-Id: I9b581b9a8be3d5d10abfbbc5770301fe67f94f78

7 years agoMerge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4
Elliot Waite [Thu, 26 Jan 2017 04:40:47 +0000 (04:40 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4
am: 6cc3802e50

Change-Id: I52ddc7a726e5b12d136e0e524225422e5e6aa1a6

7 years agoMerge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am: 0645c...
Pavlin Radoslavov [Thu, 26 Jan 2017 04:40:43 +0000 (04:40 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am: 0645c21163 am: b3f1eaa504
am: e667f7795f

Change-Id: Ia6722702175e196d5b980ec7be3a093e972cfbfb

7 years agoFix @links in reference docs. am: 54de77470d
Elliot Waite [Thu, 26 Jan 2017 04:39:57 +0000 (04:39 +0000)]
Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea

7 years agoFix @links in reference docs. am: 54de77470d
Elliot Waite [Thu, 26 Jan 2017 04:39:53 +0000 (04:39 +0000)]
Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: Ibec2b85708f9ff923156f4d867c9c2f71c75d41c

7 years agoUpdate IS_OMTP_VOICEMAIL value to "is_omtp_voicemail" in API
Brian Carlstrom [Thu, 26 Jan 2017 04:38:32 +0000 (20:38 -0800)]
Update IS_OMTP_VOICEMAIL value to "is_omtp_voicemail" in API

Test: m -j32 checkbuild docs
Change-Id: I03b229ab8e5f0e16459a8f3e4a89bd1421ff637e