OSDN Git Service
Fan Zhang [Tue, 25 Apr 2017 05:01:50 +0000 (05:01 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev am:
940f6a9962
am:
bb6f84699e
Change-Id: I74de73282d33260ea99e240fcf904c1ab39361dc
Todd Kennedy [Tue, 25 Apr 2017 04:57:10 +0000 (04:57 +0000)]
Merge "fix check for provider resolution" into oc-dev am:
ade1496f96
am:
3627c9479a
Change-Id: I01241d8f5c5e13be273a5187502267c633e5fd9c
Fan Zhang [Tue, 25 Apr 2017 04:55:45 +0000 (04:55 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
am:
940f6a9962
Change-Id: I6346e51b77e03eca1c7496ce9fa3ed41c7de2a04
Todd Kennedy [Tue, 25 Apr 2017 04:48:26 +0000 (04:48 +0000)]
Merge "fix check for provider resolution" into oc-dev
am:
ade1496f96
Change-Id: Iced763d26e0872d3b6cc5a124e95c413ad7fc436
Fan Zhang [Tue, 25 Apr 2017 04:48:19 +0000 (04:48 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 04:44:51 +0000 (04:44 +0000)]
Merge "fix check for provider resolution" into oc-dev
lei.xa.liu [Tue, 25 Apr 2017 04:42:12 +0000 (04:42 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev am:
90c3489525
am:
9af8f27ef9
Change-Id: I510e2df0d5f55df6f2f3864273fec2b07844ba45
Wale Ogunwale [Tue, 25 Apr 2017 04:37:21 +0000 (04:37 +0000)]
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev am:
f4472b6507
am:
a805e2cc22
Change-Id: Ie36d9fd65d934f270c7f648bb37b42a7d93a8739
lei.xa.liu [Tue, 25 Apr 2017 04:33:15 +0000 (04:33 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev
am:
90c3489525
Change-Id: I77f82bcd38a0cb16226d58a5731c76a630c7e3be
Wale Ogunwale [Tue, 25 Apr 2017 04:31:17 +0000 (04:31 +0000)]
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev
am:
f4472b6507
Change-Id: I2507216075b544eed6b9de4cea0f28e80c5c28d4
Chris Forbes [Tue, 25 Apr 2017 04:26:34 +0000 (04:26 +0000)]
Merge "jni: Adjust for libui gralloc flags change" into oc-dev am:
3b7c1a32f1
am:
d8b8a23dc9
Change-Id: I4f06e32ecf8c4bbe018907efa3b86b98fc6e20bd
TreeHugger Robot [Tue, 25 Apr 2017 04:26:27 +0000 (04:26 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 04:25:30 +0000 (04:25 +0000)]
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev
Chris Forbes [Tue, 25 Apr 2017 04:19:27 +0000 (04:19 +0000)]
Merge "jni: Adjust for libui gralloc flags change" into oc-dev
am:
3b7c1a32f1
Change-Id: Ib3c4d82de642f7db58bf1ce2729df1b1cf934e55
TreeHugger Robot [Tue, 25 Apr 2017 04:12:26 +0000 (04:12 +0000)]
Merge "jni: Adjust for libui gralloc flags change" into oc-dev
Svetoslav Ganov [Tue, 25 Apr 2017 04:09:16 +0000 (04:09 +0000)]
Merge "Move child package feature behind sys prop" into oc-dev am:
6b3263a6e2
am:
f9b00d77b8
Change-Id: Id647581dc8826b2b872440caab817e1a0385b0e6
Svetoslav Ganov [Tue, 25 Apr 2017 04:03:19 +0000 (04:03 +0000)]
Merge "Move child package feature behind sys prop" into oc-dev
am:
6b3263a6e2
Change-Id: Ia701ccac097b1296b857928e1283d5b995fcdb6a
Svetoslav Ganov [Tue, 25 Apr 2017 03:58:56 +0000 (03:58 +0000)]
Merge "Move child package feature behind sys prop" into oc-dev
Etan Cohen [Tue, 25 Apr 2017 03:40:20 +0000 (03:40 +0000)]
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev am:
14ff091a1d
am:
b1e35762b9 -s ours
Change-Id: I2baa41c5268ec19b2115b9fc9981b10eb47f2d35
Etan Cohen [Tue, 25 Apr 2017 03:32:56 +0000 (03:32 +0000)]
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev
am:
14ff091a1d
Change-Id: Ic6dc86dc91d8024b76c3a6eff506aa5d1aefe594
TreeHugger Robot [Tue, 25 Apr 2017 03:26:53 +0000 (03:26 +0000)]
Merge "Allow a11y listeners to specify handlers"
Etan Cohen [Tue, 25 Apr 2017 03:26:01 +0000 (03:26 +0000)]
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev
Ta-wei Yen [Tue, 25 Apr 2017 03:07:42 +0000 (03:07 +0000)]
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev am:
3db7350d7d
am:
683624afd2
Change-Id: I9be453eb96cce94af91c76253c5667fe470fb9bc
Ta-wei Yen [Tue, 25 Apr 2017 03:00:33 +0000 (03:00 +0000)]
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
am:
3db7350d7d
Change-Id: I428d6e101d46e216a1e6e34048f1d3da2fb5314e
Eugene Susla [Tue, 25 Apr 2017 02:57:06 +0000 (02:57 +0000)]
Remove 'via Bluetooth' from the choosed dialog am:
b7aec13d51
am:
d0e822894b
Change-Id: I364ef676d702b0991b15eff2f09c1dc81110aa67
TreeHugger Robot [Tue, 25 Apr 2017 02:55:14 +0000 (02:55 +0000)]
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
Eugene Susla [Tue, 25 Apr 2017 02:53:02 +0000 (02:53 +0000)]
Remove 'via Bluetooth' from the choosed dialog
am:
b7aec13d51
Change-Id: I2ab4da7de0d7c269c2f3af59813576b392f603bf
Chris Forbes [Thu, 20 Apr 2017 18:58:45 +0000 (11:58 -0700)]
jni: Adjust for libui gralloc flags change
Change-Id: I94b95fba5e6234a07d2beba1d6f487842399367f
Bug: b/
33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
Phil Weaver [Fri, 21 Apr 2017 00:19:14 +0000 (17:19 -0700)]
Allow a11y listeners to specify handlers
This follows recommended practice for listeners, and also
allows ViewRootImpl to register for callbacks on its own
handler, which can prevent crashes in apps that have
different threads managing the UI at different times (for
example the system process).
Bug:
37542371
Test: Adding CTS tests for new APIs. A11y CTS still passes.
Change-Id: I65db025275e153c20b20567346246d5bc13bf418
Eugene Susla [Tue, 18 Apr 2017 19:43:15 +0000 (12:43 -0700)]
Remove 'via Bluetooth' from the choosed dialog
We no longer limit the items in a single chooser dialog to a devices from
single medium type.
Test: Ensure the dialog UI reflects the change.
Change-Id: Ia2342861f51f89e870f1c6a7fbebf9c1a37cac6a
Svet Ganov [Thu, 20 Apr 2017 06:51:33 +0000 (23:51 -0700)]
Move child package feature behind sys prop
Now one can do adb shell setprop/getptop to change
"persist.sys.child_packages_enabled" to true/false to
control whether child packages are supported.
Test: manual
bug:
36107077
Change-Id: Ie60e255fd3c248905906cdd5b10adae074c0b717
Dmitry Dementyev [Mon, 24 Apr 2017 23:54:31 +0000 (23:54 +0000)]
Merge "Update PACKAGE_REMOVED broadcast."
Amith Yamasani [Mon, 24 Apr 2017 23:52:20 +0000 (23:52 +0000)]
Merge "Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5 am:
0efa055590 am:
6e7afc78a7" into oc-dev-plus-aosp
am:
e7e7a1655a
Change-Id: Iffaf0d2610f0735c0717fb117f57ee6423cc67d8
Jean-Michel Trivi [Mon, 24 Apr 2017 23:50:25 +0000 (23:50 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev am:
9e55fcbdc2
am:
c2c0008c68
Change-Id: I4b35c08e151401ebabf7740f706b79d7911838f8
Android Build Merger (Role) [Mon, 24 Apr 2017 23:47:11 +0000 (23:47 +0000)]
Merge "Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5 am:
0efa055590 am:
6e7afc78a7" into oc-dev-plus-aosp
Amith Yamasani [Mon, 24 Apr 2017 23:46:28 +0000 (23:46 +0000)]
Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5 am:
0efa055590
am:
6e7afc78a7
Change-Id: Iec01fcd319146183e6e958974d494aeeb698c7c5
Jean-Michel Trivi [Mon, 24 Apr 2017 23:44:22 +0000 (23:44 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
am:
9e55fcbdc2
Change-Id: Id7a2620c784e6bc2bee287d0ef3836f890f227b8
Amith Yamasani [Mon, 24 Apr 2017 23:42:27 +0000 (23:42 +0000)]
Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5
am:
0efa055590
Change-Id: Ibed5b8045215e0d4dd4e20aa2778ec5a16c715e2
Jean-Michel Trivi [Mon, 24 Apr 2017 23:39:41 +0000 (23:39 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
Adam Lesinski [Mon, 24 Apr 2017 23:37:13 +0000 (23:37 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev am:
76831f7e39
am:
085abab5ba
Change-Id: Ic5e4a29f2b81aac05cf53b99190e92989163e412
Amith Yamasani [Mon, 24 Apr 2017 23:36:58 +0000 (23:36 +0000)]
Merge "Check Bluetooth app id instead of uid"
am:
7d4a354fd5
Change-Id: Ib79ace5311606520ae84c4ba37ffc64a538428d6
Felipe Leme [Mon, 24 Apr 2017 23:32:33 +0000 (23:32 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev am:
0fe852080e
am:
8ecd9c47f7 -s ours
Change-Id: Ie286abe6634ad32bb7806a312630cf1f40b5d9c6
Adam Lesinski [Mon, 24 Apr 2017 23:31:26 +0000 (23:31 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev
am:
76831f7e39
Change-Id: Ia2a30b7b9f4f11afdbf3ee020288a8d29245a4f4
TreeHugger Robot [Mon, 24 Apr 2017 23:31:06 +0000 (23:31 +0000)]
Merge "Don't skip intents where config changed."
Treehugger Robot [Mon, 24 Apr 2017 23:30:51 +0000 (23:30 +0000)]
Merge "Check Bluetooth app id instead of uid"
TreeHugger Robot [Mon, 24 Apr 2017 23:26:01 +0000 (23:26 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev
* changes:
AAPT2: Allow truncating of package names
AAPT2: Make BinaryResourceParser more lenient
Etan Cohen [Mon, 24 Apr 2017 23:25:06 +0000 (23:25 +0000)]
Merge "[AWARE] Remove match style API" into oc-dev am:
2be0a532bf
am:
1945f3ad2e
Change-Id: I94ddbb5eae5ff644b5b06b57633762b6bce8433f
Felipe Leme [Mon, 24 Apr 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev
am:
0fe852080e
Change-Id: Ic755dc978f745de36018af56a6ad851f138d98b0
Ruben Brunk [Mon, 24 Apr 2017 23:15:02 +0000 (23:15 +0000)]
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev am:
d8f13bbc3d
am:
80e2f403d2
Change-Id: I848538c372bdb95ec4e13babe4dc1da7ac455ce9
Felipe Leme [Mon, 24 Apr 2017 23:10:48 +0000 (23:10 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev
Chien-Yu Chen [Mon, 24 Apr 2017 23:10:38 +0000 (23:10 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev am:
06d84c3a86
am:
2fd83ae977
Change-Id: Ieca16e7ab8d09e92b3d37537f3b5a28bbe2f2947
Etan Cohen [Mon, 24 Apr 2017 23:07:42 +0000 (23:07 +0000)]
Merge "[AWARE] Remove match style API" into oc-dev
am:
2be0a532bf
Change-Id: I0d2292b7d7fe932657e17598e2899b36971186a9
Felipe Leme [Fri, 21 Apr 2017 15:56:04 +0000 (08:56 -0700)]
Minor fixes on Autofill Framework:
- Removed default implementation of onProvideAutofillVirtualStructure() that
was using accessibility API (it's useless because without the View calling
AutofillManager.notifyViewEntered(), it would never be triggered).
- Fixed obsolete TODOs.
- Removed obsolete service class name constant.
- Removed unused debug constant.
Fixes:
37078783
Fixes:
33197203
Bug:
33802548
Bug:
35956626
Test: CtsAutoFillServiceTestCases pass
Merged-In: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
Change-Id: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
Etan Cohen [Mon, 24 Apr 2017 22:59:17 +0000 (22:59 +0000)]
Merge "[AWARE] Remove match style API" into oc-dev
Ruben Brunk [Mon, 24 Apr 2017 22:53:53 +0000 (22:53 +0000)]
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
am:
d8f13bbc3d
Change-Id: I30baa3eeaab4d8cdb189ab4d59c3272c6232f798
Ruben Brunk [Mon, 24 Apr 2017 22:49:07 +0000 (22:49 +0000)]
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
Jeff Sharkey [Mon, 24 Apr 2017 22:48:57 +0000 (22:48 +0000)]
Merge "Bunch of new API lint rules." into oc-dev am:
57b999605c
am:
8ec71a639b
Change-Id: Iee0b9508f3eb79eb88e1748a323390283efb9494
Wale Ogunwale [Mon, 24 Apr 2017 22:47:16 +0000 (22:47 +0000)]
Merge "Fixed transition animation from pipable activities" into oc-dev am:
3fc176913a
am:
f8b513e652
Change-Id: I2c88524eb8d8ef0dfbc54e586b3b770923444eca
Karthik Ravi Shankar [Mon, 24 Apr 2017 22:45:33 +0000 (22:45 +0000)]
Merge changes from topic 'virtual-display-api' into oc-dev am:
13ba34bf37
am:
875c8445a8
Change-Id: I12f88b60d82fba4227c9f565009e6c3e42f6798c
Jeff Sharkey [Mon, 24 Apr 2017 22:43:34 +0000 (22:43 +0000)]
Merge "Even more auto-doc work." into oc-dev am:
880f4f4cc2
am:
9652eef0b2
Change-Id: I96c77c62b6ee3b5acaa45e116d35c7114797a0b8
Chien-Yu Chen [Mon, 24 Apr 2017 22:41:49 +0000 (22:41 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev
am:
06d84c3a86
Change-Id: I49afc64341f4bb53287991a48535ad2108afce3f
TreeHugger Robot [Mon, 24 Apr 2017 22:36:50 +0000 (22:36 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev
Kang Li [Mon, 24 Apr 2017 22:32:18 +0000 (22:32 +0000)]
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev am:
925d3cf211
am:
1a297e53dc
Change-Id: Ie44cd313255d95e583657829448fd83decfaa10b
Julia Reynolds [Mon, 24 Apr 2017 22:25:36 +0000 (22:25 +0000)]
Merge "Don't allow devs to create blocked channels" into oc-dev am:
10e7275965
am:
521f6b46f2
Change-Id: Idcec9055f4d75e40d37b29c5bca90720995e84e1
Jeff Sharkey [Mon, 24 Apr 2017 22:25:17 +0000 (22:25 +0000)]
Merge "Bunch of new API lint rules." into oc-dev
am:
57b999605c
Change-Id: I0047174a7cfd43f644d2010f9f0c6662440f4680
Julia Reynolds [Mon, 24 Apr 2017 22:23:49 +0000 (22:23 +0000)]
Merge "Don't consider uri empty a valid sound" into oc-dev am:
db5f5c3a17
am:
b61659e291
Change-Id: I6122c2d43e3bf5eb0f8b1fb6c0620cb2b4a6abd9
Santos Cordon [Mon, 24 Apr 2017 22:22:07 +0000 (22:22 +0000)]
Merge "Clean up ImageReader when VrMode is disabled." into oc-dev am:
5d1c65971f
am:
291b09ec4b
Change-Id: I64d42562ede23eb6436719dfce527430ff9451b3
Jeff Sharkey [Mon, 24 Apr 2017 22:18:51 +0000 (22:18 +0000)]
Merge "Bunch of new API lint rules." into oc-dev
Felipe Leme [Mon, 24 Apr 2017 22:17:35 +0000 (22:17 +0000)]
Merge "Replaced getUrl() by getWebDomain()." into oc-dev am:
ffef2ad2b0
am:
bf4451aa0e
Change-Id: I96fae5dae4a5b5a03d39170ad04b1d812f991668
Eugene Susla [Mon, 24 Apr 2017 22:14:18 +0000 (22:14 +0000)]
Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev am:
e4964118c6
am:
6417845d9f
Change-Id: I9e1b119efdeab25932d81a749cfaa8d0b67478c4
Amith Yamasani [Mon, 24 Apr 2017 22:12:41 +0000 (22:12 +0000)]
Merge "Add link to class with constants" into oc-dev am:
6c0f8dc0b0
am:
515239fa6f
Change-Id: Id0fde28e92f8ab92f09e5d0284e9a2f37f838d55
Robert Carr [Mon, 24 Apr 2017 22:10:47 +0000 (22:10 +0000)]
Merge "Prevent leak of AppWindowTokens." into oc-dev am:
53845068f4
am:
657dcd0202
Change-Id: I28234916bd01d2d146c26339644de57b085459d3
Pankaj Kanwar [Mon, 24 Apr 2017 22:06:48 +0000 (22:06 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
f02b7b7ba6 am:
4ef0e826c4 am:
b12a7c8058 -s ours
am:
0d5c062d97 -s ours
Change-Id: I661c22713cee99138f91053b52a466684a5580cb
Amith Yamasani [Mon, 24 Apr 2017 22:04:46 +0000 (22:04 +0000)]
Merge "Check bluetooth app id instead of uid" into oc-dev am:
094996a2b3
am:
3a3fdfa53b
Change-Id: I2ab94eb4697ac47b34468f961399a413aac4ef58
Glen Kuhne [Mon, 24 Apr 2017 22:00:03 +0000 (22:00 +0000)]
Merge "Wifi Metrics STA event list" into oc-dev am:
9870d0bef7
am:
19bdb91fb7
Change-Id: Ice4284ca5c947b738a4c1d5452e6e7e9502aecd1
Pankaj Kanwar [Mon, 24 Apr 2017 21:58:03 +0000 (21:58 +0000)]
Merge "Update USSD API docs per API review comments." into oc-dev am:
c2d54af521
am:
5e4296bad9
Change-Id: Ic49859ee3f3469f722354aa17920bc51cd524ae9
Yang Ni [Mon, 24 Apr 2017 21:53:37 +0000 (21:53 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations" into oc-dev am:
4d23f258d4
am:
c6606b843a
Change-Id: I41250fd7944c96966cbcad30dd23d61c517a5a2d
Wale Ogunwale [Mon, 24 Apr 2017 21:51:51 +0000 (21:51 +0000)]
Merge "Fixed transition animation from pipable activities" into oc-dev
am:
3fc176913a
Change-Id: Ibcc4ecf80bd9dd10d8f09147a624f095ceb48717
Brad Ebinger [Mon, 24 Apr 2017 21:51:27 +0000 (21:51 +0000)]
Merge "Whitelist PHONE_STATE to wakeup apps" into oc-dev am:
41bf42a1c7
am:
0109e15888
Change-Id: I1bb9350302f759044847493f8e8805af84f18043
Geoffrey Pitsch [Mon, 24 Apr 2017 21:49:39 +0000 (21:49 +0000)]
Merge "Hide secondary text for Default channel if not blocked" into oc-dev am:
9226516cef
am:
7561c3fb53
Change-Id: I0c820c855e1e9718b6c77ac92dbb5efc477c6e78
Jakub Pawlowski [Mon, 24 Apr 2017 21:47:56 +0000 (21:47 +0000)]
Merge "Merge "Get rid of the IAdvertiserCallabck" am:
7503b11b14 am:
2fb02a252c am:
526719a1a2" into oc-dev-plus-aosp
am:
28a9a1a61e
Change-Id: I1b3a962d28ff95aaf147afb0032ab7bc6495611b
TreeHugger Robot [Mon, 24 Apr 2017 21:46:28 +0000 (21:46 +0000)]
Merge "Fixed transition animation from pipable activities" into oc-dev
Jerry Zhang [Thu, 20 Apr 2017 20:46:29 +0000 (13:46 -0700)]
Don't skip intents where config changed.
Since we are adding ffs.mtp.ready to the init
scripts, we can no longer skip intents that cause
that property to be set.
This fixes the case where device is disconnected
and adb is repeatedly enabled/disabled.
Test: enable/disable adb, usb mtp
Bug:
33220530
Change-Id: I48e687c1af3f9da9e522ebe879285877c0168da8
Karthik Ravi Shankar [Mon, 24 Apr 2017 21:39:45 +0000 (21:39 +0000)]
Merge changes from topic 'virtual-display-api' into oc-dev
am:
13ba34bf37
Change-Id: Id0195114803007719ff2dab6e8b1ef18983c95ad
Jeff Sharkey [Mon, 24 Apr 2017 21:38:03 +0000 (21:38 +0000)]
Merge "Even more auto-doc work." into oc-dev
am:
880f4f4cc2
Change-Id: I78199f8366fbda65a4b4917675291d946e29285c
Android Build Merger (Role) [Mon, 24 Apr 2017 21:36:35 +0000 (21:36 +0000)]
Merge "Merge "Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev am:
8a4ff5edb5" into oc-dev-plus-aosp am:
97cb726b08"
George Mount [Mon, 24 Apr 2017 21:34:45 +0000 (21:34 +0000)]
Merge "Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev am:
8a4ff5edb5" into oc-dev-plus-aosp
am:
97cb726b08
Change-Id: Icbba1b2089b89351f93e8d0c3b7e18737f6d2b35
TreeHugger Robot [Mon, 24 Apr 2017 21:34:22 +0000 (21:34 +0000)]
Merge "Minor fixes on Autofill Framework:"
TreeHugger Robot [Mon, 24 Apr 2017 21:33:55 +0000 (21:33 +0000)]
Merge changes from topic 'virtual-display-api' into oc-dev
* changes:
Add command line option to set compatibility display properties
Make VR mode virtual display properties customizable
TreeHugger Robot [Mon, 24 Apr 2017 21:33:13 +0000 (21:33 +0000)]
Merge "Even more auto-doc work." into oc-dev
Kang Li [Mon, 24 Apr 2017 21:31:25 +0000 (21:31 +0000)]
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
am:
925d3cf211
Change-Id: I9174e1f12c78ff4f7bbd72446fbf10e09478dbe0
Joachim Sauer [Mon, 24 Apr 2017 21:30:03 +0000 (21:30 +0000)]
Merge "Merge "Deprecate internal Calendar methods." am:
e08bd750c8 am:
5144cd445a am:
30ce9c07ec" into oc-dev-plus-aosp
am:
8b2caae395
Change-Id: I7ef1ace4a696dc5b57ad42b7756e0e3a6efa5c83
Jorim Jaggi [Mon, 24 Apr 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Merge "Insert missing breaks" into oc-dev am:
88db7b39cf" into oc-dev-plus-aosp
am:
9e8ce10496
Change-Id: I36dc9492517009ac866382d8e56b3f0e85d42ea5
Julia Reynolds [Mon, 24 Apr 2017 21:27:39 +0000 (21:27 +0000)]
Merge "Don't allow devs to create blocked channels" into oc-dev
am:
10e7275965
Change-Id: I1e5293cbd14b23bfffab2e8ff6384ce3c9092a64
Winson Chung [Mon, 24 Apr 2017 21:25:58 +0000 (21:25 +0000)]
Merge "Fix check when finding tasks to reuse. am:
91e5c886c8" into oc-dev-plus-aosp
am:
388fb093be
Change-Id: I441977e51623d0569481e6cab2728b2a938f66fe
Julia Reynolds [Mon, 24 Apr 2017 21:25:55 +0000 (21:25 +0000)]
Merge "Don't consider uri empty a valid sound" into oc-dev
am:
db5f5c3a17
Change-Id: I6ff2dc17f716de58fe4d3f485b6315e7b2bb232b
Todd Kennedy [Mon, 24 Apr 2017 21:23:01 +0000 (21:23 +0000)]
Merge "Merge "fix service binding" into oc-dev am:
4eaeb91e42" into oc-dev-plus-aosp
am:
af6b454b14
Change-Id: I55e0a3543202407577b6ebd433fdb8b406125137
Kang Li [Mon, 24 Apr 2017 21:21:34 +0000 (21:21 +0000)]
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
Julia Reynolds [Mon, 24 Apr 2017 21:17:12 +0000 (21:17 +0000)]
Merge "Don't allow devs to create blocked channels" into oc-dev
Todd Kennedy [Mon, 24 Apr 2017 21:17:04 +0000 (21:17 +0000)]
Merge "Merge "Remove @TestApi annotation" into oc-dev am:
1ab9119f50" into oc-dev-plus-aosp
am:
3855f370d9
Change-Id: I9bb1800ea0b3adba259994300aa7f54eb1a0e5cf
OSDN Git Service
