git.osdn.net Git - android-x86/frameworks-base.git/log

Amit Mahajan [Thu, 10 Aug 2017 18:10:00 +0000 (18:10 +0000)]

Merge "Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019 am: e1e32370e2" into oc-mr1-dev-plus-aosp
am: eacbe710dc

Change-Id: I6b2ff0bd59063d94c3e0c2df427b2037da606265

commit | commitdiff | tree

Beverly [Thu, 10 Aug 2017 18:03:39 +0000 (18:03 +0000)]

Merge "Low battery notification has unique sound." into oc-mr1-dev am: 9ac6be4a66
am: ec3481b55d

Change-Id: Ic6feb4f79f2d9a7fb3334333cf54b75e616ec548

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 17:53:26 +0000 (17:53 +0000)]

Merge "Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019 am: e1e32370e2" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Beverly [Thu, 10 Aug 2017 17:46:21 +0000 (17:46 +0000)]

Merge "Low battery notification has unique sound." into oc-mr1-dev
am: 9ac6be4a66

Change-Id: I3a2775b2e7292c56a3a5294df5da13974d99e168

commit | commitdiff | tree

Amit Mahajan [Thu, 10 Aug 2017 17:46:01 +0000 (17:46 +0000)]

Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019
am: e1e32370e2

Change-Id: Ice6d00e2cdfc7b3afff23b3a64d50afc85a56830

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 17:37:05 +0000 (17:37 +0000)]

Merge "Low battery notification has unique sound." into oc-mr1-dev

commit | commitdiff | tree

Amit Mahajan [Thu, 10 Aug 2017 17:27:24 +0000 (17:27 +0000)]

Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7
am: 1a808fc019

Change-Id: I27f67b172bd8096ee00b9c80bb9699b33eff97f7

commit | commitdiff | tree

Beverly [Thu, 10 Aug 2017 17:00:46 +0000 (17:00 +0000)]

Merge "Localization of zen mode default rules." into oc-mr1-dev am: 15ea142044
am: 516be39336

Change-Id: I26fd676a9cb96d0de3f9be715a4fb4591ef031c8

commit | commitdiff | tree

Beverly [Thu, 10 Aug 2017 16:49:36 +0000 (16:49 +0000)]

Merge "Localization of zen mode default rules." into oc-mr1-dev
am: 15ea142044

Change-Id: I28ad1c56e5bd1b9c7eec2cee336e22e5d7c0b6af

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 16:41:36 +0000 (16:41 +0000)]

Merge "Localization of zen mode default rules." into oc-mr1-dev

commit | commitdiff | tree

Amit Mahajan [Thu, 10 Aug 2017 16:20:16 +0000 (16:20 +0000)]

Merge "Get isim card data use subId." am: 854edcff16
am: 3466cda3d7

Change-Id: I84d8b0fd15e50706e59577941428e5f5e81fa373

commit | commitdiff | tree

Amit Mahajan [Thu, 10 Aug 2017 16:06:36 +0000 (16:06 +0000)]

Merge "Get isim card data use subId."
am: 854edcff16

Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b

commit | commitdiff | tree

Amit Mahajan [Thu, 10 Aug 2017 15:57:38 +0000 (15:57 +0000)]

Merge "Get isim card data use subId."

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Aug 2017 15:52:02 +0000 (15:52 +0000)]

Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev am: 57ae4db225
am: 9ed2834cba

Change-Id: Idb3ce60318983a926c615cd0fdca3b700da3902c

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Aug 2017 15:41:36 +0000 (15:41 +0000)]

Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev
am: 57ae4db225

Change-Id: I852a6b01c196240571aed51342fc5e2310c080d6

commit | commitdiff | tree

Jeff Sharkey [Thu, 10 Aug 2017 15:37:52 +0000 (15:37 +0000)]

Merge "Fix handling of @removed APIs." into oc-mr1-dev am: 5cb2d64b9b
am: aff3d6cf6b

Change-Id: Idab5d726027922c66b0ecfe23c3d4f1ea9d2b7a5

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Aug 2017 15:34:22 +0000 (15:34 +0000)]

Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev

commit | commitdiff | tree

Abodunrinwa Toki [Thu, 10 Aug 2017 15:31:54 +0000 (15:31 +0000)]

Merge "Fix failing Framework TextView tests."

commit | commitdiff | tree

Jeff Sharkey [Thu, 10 Aug 2017 15:26:22 +0000 (15:26 +0000)]

Merge "Fix handling of @removed APIs." into oc-mr1-dev
am: 5cb2d64b9b

Change-Id: I1ac9843cc17efc4ea088e5738c38dcd2ad79e5c5

commit | commitdiff | tree

Jeff Sharkey [Thu, 10 Aug 2017 15:18:58 +0000 (15:18 +0000)]

Merge "Fix handling of @removed APIs." into oc-mr1-dev

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Aug 2017 11:28:24 +0000 (11:28 +0000)]

Merge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev am: af706b40de
am: b51eae5825

Change-Id: Idf542e9ee44362617ac247aa6c85921c76778e37

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Aug 2017 11:09:13 +0000 (12:09 +0100)]

ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8.

Bug: 64493351
Test: cts-tradefed run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m CtsAppSecurityHostTestCases
Change-Id: Ib4868c1e0320002f5122193621e9ab56fe34819f

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Aug 2017 11:14:20 +0000 (11:14 +0000)]

Merge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev
am: af706b40de

Change-Id: I8e761bf1c4afba4795aa4041aeabc66b48964030

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Aug 2017 11:04:40 +0000 (11:04 +0000)]

Merge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev

commit | commitdiff | tree

Petar Šegina [Thu, 10 Aug 2017 10:49:45 +0000 (10:49 +0000)]

Merge "Add getSelection(..., RectangleConsumer) to Layout"

commit | commitdiff | tree

Justin Klaassen [Thu, 10 Aug 2017 07:13:39 +0000 (07:13 +0000)]

Merge "Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe am: 365dad5b79" into oc-mr1-dev-plus-aosp
am: cb71e2217e

Change-Id: I7347ce4bb67c6dca159becb3005624428f125bd7

commit | commitdiff | tree

Justin Klaassen [Thu, 10 Aug 2017 07:11:04 +0000 (07:11 +0000)]

Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe am: 3704bb0740
am: ec5db43567

Change-Id: I39be25f3cb506b47ffc7905f4700c5fa606dd0d8

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 07:05:51 +0000 (07:05 +0000)]

Merge "Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe am: 365dad5b79" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Justin Klaassen [Thu, 10 Aug 2017 07:02:07 +0000 (07:02 +0000)]

Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe
am: 365dad5b79

Change-Id: I1e08211ccc567560905a72dee85b1b2f05b3440b

commit | commitdiff | tree

Justin Klaassen [Thu, 10 Aug 2017 07:02:04 +0000 (07:02 +0000)]

Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe
am: 3704bb0740

Change-Id: I75cf8daf594f2bff3acfb7ac7cb7992c578a62b7

commit | commitdiff | tree

Shubang [Thu, 10 Aug 2017 06:56:38 +0000 (06:56 +0000)]

Merge "Add permission check before setMain()" into oc-mr1-dev am: 67744e4696
am: 5f68027506

Change-Id: Idb415b250c02a45eca76635c4d7ca0118ed612a3

commit | commitdiff | tree

Justin Klaassen [Thu, 10 Aug 2017 06:53:34 +0000 (06:53 +0000)]

Merge "Remove config_demoModePackage resource" into oc-dr1-dev
am: 934a1081fe

Change-Id: I31ce02bfd8c736d8e0d46173759558faf7a6cc2f

commit | commitdiff | tree

Justin Klaassen [Thu, 10 Aug 2017 06:53:33 +0000 (06:53 +0000)]

Merge "Remove config_demoModePackage resource" into oc-dr1-dev
am: 934a1081fe

Change-Id: I147f242ab2132a01c1e02ac00ac5123fa9a0a20a

commit | commitdiff | tree

Shubang [Thu, 10 Aug 2017 06:47:35 +0000 (06:47 +0000)]

Merge "Add permission check before setMain()" into oc-mr1-dev
am: 67744e4696

Change-Id: I26ef67a44b8c041900958bd7a33097c6052c073a

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 06:42:32 +0000 (06:42 +0000)]

Merge "Remove config_demoModePackage resource" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 06:39:31 +0000 (06:39 +0000)]

Merge "Add permission check before setMain()" into oc-mr1-dev

commit | commitdiff | tree

Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:28:25 +0000 (06:28 +0000)]

Merge "Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe97329 am: 1e499641ce" into oc-mr1-dev-plus-aosp
am: 7233f04d61

Change-Id: If76c9900cc44e171bbe4b9b871c9601f313a4cc8

commit | commitdiff | tree

Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:23:44 +0000 (06:23 +0000)]

Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe97329 am: f5174b2af3
am: c750ab6260

Change-Id: Iebad4548e285e14663fcfff79ffbb57cc31b1a54

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 06:18:20 +0000 (06:18 +0000)]

Merge "Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe97329 am: 1e499641ce" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:15:06 +0000 (06:15 +0000)]

Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe97329
am: 1e499641ce

Change-Id: I34189a461ceabae1a74976672ae72da72381a3c2

commit | commitdiff | tree

Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:14:12 +0000 (06:14 +0000)]

Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe97329
am: f5174b2af3

Change-Id: Ifbe766d6925abc86d3a36d6f04ffcbc656d7fbdd

commit | commitdiff | tree

Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:06:04 +0000 (06:06 +0000)]

Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am: 256fe97329

Change-Id: I2938b5aab766f236d351d66e8912cc05091502fc

commit | commitdiff | tree

Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:05:45 +0000 (06:05 +0000)]

Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am: 256fe97329

Change-Id: Ib6b7ea67bc93c889cba63abf24778ad2415b8c03

commit | commitdiff | tree

Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:00:34 +0000 (06:00 +0000)]

Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 05:56:27 +0000 (05:56 +0000)]

Merge "Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 2189999c61" into oc-mr1-dev-plus-aosp
am: 5f9206ef31

Change-Id: Id06d08f01997d4be4ab64ce684cd3b11443b0eca

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 05:53:11 +0000 (05:53 +0000)]

Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 8121e6c162
am: c2fabb2f8e

Change-Id: Ie286d80440bfdb0de87e4f34a45acfdc99998bda

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 05:49:16 +0000 (05:49 +0000)]

Merge "Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 2189999c61" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 05:47:01 +0000 (05:47 +0000)]

Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0
am: 2189999c61

Change-Id: I6736c0d8ed37fb8b4b1f49a93062aa181aba69b0

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 05:44:50 +0000 (05:44 +0000)]

Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0
am: 8121e6c162

Change-Id: I13cb5be728812f1ca96c9516f5c1ffb3276303d2

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 05:38:00 +0000 (05:38 +0000)]

Merge "Add settings and reset operations for demo users" into oc-dr1-dev
am: 88710dead0

Change-Id: I7b3aae902eebd27590e4799408e941ee7761b834

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 05:37:57 +0000 (05:37 +0000)]

Merge "Add settings and reset operations for demo users" into oc-dr1-dev
am: 88710dead0

Change-Id: Id1b8515e9323731f7bacd55d850460f00fc2c651

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 05:28:47 +0000 (05:28 +0000)]

Merge "Add settings and reset operations for demo users" into oc-dr1-dev

commit | commitdiff | tree

Dianne Hackborn [Thu, 10 Aug 2017 04:53:22 +0000 (04:53 +0000)]

Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev am: c75f43c1ab
am: a6a33976a3

Change-Id: I0086f082e8d7b74f64dc9e762048e4f0e9579812

commit | commitdiff | tree

Dianne Hackborn [Thu, 10 Aug 2017 04:43:52 +0000 (04:43 +0000)]

Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev
am: c75f43c1ab

Change-Id: Icf9405de74c4d137b9c8cd0981846a08862ef231

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 04:35:09 +0000 (04:35 +0000)]

Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev

commit | commitdiff | tree

Doris Ling [Thu, 10 Aug 2017 04:01:59 +0000 (04:01 +0000)]

Merge "Add metric constant for settings preference int value change." into oc-mr1-dev am: c91b3bd09c
am: 8d1357e1d5 -s ours

Change-Id: I1cc458110a4c2320d133d00b301ac206fbc78f4a

commit | commitdiff | tree

Doris Ling [Thu, 10 Aug 2017 03:53:57 +0000 (03:53 +0000)]

Merge "Add metric constant for settings preference int value change." into oc-mr1-dev
am: c91b3bd09c

Change-Id: Ibfbcf198fbd7e6a434d5ea34f30cd989e8a81024

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 03:41:06 +0000 (03:41 +0000)]

Merge "Add metric constant for settings preference int value change." into oc-mr1-dev

commit | commitdiff | tree

Kevin Chyn [Thu, 10 Aug 2017 03:32:18 +0000 (03:32 +0000)]

Merge "FingerprintService should release wakelock only if isHeld" into oc-mr1-dev am: c48f414a3c
am: fa4b13dad9

Change-Id: Iffb5890236dadc93f66ef397ecbfbd084bd6d473

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 02:56:03 +0000 (02:56 +0000)]

Merge "Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0 am: e47f682c85" into oc-mr1-dev-plus-aosp
am: 1838cb9f19

Change-Id: I7ca403b2f9cff2d32ebc3292820a2e4291f95478

commit | commitdiff | tree

Kevin Chyn [Thu, 10 Aug 2017 02:55:45 +0000 (02:55 +0000)]

Merge "FingerprintService should release wakelock only if isHeld" into oc-mr1-dev
am: c48f414a3c

Change-Id: Ic42d1b2c81a610708f1dce0b62e16e14adc956ef

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 02:53:26 +0000 (02:53 +0000)]

Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0 am: f3b6768601
am: ff264d07ca

Change-Id: I9b65b7f2e90730895e65b6a8fd76114832458540

commit | commitdiff | tree

Justin Klaassen [Wed, 9 Aug 2017 04:07:24 +0000 (21:07 -0700)]

Remove config_demoModePackage resource

Bug: 62712426
Test: lunch walleye-eng && make -j19
Change-Id: Ifa1080d85222a43871598eaf0fe9813625d9115d

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 02:47:00 +0000 (02:47 +0000)]

Merge "FingerprintService should release wakelock only if isHeld" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 02:37:20 +0000 (02:37 +0000)]

Merge "Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0 am: e47f682c85" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 02:35:15 +0000 (02:35 +0000)]

Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0
am: e47f682c85

Change-Id: I7840cc30da45e07e5211cee433ab7bb17ede5149

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 02:32:47 +0000 (02:32 +0000)]

Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0
am: f3b6768601

Change-Id: I77314a70753675d94c717d62abb40b7d2b42ac11

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 02:25:10 +0000 (02:25 +0000)]

Merge "Don't lock down system user in demo mode" into oc-dr1-dev
am: 4f540fe8d0

Change-Id: I1d86ea5b69fe9a8bddb29d3e8483cc6a34b3b689

commit | commitdiff | tree

Christine Franks [Thu, 10 Aug 2017 02:25:09 +0000 (02:25 +0000)]

Merge "Don't lock down system user in demo mode" into oc-dr1-dev
am: 4f540fe8d0

Change-Id: Ib4670a8e4685a9f9bd933ccba9878bd59ccb6059

commit | commitdiff | tree

Christine Franks [Mon, 7 Aug 2017 21:28:35 +0000 (14:28 -0700)]

Add settings and reset operations for demo users

- Allow Global settings to be set in demo mode
- Allow Secure settings to be set by demo users
- Allow fully enabling apps for demo users
- Send enable broadcast as foreground broadcast

Bug: 62712426
Test: runtest -c \
com.android.server.devicepolicy.DevicePolicyManagerTest \
frameworks-services

Change-Id: Icd5d1eda12aa6b97bd4770713710a982bb0fc8e5

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 02:17:48 +0000 (02:17 +0000)]

Merge "Don't lock down system user in demo mode" into oc-dr1-dev

commit | commitdiff | tree

Phil Weaver [Thu, 10 Aug 2017 01:41:35 +0000 (01:41 +0000)]

Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev am: a4b5e0893f am: 68cf0f4df8
am: dc8deb9f5c

Change-Id: I26ec367f985a1a025150ea088ff35b2df522b076

commit | commitdiff | tree

Takashi Furukawa [Thu, 10 Aug 2017 01:39:11 +0000 (01:39 +0000)]

Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev am: b9a56a4af7 -s ours am: be8e7f7e57 -s ours
am: 943393445d -s ours

Change-Id: Ib5af825b9b9fa96b7e91b0d3b6c8ed9161fbc404

commit | commitdiff | tree

Phil Weaver [Thu, 10 Aug 2017 01:35:52 +0000 (01:35 +0000)]

Merge "Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev am: a4b5e0893f" into oc-mr1-dev am: 794d663e42
am: 03023d28a3

Change-Id: Iddf9666cd9f61cc54e006118cdaf51c70ce35d54

commit | commitdiff | tree

Makoto Onuki [Thu, 10 Aug 2017 01:33:09 +0000 (01:33 +0000)]

Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev am: 75590ffa84
am: bb4f580494

Change-Id: I204695ecd43fe86eb6837098556aa1e7c0db354f

commit | commitdiff | tree

Vinay Kalia [Thu, 10 Aug 2017 01:29:27 +0000 (01:29 +0000)]

Merge "Fix BLE scan leaks" into oc-mr1-dev am: 9beb5e4526
am: ffbf28e5c5

Change-Id: I0cd543a31a84cb0ff2971cda06481ff35a5e6459

commit | commitdiff | tree

Takashi Furukawa [Thu, 10 Aug 2017 01:27:28 +0000 (01:27 +0000)]

Merge "Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev am: b9a56a4af7 -s ours am: 246d02d606 -s ours" into oc-mr1-dev-plus-aosp
am: 90572b9ca6 -s ours

Change-Id: I969d76ddfe7267aa0eb36852cc4bb0ec19e3c5cb

commit | commitdiff | tree

TreeHugger Robot [Thu, 10 Aug 2017 01:13:41 +0000 (01:13 +0000)]

Merge "TTS: Fix a race condition between enqueueSpeechItem and stopForApp."

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 01:13:11 +0000 (01:13 +0000)]

Merge "Merge "Merge "Revert multi-package APK flag to off." into oc-mr1-dev am: 478f94ba7f" into oc-mr1-dev-plus-aosp am: b58cc177d2"

commit | commitdiff | tree

Garry Boyer [Thu, 10 Aug 2017 01:10:20 +0000 (01:10 +0000)]

Merge "Merge "Revert multi-package APK flag to off." into oc-mr1-dev am: 478f94ba7f" into oc-mr1-dev-plus-aosp
am: b58cc177d2

Change-Id: I2b22283307941ba39cc36534dc134b7b59d82624

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 01:09:45 +0000 (01:09 +0000)]

Merge "Merge "Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev am: 7afbe54e0d" into oc-dr1-dev-plus-aosp am: 7168ea4883 am: b38adeadfd"

commit | commitdiff | tree

Andrii Kulian [Thu, 10 Aug 2017 01:07:17 +0000 (01:07 +0000)]

Merge "Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev am: 7afbe54e0d" into oc-dr1-dev-plus-aosp am: 7168ea4883
am: b38adeadfd

Change-Id: I023b59af2fd71170ed5c4bfffe0c38f7134e0540

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 01:06:15 +0000 (01:06 +0000)]

Merge "Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev am: 7afbe54e0d am: 2d6fe2f5af am: 2d2db2e015"

commit | commitdiff | tree

Andrii Kulian [Thu, 10 Aug 2017 01:03:43 +0000 (01:03 +0000)]

Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev am: 7afbe54e0d am: 2d6fe2f5af
am: 2d2db2e015

Change-Id: Ia72be3f418109435b24977e7f27174d5f8ec8baf

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 01:01:50 +0000 (01:01 +0000)]

Merge "Merge "Merge "Add future consideration for USB rndis notification handling" am: 4263a5ed58 am: 6ff0730158 am: ff14dd1274 -s ours" into oc-dr1-dev-plus-aosp am: cd7c555aa9 -s ours am: 6a78a3fdaa -s ours"

commit | commitdiff | tree

Erik Kline [Thu, 10 Aug 2017 00:58:32 +0000 (00:58 +0000)]

Merge "Merge "Add future consideration for USB rndis notification handling" am: 4263a5ed58 am: 6ff0730158 am: ff14dd1274 -s ours" into oc-dr1-dev-plus-aosp am: cd7c555aa9 -s ours
am: 6a78a3fdaa -s ours

Change-Id: I739338fe5c9231e091899c4659f9ba3c223fc4a6

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 00:57:37 +0000 (00:57 +0000)]

Merge "Merge "Support copying from index8 into another index8." into oc-dr1-dev am: f112fde96d am: 519d4f4a05 -s ours am: 8c3120a007 -s ours"

commit | commitdiff | tree

Derek Sollenberger [Thu, 10 Aug 2017 00:55:02 +0000 (00:55 +0000)]

Merge "Support copying from index8 into another index8." into oc-dr1-dev am: f112fde96d am: 519d4f4a05 -s ours
am: 8c3120a007 -s ours

Change-Id: I9e68701f58d12c0c074af9faf4a0ff8b745c6d65

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 00:54:10 +0000 (00:54 +0000)]

Merge "Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev am: 54233f96d7 am: c7b3933515 am: 0f09fdf043"

commit | commitdiff | tree

Rebecca Silberstein [Thu, 10 Aug 2017 00:52:05 +0000 (00:52 +0000)]

Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev am: 54233f96d7 am: c7b3933515
am: 0f09fdf043

Change-Id: I7e2058a727eea0b60603a91ee53a6c47d42bdf35

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 00:51:47 +0000 (00:51 +0000)]

Merge "Merge "Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev am: 75384f617d am: 241100cb87" into oc-mr1-dev-plus-aosp am: e8364ac0b8"

commit | commitdiff | tree

Paul Mclean [Thu, 10 Aug 2017 00:49:42 +0000 (00:49 +0000)]

Merge "Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev am: 75384f617d am: 241100cb87" into oc-mr1-dev-plus-aosp
am: e8364ac0b8

Change-Id: I66695d18882bd410b1e14c6ce8e82650a6ecf04d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 00:49:10 +0000 (00:49 +0000)]

Merge "Merge "Merge "Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b am: 3e832cf58e" into oc-dr1-dev-plus-aosp am: 411e110abb" into oc-mr1-dev-plus-aosp am: aa50022b57"

commit | commitdiff | tree

Vinay Kalia [Thu, 10 Aug 2017 00:46:59 +0000 (00:46 +0000)]

Merge "Merge "Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b am: 3e832cf58e" into oc-dr1-dev-plus-aosp am: 411e110abb" into oc-mr1-dev-plus-aosp
am: aa50022b57

Change-Id: I5b79eef5570666866f1ecf56dd16942f9928b5cd

commit | commitdiff | tree

Phil Weaver [Thu, 10 Aug 2017 00:45:55 +0000 (00:45 +0000)]

Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev am: a4b5e0893f
am: 68cf0f4df8

Change-Id: I07557639eba9db23ca2a5f3fcd3faef2a7038e3b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 00:45:08 +0000 (00:45 +0000)]

Merge "Merge "Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b am: 1199972de1 am: e9f727dd75" into oc-mr1-dev-plus-aosp am: b03df80312"

commit | commitdiff | tree

Takashi Furukawa [Thu, 10 Aug 2017 00:42:21 +0000 (00:42 +0000)]

Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev am: b9a56a4af7 -s ours
am: be8e7f7e57 -s ours

Change-Id: I3039400b3469a8a168f27e805ca4f70f31569985

commit | commitdiff | tree

Vinay Kalia [Thu, 10 Aug 2017 00:42:05 +0000 (00:42 +0000)]

Merge "Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b am: 1199972de1 am: e9f727dd75" into oc-mr1-dev-plus-aosp
am: b03df80312

Change-Id: I42b3f0570aa5b6f6097f0449dd2d17621f4ecf0f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 Aug 2017 00:41:17 +0000 (00:41 +0000)]

Merge "Merge "Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev am: f89e462bc7 am: bbd80c9f73" into oc-mr1-dev-plus-aosp am: 913a06bfe3"

commit | commitdiff | tree

Selim Cinek [Thu, 10 Aug 2017 00:39:26 +0000 (00:39 +0000)]

Merge "Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev am: f89e462bc7 am: bbd80c9f73" into oc-mr1-dev-plus-aosp
am: 913a06bfe3

Change-Id: I315f9b172363495012b6f9e2522086ec56f4f123