OSDN Git Service
Jason Monk [Wed, 19 Apr 2017 23:04:52 +0000 (23:04 +0000)]
Merge "Fix tint on accessibility stream" into oc-dev
am:
269e549e44
Change-Id: I3e7a70ab352cf0b400dbf509b11636550c941642
TreeHugger Robot [Wed, 19 Apr 2017 22:56:21 +0000 (22:56 +0000)]
Merge "Fix tint on accessibility stream" into oc-dev
Dianne Hackborn [Wed, 19 Apr 2017 22:29:59 +0000 (22:29 +0000)]
Merge "Fix issue #
37306208: CTS: ServiceTest#testForegroundService..." into oc-dev
am:
8305a1fb38
Change-Id: I57e7e983ff3492fe3a6cf3560eded4122a7bd736
Dianne Hackborn [Wed, 19 Apr 2017 22:20:52 +0000 (22:20 +0000)]
Merge "Fix issue #
37306208: CTS: ServiceTest#testForegroundService..." into oc-dev
Todd Kennedy [Wed, 19 Apr 2017 22:04:33 +0000 (22:04 +0000)]
Merge "Allow verifier to be optional" into oc-dev
am:
8ffd8f7848
Change-Id: Ide9c5e7eb6a88b5962cb63f10272a81184b4e4c7
Android Build Merger (Role) [Wed, 19 Apr 2017 21:52:07 +0000 (21:52 +0000)]
Merge "Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350 am:
fc99848b96 am:
f3732e2fe2" into oc-dev-plus-aosp
TreeHugger Robot [Wed, 19 Apr 2017 21:51:21 +0000 (21:51 +0000)]
Merge "Allow verifier to be optional" into oc-dev
Jakub Pawlowski [Wed, 19 Apr 2017 21:50:42 +0000 (21:50 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350 am:
fc99848b96
am:
f3732e2fe2
Change-Id: I73bc945099ab07b5c1f29896be6135e574821602
Hyunyoung Song [Wed, 19 Apr 2017 21:49:52 +0000 (21:49 +0000)]
Merge "Change mask path to only use cubicTo notation so that isConvex is always true. Bug:
37100106" into oc-dev
am:
f9f8120e56
Change-Id: Ib3bba05bfa4cbea2718d782317abfc75d222504c
Geoffrey Pitsch [Wed, 19 Apr 2017 21:47:52 +0000 (21:47 +0000)]
Merge "Log when an app targeting O does not specify a channel" into oc-dev
am:
af12b17674
Change-Id: Ia7cc8a586441cf6c9bc2a7ccbbe70bc5f89327fe
Romain Guy [Wed, 19 Apr 2017 21:46:11 +0000 (21:46 +0000)]
Merge "Set the color space as nullptr on native bitmaps when sRGB is requested" into oc-dev
am:
e53b00c6d1
Change-Id: I03d0cb5717a0f559890aea201f6d7883c5f6c57f
Jakub Pawlowski [Wed, 19 Apr 2017 21:44:50 +0000 (21:44 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350
am:
fc99848b96
Change-Id: Ie3ded1b0237b56bb4c81ad7a51c50b82267bc536
Ian Lake [Wed, 19 Apr 2017 21:40:52 +0000 (21:40 +0000)]
Merge changes from topic 'chooser' into oc-dev
am:
28602c0921
Change-Id: Ica1b9bf1acc23c89439c4c4adf7c998ee4372c96
Ian Lake [Wed, 19 Apr 2017 21:39:49 +0000 (21:39 +0000)]
Create a valid ActivityOptions Bundle even for default animations
am:
b759bd3b4a
Change-Id: Ib9b61f2bf4ac6b6001664ebbc40d115089e75326
Jakub Pawlowski [Wed, 19 Apr 2017 21:39:11 +0000 (21:39 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)"
am:
f2e6988350
Change-Id: I5b494f00fb88381a7caf95aa206e2fcd373c7129
Ian Lake [Wed, 19 Apr 2017 21:38:43 +0000 (21:38 +0000)]
Remove scale up animation for startActivity from RemoteViews
am:
95b193fdca
Change-Id: I5c3d5865b2f12be5375503678c7bea2d8d831986
TreeHugger Robot [Wed, 19 Apr 2017 21:36:03 +0000 (21:36 +0000)]
Merge "Change mask path to only use cubicTo notation so that isConvex is always true. Bug:
37100106" into oc-dev
Chad Brubaker [Wed, 19 Apr 2017 21:34:14 +0000 (21:34 +0000)]
Merge "Change ANDROID_ID for Instant Apps" into oc-dev
am:
904e6cad28
Change-Id: Ia1f22e10846d1e6ecc2b6830c1d3156267174563
Jakub Pawlowski [Wed, 19 Apr 2017 21:33:43 +0000 (21:33 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)"
Jakub Pawlowski [Wed, 19 Apr 2017 13:52:08 +0000 (06:52 -0700)]
Expose LE advertiser address for easier PTS tests (1/6)
This patchset adds a hidden method getOwnAddress, that lets app with
BLUETOOTH_PRIVILEGED permission to lear their own addreess. This is done
exclusively for PTS tests.
Bug:
35147497
Test: manual
Change-Id: Iaf0f2fe0613de44b8430ac25e691d66a4ad44f8d
Adam Lesinski [Wed, 19 Apr 2017 21:32:05 +0000 (21:32 +0000)]
Merge "Fix issue with unresolved IDs in adaptive icons" into oc-dev
am:
7844a34308
Change-Id: I2731b5d66a002b8b6a5a33e27a5a7c21538e2e7b
tturney [Wed, 19 Apr 2017 21:30:04 +0000 (21:30 +0000)]
Merge "QS BluetoothTile proiritizes connected device" into oc-dev
am:
d5dfde890c
Change-Id: I9f34745a29397dc98f7bd8999cd46a78c813b292
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
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
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
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
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
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
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
TreeHugger Robot [Wed, 19 Apr 2017 21:10:09 +0000 (21:10 +0000)]
Merge "Log when an app targeting O does not specify a channel" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 21:09:41 +0000 (21:09 +0000)]
Merge "Set the color space as nullptr on native bitmaps when sRGB is requested" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 21:04:21 +0000 (21:04 +0000)]
Merge changes from topic 'chooser' into oc-dev
* changes:
Rely on view animations for ResolverActivity
Create a valid ActivityOptions Bundle even for default animations
Remove scale up animation for startActivity from RemoteViews
Chad Brubaker [Wed, 19 Apr 2017 21:00:50 +0000 (21:00 +0000)]
Merge "Change ANDROID_ID for Instant Apps" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:54:06 +0000 (20:54 +0000)]
Merge "Fix issue with unresolved IDs in adaptive icons" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 20:44:21 +0000 (20:44 +0000)]
Merge "QS BluetoothTile proiritizes connected device" 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
TreeHugger Robot [Wed, 19 Apr 2017 20:41:02 +0000 (20:41 +0000)]
Merge "Fix compose shader child local matrix mutation" 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
TreeHugger Robot [Wed, 19 Apr 2017 20:31:01 +0000 (20:31 +0000)]
Merge "Flesh out more API docs." into oc-dev
Jason Monk [Wed, 19 Apr 2017 20:30:40 +0000 (16:30 -0400)]
Fix tint on accessibility stream
Test: make
Change-Id: I91daf405c85490ed0cb9d3909cd96d03884ce191
Fixes:
37485060
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
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
TreeHugger Robot [Wed, 19 Apr 2017 20:24:14 +0000 (20:24 +0000)]
Merge "Up the character limit for thermal strings" 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
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
Jeff Hao [Wed, 19 Apr 2017 20:16:18 +0000 (20:16 +0000)]
Merge "Handle shared libraries for split apks." 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
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
Jeff Sharkey [Wed, 19 Apr 2017 20:11:23 +0000 (20:11 +0000)]
Merge "Some folks like sending null fields." 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
Matt Sarett [Wed, 19 Apr 2017 20:03:49 +0000 (20:03 +0000)]
Merge "Add unit test for Skia path behavior" 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
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
Evan Rosky [Wed, 19 Apr 2017 19:50:24 +0000 (19:50 +0000)]
Merge "Improve ViewDebug reporting for focus properties" 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
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
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
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
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
Geoffrey Pitsch [Wed, 19 Apr 2017 19:21:56 +0000 (15:21 -0400)]
Log when an app targeting O does not specify a channel
Bug:
37485692
Test: runtest systemui-notification
Change-Id: Iffe6a016dfd399c39e0acb281f454271ef13f7fd
TreeHugger Robot [Wed, 19 Apr 2017 19:20:39 +0000 (19:20 +0000)]
Merge "TextClassifierImpl: Fix empty locale list issue." 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
Todd Kennedy [Wed, 19 Apr 2017 19:13:51 +0000 (12:13 -0700)]
Allow verifier to be optional
Change-Id: Ibf01e5283b744f7745e92523787abb3d31a2c813
Fixes:
37412895
Test: Manual; disable verifier and notice that the device doesn't boot loop
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
TreeHugger Robot [Wed, 19 Apr 2017 19:06:04 +0000 (19:06 +0000)]
Merge "Fix FragmentTransaction.show() to show the fragment." 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
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
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
Romain Guy [Wed, 19 Apr 2017 18:58:05 +0000 (11:58 -0700)]
Set the color space as nullptr on native bitmaps when sRGB is requested
This regression is a fallout from the recent API council feedback
fallout. The default color space used to be always set to null but
it's now the named SRGB instance. This change passes null to native
when the specified color space is known to be sRGB.
Bug:
37496760
Test: runtest managed-provisioning
Change-Id: Ie933c84e429a682a58ee253b57b77bd61b88ee5e
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Wed, 19 Apr 2017 18:41:44 +0000 (18:41 +0000)]
Merge "Update snooze visuals to match latest design" into oc-dev
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
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
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
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
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
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
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
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
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
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
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
Robert Greenwalt [Wed, 19 Apr 2017 18:24:03 +0000 (11:24 -0700)]
Merge commit '
d6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f
Change-Id: I86d5e87cc3884d8fc3eb326a92b8871ef0926aa6
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
TreeHugger Robot [Wed, 19 Apr 2017 18:15:31 +0000 (18:15 +0000)]
Merge "Adds getLayoutInflater() to return a cached value." into oc-dev
Chad Brubaker [Wed, 12 Apr 2017 23:56:53 +0000 (16:56 -0700)]
Change ANDROID_ID for Instant Apps
ANDROID_ID for Instant Apps now has the following properties:
1) per-app scoped
2) reset if the user clears the Instant App
3) remains the same if the Instant App gets upgraded to an installed
app.
Note that if the user goes instant -> installed_1 -> uninstall ->
installed_2 the ANDROID_ID at installed_1 will not be the same as
installed_2. This was deemed better than the id changing on the upgrade
step.
Test: manual
Change-Id: I532975c50049c94ff80902a897e001dd35a69f9f
Winson Chung [Wed, 19 Apr 2017 18:10:16 +0000 (18:10 +0000)]
Merge "Adding consistent platform PiP action asset." into oc-dev
OSDN Git Service
