OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
Kevin Chyn [Fri, 11 Aug 2017 01:08:09 +0000 (01:08 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
am: cad75e2437

Change-Id: Iff57ca1a3b59517218085239e23c68a4315230e1

7 years agoMerge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 00:59:08 +0000 (00:59 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev

7 years agoMerge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 11 Aug 2017 00:40:18 +0000 (00:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp

7 years agoMerge "Add method that checks the Binder status of ImsConfig" am: 6ffc855e8d am:...
Brad Ebinger [Thu, 10 Aug 2017 23:24:43 +0000 (23:24 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am: 6ffc855e8d am: bc13df8ce8
am: 3fff521160  -s ours

Change-Id: I0bf3f2a70920df6c36741ea78220e235d6ed769a

7 years agoMerge "Add method that checks the Binder status of ImsConfig" am: 6ffc855e8d
Brad Ebinger [Thu, 10 Aug 2017 23:11:44 +0000 (23:11 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am: 6ffc855e8d
am: bc13df8ce8

Change-Id: I7d73cade826c47b902c875b9543cb50fb19631d9

7 years agoMerge "Add method that checks the Binder status of ImsConfig"
Brad Ebinger [Thu, 10 Aug 2017 23:02:56 +0000 (23:02 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
am: 6ffc855e8d

Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64

7 years agoScopedUtfChars: use proper nativehelper headers
Steven Moreland [Thu, 10 Aug 2017 22:55:12 +0000 (15:55 -0700)]
ScopedUtfChars: use proper nativehelper headers

libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: modules using ScopedUtfChars find headers
Bug: 63762847
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65

7 years agoMerge "Add method that checks the Binder status of ImsConfig"
Brad Ebinger [Thu, 10 Aug 2017 22:50:45 +0000 (22:50 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"

7 years agoMerge "Stop focusing views before layout." into oc-dr1-dev
Phil Weaver [Thu, 10 Aug 2017 22:44:47 +0000 (22:44 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
am: a5dab05b61

Change-Id: If2bbb15d9609260272d74e3fc8c7de7c9789fa2d

7 years agoMerge "Stop focusing views before layout." into oc-dr1-dev
Phil Weaver [Thu, 10 Aug 2017 22:34:03 +0000 (22:34 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev

7 years agoFix CTS, Remove CONFIGURE_ASSIST_GESTURE permission
Kevin Chyn [Thu, 10 Aug 2017 18:40:37 +0000 (11:40 -0700)]
Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission

Test: make -j56 cts
run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>

Fixes: 64560640

Change-Id: Ic807028567da9a4f3f108121d3e36358a513cf04

7 years agoStop focusing views before layout.
Phil Weaver [Thu, 10 Aug 2017 19:31:34 +0000 (12:31 -0700)]
Stop focusing views before layout.

Rolls back one line of ag/2257919.

Bug: 63811145
Test: TalkBack no longer reads the page backwards in:
Settings > System > Reset > Factory data reset
Settings > Connected devices > Android Beam

Change-Id: I6b04e64cd650ebda193da4a54bf0721bd256820c

7 years agoMerge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
Ian Pedowitz [Thu, 10 Aug 2017 17:46:32 +0000 (17:46 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
am: 0716c8e60e

Change-Id: I1016361cd17be52a02a21fb4d1da791c0247be1d

7 years agoMerge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a
Amit Mahajan [Thu, 10 Aug 2017 17:34:07 +0000 (17:34 +0000)]
Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a
am: 1cdd44bd9d

Change-Id: I8ed8d16910331f09a0e44e908e7ac89e990af141

7 years agoMerge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 17:32:47 +0000 (17:32 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev

7 years agoMerge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7
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

7 years agoMerge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d
Amit Mahajan [Thu, 10 Aug 2017 16:24:56 +0000 (16:24 +0000)]
Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d
am: cfbd4a354a

Change-Id: Ic5e764bd0d5ca14498c4b36dd1f2bd9d8ba05544

7 years agoMerge "Get isim card data use subId." am: 854edcff16
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

7 years agoMerge "The method of parseEfSpdi does not match TS24008."
Amit Mahajan [Thu, 10 Aug 2017 16:12:19 +0000 (16:12 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
am: cd03d0db9d

Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33

7 years agoMerge "Get isim card data use subId."
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

7 years agoMerge "The method of parseEfSpdi does not match TS24008."
Amit Mahajan [Thu, 10 Aug 2017 15:59:43 +0000 (15:59 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."

7 years agoMerge "Get isim card data use subId."
Amit Mahajan [Thu, 10 Aug 2017 15:57:38 +0000 (15:57 +0000)]
Merge "Get isim card data use subId."

7 years agoRevert "Initial support for proposed android.net.lowpan"
Ian Pedowitz [Thu, 10 Aug 2017 02:15:31 +0000 (19:15 -0700)]
Revert "Initial support for proposed android.net.lowpan"

This reverts commit 4e0c2195dd999859f4e79cec1884326fb52a5916.

Fixes: 64111427
Test: Grabbed OC CTS binaries
Test: Extracted android-cts.zip  and from android-cts/tools directory launched ./cts-tradefed
Test: On the DUT (running build which has this CL cherrypicked), ran the below (will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: Note, while b/64111427 is fixed, this uncovered b/64560640

Change-Id: I1d2132678281a917f03c69d5ead1d28313d7f46d
Merged-In: Icab67ba2c40bc02968e3f8ed2da5a4a3be6cf77f

7 years agoMerge "Remove config_demoModePackage resource" into oc-dr1-dev
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

7 years agoMerge "Remove config_demoModePackage resource" into oc-dr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 06:42:32 +0000 (06:42 +0000)]
Merge "Remove config_demoModePackage resource" into oc-dr1-dev

7 years agoMerge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
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

7 years agoMerge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
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

7 years agoMerge "Add settings and reset operations for demo users" into oc-dr1-dev
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

7 years agoMerge "Add settings and reset operations for demo users" into oc-dr1-dev
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

7 years agoRemove config_demoModePackage resource
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

7 years agoMerge "Don't lock down system user in demo mode" into oc-dr1-dev
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

7 years agoAdd settings and reset operations for demo users
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

7 years agoMerge "Don't lock down system user in demo mode" into oc-dr1-dev
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

7 years agoMerge "Fix source for PiP hover accessibility events" into oc-dr1-dev
Phil Weaver [Thu, 10 Aug 2017 00:19:07 +0000 (00:19 +0000)]
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
am: a4b5e0893f

Change-Id: I125f80e800d04e7406fcd380bce2666b5b9e5a3f

7 years agoMerge "Fix source for PiP hover accessibility events" into oc-dr1-dev
Phil Weaver [Thu, 10 Aug 2017 00:13:04 +0000 (00:13 +0000)]
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev

7 years agoAdd method that checks the Binder status of ImsConfig
Brad Ebinger [Thu, 22 Jun 2017 18:39:11 +0000 (11:39 -0700)]
Add method that checks the Binder status of ImsConfig

Adds a method to check whether or not the ImsConfig
binder has died.

Bug: 62723694
Test: maual, follow bug procedure
Merged-In: I0ecd6a43d4375d3ac4d7d54b3d437832c0221f05
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3

7 years agoMerge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev
Takashi Furukawa [Wed, 9 Aug 2017 23:27:40 +0000 (23:27 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev
am: b9a56a4af7  -s ours

Change-Id: I29dae91c1eea2fbc1619fea180be942c9ef3bc35

7 years agoMerge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 23:12:57 +0000 (23:12 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev

7 years agoMerge "Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1...
Android Build Merger (Role) [Wed, 9 Aug 2017 22:56:52 +0000 (22:56 +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

7 years agoMerge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev
Andrii Kulian [Wed, 9 Aug 2017 22:55:34 +0000 (22:55 +0000)]
Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev
am: 7afbe54e0d

Change-Id: I889182c4d9d03f369df5bbc45b8d8bfe95a1feea

7 years agoMerge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev
Andrii Kulian [Wed, 9 Aug 2017 22:49:35 +0000 (22:49 +0000)]
Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev
am: 7afbe54e0d

Change-Id: Ifa696e511e687eb7da4896dbb78aeeeb309e709b

7 years agoMerge "Merge "Add future consideration for USB rndis notification handling" am: 4263a...
Android Build Merger (Role) [Wed, 9 Aug 2017 22:44:05 +0000 (22:44 +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

7 years agoMerge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev
Andrii Kulian [Wed, 9 Aug 2017 22:40:59 +0000 (22:40 +0000)]
Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev

7 years agoMerge "Add future consideration for USB rndis notification handling" am: 4263a5ed58...
Erik Kline [Wed, 9 Aug 2017 22:40:45 +0000 (22:40 +0000)]
Merge "Add future consideration for USB rndis notification handling" am: 4263a5ed58 am: 6ff0730158
am: ff14dd1274  -s ours

Change-Id: Id2afbac975f5fb5d232fbf57226f575c386379ec

7 years agoMerge "Support copying from index8 into another index8." into oc-dr1-dev
Derek Sollenberger [Wed, 9 Aug 2017 22:40:44 +0000 (22:40 +0000)]
Merge "Support copying from index8 into another index8." into oc-dr1-dev
am: f112fde96d

Change-Id: I3b913c4b139d4b64cec3f0564f5ff357203c299d

7 years agoMerge "Add future consideration for USB rndis notification handling" am: 4263a5ed58
Erik Kline [Wed, 9 Aug 2017 22:34:49 +0000 (22:34 +0000)]
Merge "Add future consideration for USB rndis notification handling" am: 4263a5ed58
am: 6ff0730158

Change-Id: I2e755679bfea1cdb86a645948b32820c2d8dbf50

7 years agoMerge "Support copying from index8 into another index8." into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 22:33:34 +0000 (22:33 +0000)]
Merge "Support copying from index8 into another index8." into oc-dr1-dev

7 years agoMerge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev
Rebecca Silberstein [Wed, 9 Aug 2017 22:32:59 +0000 (22:32 +0000)]
Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev
am: 54233f96d7

Change-Id: I3ec7c57772428cc24d580e422a64ad82d973f29b

7 years agoMerge "Add future consideration for USB rndis notification handling"
Erik Kline [Wed, 9 Aug 2017 22:23:24 +0000 (22:23 +0000)]
Merge "Add future consideration for USB rndis notification handling"
am: 4263a5ed58

Change-Id: I7dd347447434214ecf3e5f9f8e2a603cd097f6c6

7 years agoMerge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 22:23:14 +0000 (22:23 +0000)]
Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev

7 years agoMerge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev
Paul Mclean [Wed, 9 Aug 2017 22:13:37 +0000 (22:13 +0000)]
Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev
am: 75384f617d

Change-Id: I3a77ec0fe45d48715b11c27db9c1a6c2d7590c7f

7 years agoMerge "Add future consideration for USB rndis notification handling"
Treehugger Robot [Wed, 9 Aug 2017 22:10:19 +0000 (22:10 +0000)]
Merge "Add future consideration for USB rndis notification handling"

7 years agoMerge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev
Paul Mclean [Wed, 9 Aug 2017 21:59:55 +0000 (21:59 +0000)]
Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev

7 years agoMerge "Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b am: 3e832cf58e" into...
Android Build Merger (Role) [Wed, 9 Aug 2017 21:27:14 +0000 (21:27 +0000)]
Merge "Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b am: 3e832cf58e" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fix BLE scan leaks" into oc-dev am: 6e749c392b
Vinay Kalia [Wed, 9 Aug 2017 21:24:23 +0000 (21:24 +0000)]
Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b
am: 3e832cf58e

Change-Id: I7285e25ca98306dac732768df556e6371591ed27

7 years agoMerge "Fix BLE scan leaks" into oc-dev am: 6e749c392b
Vinay Kalia [Wed, 9 Aug 2017 21:23:04 +0000 (21:23 +0000)]
Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b
am: 1199972de1

Change-Id: I10bb6b6b1d16662bbc75ac6f7494f4622dd19e35

7 years agoMerge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
Selim Cinek [Wed, 9 Aug 2017 21:16:27 +0000 (21:16 +0000)]
Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
am: f89e462bc7

Change-Id: I0dcaf830f0d65171b4a114e299793d68a4da6e40

7 years agoMerge "Fix BLE scan leaks" into oc-dev
Vinay Kalia [Wed, 9 Aug 2017 21:11:53 +0000 (21:11 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
am: 6e749c392b

Change-Id: I35705a81a45d2c7fd48f021a5e0e93e1709c6876

7 years agoMerge "Fix BLE scan leaks" into oc-dev
Vinay Kalia [Wed, 9 Aug 2017 21:10:53 +0000 (21:10 +0000)]
Merge "Fix BLE scan leaks" into oc-dev
am: 6e749c392b

Change-Id: Id43b33865e287ec19a2ae4c56815d12bb402ab09

7 years agoMerge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 21:03:15 +0000 (21:03 +0000)]
Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev

7 years agoMerge "Fix BLE scan leaks" into oc-dev
Vinay Kalia [Wed, 9 Aug 2017 21:02:32 +0000 (21:02 +0000)]
Merge "Fix BLE scan leaks" into oc-dev

7 years agoAdd future consideration for USB rndis notification handling
Erik Kline [Wed, 9 Aug 2017 03:53:46 +0000 (20:53 -0700)]
Add future consideration for USB rndis notification handling

Test: builds
Bug: 63970368
Merged-In: If6afe1cdce9995251ba53fbf30acf9d6e31f9433
Merged-In: I78e280c2299ec3f4d97138ca648f9629ba82e87f
Merged-In: I891cd82b0e8af1049fa3ab9b0a95a2a9ab2e0b26
Change-Id: Ic9ca133a44123f281bd4cfeac57d426346c2b76d
(cherry picked from commit 1290568110405fd45f13824e67beeb98c30400a4)

7 years agoMerge "Make rounded corners handle color inversion" into oc-dr1-dev
Jason Monk [Wed, 9 Aug 2017 20:45:45 +0000 (20:45 +0000)]
Merge "Make rounded corners handle color inversion" into oc-dr1-dev
am: ca91e6cecd

Change-Id: I6a5a75c63bcae98aa928667672dd52b631e85d8a

7 years agoMerge "Make rounded corners handle color inversion" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 20:38:49 +0000 (20:38 +0000)]
Merge "Make rounded corners handle color inversion" into oc-dr1-dev

7 years agoMerge "Bring home to front behind assistant stack when needed." into oc-dr1-dev
Bryce Lee [Wed, 9 Aug 2017 20:34:26 +0000 (20:34 +0000)]
Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev
am: 0a3684eb45

Change-Id: I9df47887b12b83b29b453d8d61e10b7f802440a8

7 years agoMerge "Bring home to front behind assistant stack when needed." into oc-dr1-dev
Bryce Lee [Wed, 9 Aug 2017 20:21:03 +0000 (20:21 +0000)]
Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev

7 years agoMerge "Allow SMS and calling for demo users" into oc-dr1-dev
Christine Franks [Wed, 9 Aug 2017 20:15:28 +0000 (20:15 +0000)]
Merge "Allow SMS and calling for demo users" into oc-dr1-dev
am: 4387d3a523

Change-Id: I78128f2a9acdbbd2ccd10f2ee12cbe100000fb1a

7 years agoMerge "Allow SMS and calling for demo users" into oc-dr1-dev
Christine Franks [Wed, 9 Aug 2017 20:06:35 +0000 (20:06 +0000)]
Merge "Allow SMS and calling for demo users" into oc-dr1-dev

7 years agoMerge "Merge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e am...
Android Build Merger (Role) [Wed, 9 Aug 2017 19:45:40 +0000 (19:45 +0000)]
Merge "Merge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e am: 3ee6eed62f am: 272a45e493" into oc-dr1-dev-plus-aosp

7 years agoMerge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e am: 3ee6eed62f
Jakub Pawlowski [Wed, 9 Aug 2017 19:42:07 +0000 (19:42 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e am: 3ee6eed62f
am: 272a45e493

Change-Id: I1f4face025c38e3ff9a4f1c90239c40d798df7e8

7 years agoMerge "Add future consideration for USB rndis notification handling" into oc-dr1-dev
Erik Kline [Wed, 9 Aug 2017 19:40:54 +0000 (19:40 +0000)]
Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev
am: 15fbf9786d

Change-Id: If6afe1cdce9995251ba53fbf30acf9d6e31f9433

7 years agoMerge "Fix race condition in binder thread" into oc-dr1-dev
Lucas Dupin [Wed, 9 Aug 2017 19:36:39 +0000 (19:36 +0000)]
Merge "Fix race condition in binder thread" into oc-dr1-dev
am: 33e014b9bc

Change-Id: I038fbe271d82a3e192eb95ea073fb482f27c65b6

7 years agoMerge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e
Jakub Pawlowski [Wed, 9 Aug 2017 19:31:54 +0000 (19:31 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e
am: 3ee6eed62f

Change-Id: If599de8cb4b5dc5531a5ce895b60c712108c5d3b

7 years agoMerge "Always note the state of RNDIS from USB broadcasts." am: d27af8af62 am: 47f2cf5144
Erik Kline [Wed, 9 Aug 2017 19:31:25 +0000 (19:31 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." am: d27af8af62 am: 47f2cf5144
am: 89384db942  -s ours

Change-Id: Ia37b7c11c786832e3f2685a363fafd575d6e6b30

7 years agoMerge "Add future consideration for USB rndis notification handling" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:28:49 +0000 (19:28 +0000)]
Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev

7 years agoMerge "Enforce call log length limit on a per PhoneAccount basis." am: 647b520a00...
Tyler Gunn [Wed, 9 Aug 2017 19:28:46 +0000 (19:28 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis." am: 647b520a00 am: 8adf430f30
am: c1e365f1c3  -s ours

Change-Id: Ibfb0f0789f78e1aed7c4a2512cb90fc477b66593

7 years agoMerge "Fix race condition in binder thread" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:24:16 +0000 (19:24 +0000)]
Merge "Fix race condition in binder thread" into oc-dr1-dev

7 years agoMerge "Always note the state of RNDIS from USB broadcasts." am: d27af8af62
Erik Kline [Wed, 9 Aug 2017 19:22:24 +0000 (19:22 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." am: d27af8af62
am: 47f2cf5144

Change-Id: I5d9f5cd7942547d4b9c11a5b3cc56799c92cd62a

7 years agoMerge "Enforce call log length limit on a per PhoneAccount basis." am: 647b520a00
Tyler Gunn [Wed, 9 Aug 2017 19:20:29 +0000 (19:20 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis." am: 647b520a00
am: 8adf430f30

Change-Id: I2a8dc4f0ba5c002b184d7192ed86e7c7fe1a705d

7 years agoMerge "Bluetooth: AdvertiseData parceling simplification"
Jakub Pawlowski [Wed, 9 Aug 2017 19:15:08 +0000 (19:15 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification"
am: c7da241b3e

Change-Id: Iaf58ace037810d11fcb29c2696c79664d601e87c

7 years agoMerge "Always note the state of RNDIS from USB broadcasts."
Erik Kline [Wed, 9 Aug 2017 19:12:23 +0000 (19:12 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts."
am: d27af8af62

Change-Id: I33633e064a329b9094b0d279622febab6266e5cb

7 years agoUpdate isWiredHeadsetOn() to support USB headsets.
Paul McLean [Fri, 4 Aug 2017 17:12:19 +0000 (11:12 -0600)]
Update isWiredHeadsetOn() to support USB headsets.

Bug: 64250808
Test: Manual from an App (UsbDescriptors app)
Change-Id: Ic979636025e871d69853a7460befce4e1b1a6ed8

7 years agoMerge "Enforce call log length limit on a per PhoneAccount basis."
Tyler Gunn [Wed, 9 Aug 2017 19:03:32 +0000 (19:03 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis."
am: 647b520a00

Change-Id: I8962fc326d0e2888656c2764e94131c6eebd1471

7 years agoMerge changes I52152223,I49db5cab into oc-dr1-dev
Winson Chung [Wed, 9 Aug 2017 19:01:53 +0000 (19:01 +0000)]
Merge changes I52152223,I49db5cab into oc-dr1-dev
am: fc596b1cf6

Change-Id: I63cbca0986438b350cecf0f2c1c5b0ec2f88cebf

7 years agoMerge "Bluetooth: AdvertiseData parceling simplification"
Jakub Pawlowski [Wed, 9 Aug 2017 18:56:57 +0000 (18:56 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification"

7 years agoMerge "Always note the state of RNDIS from USB broadcasts."
Treehugger Robot [Wed, 9 Aug 2017 18:54:32 +0000 (18:54 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts."

7 years agoMerge changes I52152223,I49db5cab into oc-dr1-dev
Winson Chung [Wed, 9 Aug 2017 18:52:42 +0000 (18:52 +0000)]
Merge changes I52152223,I49db5cab into oc-dr1-dev

* changes:
  Ensure that we register the media session listener for the current user.
  Fix issue with PiP callbacks not being handled for secondary users.

7 years agoMerge changes from topic 'am-aaff2463b12d45fc8aad2131d8ac7b9f' into oc-dr1-dev-plus...
Android Build Merger (Role) [Wed, 9 Aug 2017 18:45:31 +0000 (18:45 +0000)]
Merge changes from topic 'am-aaff2463b12d45fc8aad2131d8ac7b9f' into oc-dr1-dev-plus-aosp

* changes:
  Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565  -s ours am: 4542686e42 am: c915b7f703 am: ad8d3240d3
  Fix Wakelock underlock in GnssLocationProvider. am: 2ed0166808  -s ours am: 5d60709dc3 am: 17669d31df am: 747bce27e8

7 years agoMerge "Enforce call log length limit on a per PhoneAccount basis."
Treehugger Robot [Wed, 9 Aug 2017 18:44:08 +0000 (18:44 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis."

7 years agoCatch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565...
Zheng Zhang [Wed, 9 Aug 2017 18:42:36 +0000 (18:42 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565  -s ours am: 4542686e42 am: c915b7f703
am: ad8d3240d3

Change-Id: I09451d57cd7b1d9e1f7cd5eed031bb0b5c7fbd62

7 years agoCatch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565...
Zheng Zhang [Wed, 9 Aug 2017 18:41:57 +0000 (18:41 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565  -s ours am: 4542686e42 am: c915b7f703
am: 54ad8c1f15

Change-Id: I391ad68b533dd54a4268957569171d99a8b1d9ea

7 years agoFix Wakelock underlock in GnssLocationProvider. am: 2ed0166808 -s ours am: 5d60709dc...
Wei Wang [Wed, 9 Aug 2017 18:41:44 +0000 (18:41 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am: 2ed0166808  -s ours am: 5d60709dc3 am: 17669d31df
am: 747bce27e8

Change-Id: I66e853c551f601dfa10c52dd8d37b89fdc2e06e8

7 years agoSupport copying from index8 into another index8.
Derek Sollenberger [Fri, 4 Aug 2017 18:13:57 +0000 (14:13 -0400)]
Support copying from index8 into another index8.

Both bitmap's must share the same color table as we essentially
memcopy the pixel data between the buffers.

Bug: 64112829
Test: CtsGraphicsTestCases
Merged-In: I317e3a814dbd102925fe412d2e19111b0af3af38
Change-Id: I5d99627fe7dd0639bb47a2eb8790510beebe6c6f

7 years agoFix Wakelock underlock in GnssLocationProvider. am: 2ed0166808 -s ours am: 5d60709dc...
Wei Wang [Wed, 9 Aug 2017 18:40:49 +0000 (18:40 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am: 2ed0166808  -s ours am: 5d60709dc3 am: 17669d31df
am: 5043ac7af3

Change-Id: Ibc405aa8a7e50ec26933c2752abc138eaf46b349

7 years agoMerge "Add UserQuotaTracker to IpSecService" am: a0c97b3ddb am: 3546a5ef92
nharold [Wed, 9 Aug 2017 18:36:13 +0000 (18:36 +0000)]
Merge "Add UserQuotaTracker to IpSecService" am: a0c97b3ddb am: 3546a5ef92
am: 31e299220a

Change-Id: Icc10cf54879e8f5b103392418edc1947593a8b39

7 years agoFix source for PiP hover accessibility events
Phil Weaver [Wed, 9 Aug 2017 18:28:41 +0000 (11:28 -0700)]
Fix source for PiP hover accessibility events

The events were ending up not important for a11y and
with invalid window ids, which prevented TalkBack from
seeing them properly.

Bug: 64428961
Test: Ran YouTube in PiP, now able to select it.
Change-Id: I38ccbf5f2f35ffda255b84f229e98ca23e6b11aa

7 years agoMerge "Prevent data usage dialog from being displayed again" am: 48e8091eda am: abff7...
Jason Monk [Wed, 9 Aug 2017 18:24:25 +0000 (18:24 +0000)]
Merge "Prevent data usage dialog from being displayed again" am: 48e8091eda am: abff77e4aa
am: 0119a09bdf

Change-Id: Ia84c713c1cd71d65981642ad6411192be3955445

7 years agoCatch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565...
Zheng Zhang [Wed, 9 Aug 2017 18:24:15 +0000 (18:24 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565  -s ours am: 4542686e42
am: c915b7f703

Change-Id: If08c8029ad5054f947ada0c5f4923f62761bf47c

7 years agoCatch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565...
Zheng Zhang [Wed, 9 Aug 2017 18:24:07 +0000 (18:24 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565  -s ours am: 4542686e42
am: c915b7f703

Change-Id: Ie956267aa3c50b3ade0022347a898660e40409f3

7 years agoFix Wakelock underlock in GnssLocationProvider. am: 2ed0166808 -s ours am: 5d60709dc3
Wei Wang [Wed, 9 Aug 2017 18:23:00 +0000 (18:23 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am: 2ed0166808  -s ours am: 5d60709dc3
am: 17669d31df

Change-Id: I7e5b94c6adf57ff19c64fe508f7f3cc6d6a9c1c7