OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Merge "Add concept of implicitly exposed components" into oc-dev am: 0a4b7f5a8...
Android Build Merger (Role) [Tue, 25 Apr 2017 23:58:02 +0000 (23:58 +0000)]
Merge "Merge "Add concept of implicitly exposed components" into oc-dev am: 0a4b7f5a86" into oc-dev-plus-aosp

7 years agoMerge "Add concept of implicitly exposed components" into oc-dev
Todd Kennedy [Tue, 25 Apr 2017 23:55:55 +0000 (23:55 +0000)]
Merge "Add concept of implicitly exposed components" into oc-dev
am: 0a4b7f5a86

Change-Id: Ib56132241de893f7afb33c8f242f342326da1dd7

7 years agoMerge "Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev am...
Android Build Merger (Role) [Tue, 25 Apr 2017 23:55:22 +0000 (23:55 +0000)]
Merge "Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev am: e44e9e94da" into oc-dev-plus-aosp

7 years agoMerge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev
Wale Ogunwale [Tue, 25 Apr 2017 23:53:36 +0000 (23:53 +0000)]
Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev
am: e44e9e94da

Change-Id: Ief515a2fb39bf69f456486e9413d0beee5f89eb5

7 years agoMerge "Create Public API which exposes if the device is in a state where simultaneous...
Pankaj Kanwar [Tue, 25 Apr 2017 23:51:52 +0000 (23:51 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible." am: 3a8ad81ab4 am: a086824e5a
am: 6f048ffab5  -s ours

Change-Id: I422b06ab7d7db5669b5aa6ae42aaadaeb8c9bb62

7 years agoMerge "Add concept of implicitly exposed components" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 23:50:17 +0000 (23:50 +0000)]
Merge "Add concept of implicitly exposed components" into oc-dev

7 years agoMerge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev
Wale Ogunwale [Tue, 25 Apr 2017 23:47:53 +0000 (23:47 +0000)]
Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev

7 years agoMerge "Create Public API which exposes if the device is in a state where simultaneous...
Pankaj Kanwar [Tue, 25 Apr 2017 23:46:17 +0000 (23:46 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible." am: 3a8ad81ab4
am: a086824e5a

Change-Id: I2a918e4d56cbb6147c95737d7f6b156903dc5ec5

7 years agoRemove @Presubmit annotation from SettingBackupTest
Wale Ogunwale [Tue, 25 Apr 2017 23:43:53 +0000 (16:43 -0700)]
Remove @Presubmit annotation from SettingBackupTest

Can be added back once the tests are fixed.

Bug: 37684646
Bug: 37682538
Test: This is it!
Change-Id: I3690bf91bf371a7ab6a477312a138c205cceee1c

7 years agoMerge "Create Public API which exposes if the device is in a state where simultaneous...
Pankaj Kanwar [Tue, 25 Apr 2017 23:40:54 +0000 (23:40 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
am: 3a8ad81ab4

Change-Id: I54d5ac5a02b4bb0e0bd9d3f3eb2428613c40c1ec

7 years agoMerge "Fix include" into oc-dev
Chris Craik [Tue, 25 Apr 2017 23:39:39 +0000 (23:39 +0000)]
Merge "Fix include" into oc-dev
am: 7e44951bb7

Change-Id: I6e7ec68d95dc12fa3d87a0e366cf924a4dba32bc

7 years agoMerge "Fix include" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 23:32:07 +0000 (23:32 +0000)]
Merge "Fix include" into oc-dev

7 years agoMerge "Create Public API which exposes if the device is in a state where simultaneous...
Pankaj Kanwar [Tue, 25 Apr 2017 23:30:51 +0000 (23:30 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."

7 years agoMerge "Return correct value at initDataInjection and avoid crash" into oc-dev
Peng Xu [Tue, 25 Apr 2017 23:29:14 +0000 (23:29 +0000)]
Merge "Return correct value at initDataInjection and avoid crash" into oc-dev
am: 1c5b71ec1f

Change-Id: I9f416adafc27287833ecd8ce5357c782f10c3e80

7 years agoMerge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev
Chris Craik [Tue, 25 Apr 2017 23:26:58 +0000 (23:26 +0000)]
Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev
am: db8f2fc025

Change-Id: I970274dae5ac4b9164040a63ed5f8dd6a8e93084

7 years agoMerge "Return correct value at initDataInjection and avoid crash" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 23:18:19 +0000 (23:18 +0000)]
Merge "Return correct value at initDataInjection and avoid crash" into oc-dev

7 years agoMerge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 23:15:47 +0000 (23:15 +0000)]
Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev

7 years agoMerge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev
Makoto Onuki [Tue, 25 Apr 2017 22:48:57 +0000 (22:48 +0000)]
Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev
am: 781c8cb65e

Change-Id: I8417adc402df33b30b310ea87a27e1669fb5dad6

7 years agoMerge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev
Winson Chung [Tue, 25 Apr 2017 22:45:31 +0000 (22:45 +0000)]
Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev
am: 5b4e16c3a5

Change-Id: Ib9464540206d4c851529e0b0920ac8751c6401dd

7 years agoMerge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 22:42:02 +0000 (22:42 +0000)]
Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev

7 years agoMerge "Add Error specifiers to the API." am: 4c4a55a67b am: f729fccde9
Hall Liu [Tue, 25 Apr 2017 22:40:15 +0000 (22:40 +0000)]
Merge "Add Error specifiers to the API." am: 4c4a55a67b am: f729fccde9
am: 65030630fd

Change-Id: I9cf24d0ee8e8f94072fe2213ef17bb51240e1f8f

7 years agoMerge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 22:38:49 +0000 (22:38 +0000)]
Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev

7 years agoMerge "Add Error specifiers to the API." am: 4c4a55a67b
Hall Liu [Tue, 25 Apr 2017 22:32:02 +0000 (22:32 +0000)]
Merge "Add Error specifiers to the API." am: 4c4a55a67b
am: f729fccde9

Change-Id: I91d077af7f001853df99d4ae4ba7da611c1dea09

7 years agoMerge "Camera: Update docs for new auto-generation features" into oc-dev
Eino-Ville Talvala [Tue, 25 Apr 2017 22:31:56 +0000 (22:31 +0000)]
Merge "Camera: Update docs for new auto-generation features" into oc-dev
am: f879357cae

Change-Id: Idb95ad2b2b811dbe2fc765f5b190eed122ea9f05

7 years agoMerge "Merge "Add VisualVoicemailService" am: 8c6925a88f am: ac78d9ae25 am: 6c65be4d3...
Android Build Merger (Role) [Tue, 25 Apr 2017 22:28:06 +0000 (22:28 +0000)]
Merge "Merge "Add VisualVoicemailService" am: 8c6925a88f am: ac78d9ae25 am: 6c65be4d3e  -s ours" into oc-dev-plus-aosp

7 years agoMerge "Add VisualVoicemailService" am: 8c6925a88f am: ac78d9ae25
Chen Xu [Tue, 25 Apr 2017 22:25:51 +0000 (22:25 +0000)]
Merge "Add VisualVoicemailService" am: 8c6925a88f am: ac78d9ae25
am: 6c65be4d3e  -s ours

Change-Id: I54b1dc2a5d08607325d5c2b60ac1bec115070716

7 years agoMerge "Fix some issues found by new doclava linter." into oc-dev
Jeff Sharkey [Tue, 25 Apr 2017 22:25:09 +0000 (22:25 +0000)]
Merge "Fix some issues found by new doclava linter." into oc-dev
am: a00c7c0a99

Change-Id: I940b5ab896e4638e8178868acb65d79c078adbbe

7 years agoMerge "Add Error specifiers to the API."
Hall Liu [Tue, 25 Apr 2017 22:17:14 +0000 (22:17 +0000)]
Merge "Add Error specifiers to the API."
am: 4c4a55a67b

Change-Id: Ia720a230e0f7f7070ca7194dbcfce294a66a3574

7 years agoMerge "Camera: Update docs for new auto-generation features" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 22:11:43 +0000 (22:11 +0000)]
Merge "Camera: Update docs for new auto-generation features" into oc-dev

7 years agoMerge "Fix some issues found by new doclava linter." into oc-dev
Jeff Sharkey [Tue, 25 Apr 2017 22:10:56 +0000 (22:10 +0000)]
Merge "Fix some issues found by new doclava linter." into oc-dev

7 years agoMerge "Add VisualVoicemailService" am: 8c6925a88f
Chen Xu [Tue, 25 Apr 2017 22:10:21 +0000 (22:10 +0000)]
Merge "Add VisualVoicemailService" am: 8c6925a88f
am: ac78d9ae25

Change-Id: I541ad952ccab5a466e9d26c11478cc18fa69ddc0

7 years agoMerge "Add VisualVoicemailService"
Chen Xu [Tue, 25 Apr 2017 22:04:07 +0000 (22:04 +0000)]
Merge "Add VisualVoicemailService"
am: 8c6925a88f

Change-Id: I248baea501c4e1a47981e3aecfe476f89440f0af

7 years agoMerge "Add Error specifiers to the API."
Hall Liu [Tue, 25 Apr 2017 22:03:41 +0000 (22:03 +0000)]
Merge "Add Error specifiers to the API."

7 years agoMerge "Add VisualVoicemailService"
Chen Xu [Tue, 25 Apr 2017 21:54:51 +0000 (21:54 +0000)]
Merge "Add VisualVoicemailService"

7 years agoMerge "Font provider cleaning ups." into oc-dev
Seigo Nonaka [Tue, 25 Apr 2017 21:48:20 +0000 (21:48 +0000)]
Merge "Font provider cleaning ups." into oc-dev
am: 5313eee98a

Change-Id: I5e6f0c61ca46a85e3ef19f8de3cb742b6a2ff91b

7 years agoMerge "Font provider cleaning ups." into oc-dev
Seigo Nonaka [Tue, 25 Apr 2017 21:40:35 +0000 (21:40 +0000)]
Merge "Font provider cleaning ups." into oc-dev

7 years agoMerge "Remove underscore from Companion service name" into oc-dev
Eugene Susla [Tue, 25 Apr 2017 21:37:40 +0000 (21:37 +0000)]
Merge "Remove underscore from Companion service name" into oc-dev
am: 885b5f4466

Change-Id: Id04a3668155fbf02b10d1965c2d2eccea5707754

7 years agoMerge "Add tests for iconSpaceReserved attribute in Preference" into oc-dev
Fan Zhang [Tue, 25 Apr 2017 21:29:54 +0000 (21:29 +0000)]
Merge "Add tests for iconSpaceReserved attribute in Preference" into oc-dev
am: 105f55ee8f

Change-Id: I6bce8383ae88bb5bba9a2425dc4357967d473647

7 years agoMerge "ImmersiveCling: Allow interacting with underlying view" into oc-dev
Adrian Roos [Tue, 25 Apr 2017 21:27:41 +0000 (21:27 +0000)]
Merge "ImmersiveCling: Allow interacting with underlying view" into oc-dev
am: afad82ba85

Change-Id: Id525991f0b51529055199cb3e5f77434a7a0c989

7 years agoMerge "Remove underscore from Companion service name" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 21:26:09 +0000 (21:26 +0000)]
Merge "Remove underscore from Companion service name" into oc-dev

7 years agoMerge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev
Wale Ogunwale [Tue, 25 Apr 2017 21:16:00 +0000 (21:16 +0000)]
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev
am: 3ce611f1b4

Change-Id: I1dd4284b58c901d89ac82853712d17ffc0e86c0a

7 years agoMerge "Add tests for iconSpaceReserved attribute in Preference" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 21:07:48 +0000 (21:07 +0000)]
Merge "Add tests for iconSpaceReserved attribute in Preference" into oc-dev

7 years agoMerge "ImmersiveCling: Allow interacting with underlying view" into oc-dev
Adrian Roos [Tue, 25 Apr 2017 21:07:16 +0000 (21:07 +0000)]
Merge "ImmersiveCling: Allow interacting with underlying view" into oc-dev

7 years agoMerge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 20:58:33 +0000 (20:58 +0000)]
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev

7 years agoMerge "Reorder USB_STATE updates so config_changed is not replaced." into oc-dev
Jerry Zhang [Tue, 25 Apr 2017 20:57:33 +0000 (20:57 +0000)]
Merge "Reorder USB_STATE updates so config_changed is not replaced." into oc-dev
am: 27e5ec0bb7

Change-Id: Id7017f4432c8b3a6471e8d12a0afead4d31639fe

7 years agoMerge "WindowManager: Take care with Surface lifetime during relayout to invisible...
Rob Carr [Tue, 25 Apr 2017 20:55:27 +0000 (20:55 +0000)]
Merge "WindowManager: Take care with Surface lifetime during relayout to invisible." into oc-dev
am: b8bb3f7137

Change-Id: Iceb64847b920939ac2ddfd49e3d7e8b35e5f6a4f

7 years agoMerge "Reorder USB_STATE updates so config_changed is not replaced." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 20:49:38 +0000 (20:49 +0000)]
Merge "Reorder USB_STATE updates so config_changed is not replaced." into oc-dev

7 years agoMerge "Fixed issue with turn-screen-on activities" into oc-dev
Wale Ogunwale [Tue, 25 Apr 2017 20:47:59 +0000 (20:47 +0000)]
Merge "Fixed issue with turn-screen-on activities" into oc-dev
am: 26ba9f8833

Change-Id: I0194fb251723808346fb7684835a7c60081ae2ae

7 years agoMerge "Clear default-browser state when it's uninstalled" into oc-dev
Christopher Tate [Tue, 25 Apr 2017 20:45:29 +0000 (20:45 +0000)]
Merge "Clear default-browser state when it's uninstalled" into oc-dev
am: 6338cd8155

Change-Id: I950d2540bf88f7e28f17653780fb19ccdb83016d

7 years agoMerge "WindowManager: Take care with Surface lifetime during relayout to invisible...
Rob Carr [Tue, 25 Apr 2017 20:44:17 +0000 (20:44 +0000)]
Merge "WindowManager: Take care with Surface lifetime during relayout to invisible." into oc-dev

7 years agoFix include
Chris Craik [Tue, 25 Apr 2017 20:41:32 +0000 (13:41 -0700)]
Fix include

Bug: 35387665
Test: builds with HWUI_ENABLE_OPENGL_VALIDATION := false

Dependency on gl3.h was added while that header was auto-included for
error checking purposes. Add the include to enable us to disable gl
error checking.

Change-Id: Ic969da716e2323f8e42d20da8fd0a6fa653f9775

7 years agoMerge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev
Jason Monk [Tue, 25 Apr 2017 20:42:12 +0000 (20:42 +0000)]
Merge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev
am: 21fb35048f

Change-Id: I03b206841f221e965cc39c1db6e82dabe9cd14de

7 years agoMerge "Fixed issue with turn-screen-on activities" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 20:36:53 +0000 (20:36 +0000)]
Merge "Fixed issue with turn-screen-on activities" into oc-dev

7 years agoMerge "Clear default-browser state when it's uninstalled" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 20:35:55 +0000 (20:35 +0000)]
Merge "Clear default-browser state when it's uninstalled" into oc-dev

7 years agoAdd concept of implicitly exposed components
Todd Kennedy [Tue, 25 Apr 2017 18:11:40 +0000 (11:11 -0700)]
Add concept of implicitly exposed components

Implicitly exposed components are those that can still be accessed
via generic startActivity() calls. However, they cannot be started
by specifying a package or component. Additionally, package info
can't be obtained if the package only has implicitly shared
components.

Change-Id: I404a4dff87559cfeee6ad78f7dcc7f5d849d6869
Fixes: b_37343345
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest

7 years agoFix ViewOverlay#onDescendantInvalidated
Chris Craik [Tue, 25 Apr 2017 20:21:36 +0000 (13:21 -0700)]
Fix ViewOverlay#onDescendantInvalidated

Fixes: 37307001
Test: android.view.ViewInvalidateTest

Also removes damageChildInParent, since it's not called anywhere.

Change-Id: Ic81d4465e4828c5826957ace2c44ac263b4662bd

7 years agoDeviceAdminService must be protected with BIND_DEVICE_ADMIN.
Makoto Onuki [Tue, 25 Apr 2017 20:26:21 +0000 (13:26 -0700)]
DeviceAdminService must be protected with BIND_DEVICE_ADMIN.

Bug: 37625902
Bug: 36226832

Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest
Change-Id: I0bee75d758b565c6587d0e9cabf63bec351a0669

7 years agoMerge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 20:27:18 +0000 (20:27 +0000)]
Merge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev

7 years agoCreate Public API which exposes if the device is in a state where simultaneous
pkanwar [Thu, 19 Jan 2017 20:24:19 +0000 (12:24 -0800)]
Create Public API which exposes if the device is in a state where simultaneous
voice and data are possible.

BUG: 32912296
Test: Not required.
Change-Id: If603aa37c774157f0a3af12ca4ac6bafad94340d
Merged-In: If603aa37c774157f0a3af12ca4ac6bafad94340d

7 years agoMerge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8 am: 3e56fdba72
Jakub Pawlowski [Tue, 25 Apr 2017 20:06:17 +0000 (20:06 +0000)]
Merge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8 am: 3e56fdba72
am: adc97e1c33

Change-Id: Ifcc1efc1cc2b99065e04e96b2aaff13a87b868b3

7 years agoMerge "Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am...
Android Build Merger (Role) [Tue, 25 Apr 2017 20:03:01 +0000 (20:03 +0000)]
Merge "Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am: 41eae807ef am: 36ceeb548e" into oc-dev-plus-aosp

7 years agoMerge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am: 41eae807ef
Jakub Pawlowski [Tue, 25 Apr 2017 20:01:57 +0000 (20:01 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am: 41eae807ef
am: 36ceeb548e

Change-Id: Icf0d3001d2ec25c7f5aad6c6789fdac1b58078bc

7 years agoMerge "Add getVisualVoicemailSettings()" into oc-dev
Ta-wei Yen [Tue, 25 Apr 2017 19:58:17 +0000 (19:58 +0000)]
Merge "Add getVisualVoicemailSettings()" into oc-dev
am: 1c35554c5f

Change-Id: I16718e6b6fb135fbd7e7d19258e43d740a9e1fda

7 years agoMerge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8
Jakub Pawlowski [Tue, 25 Apr 2017 19:56:43 +0000 (19:56 +0000)]
Merge "Bluetooth: expand comments on new PHY constants" am: bdeb8539e8
am: 3e56fdba72

Change-Id: I092b69b4e9f3ebd9a29b5c31e76de37035d20843

7 years agoMerge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808
Jakub Pawlowski [Tue, 25 Apr 2017 19:54:54 +0000 (19:54 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808
am: 41eae807ef

Change-Id: I5192fa676a27f6627c94984d5e689dc1ddd1d000

7 years agoMerge "Merge "Remove a11y web flags and associated settings" into oc-dev am: cd68c334...
Android Build Merger (Role) [Tue, 25 Apr 2017 19:53:29 +0000 (19:53 +0000)]
Merge "Merge "Remove a11y web flags and associated settings" into oc-dev am: cd68c334ba" into oc-dev-plus-aosp

7 years agoMerge "Remove a11y web flags and associated settings" into oc-dev
Phil Weaver [Tue, 25 Apr 2017 19:52:07 +0000 (19:52 +0000)]
Merge "Remove a11y web flags and associated settings" into oc-dev
am: cd68c334ba

Change-Id: I6fab530bcbc9524e5ca7cb851cce4ac807594e5b

7 years agoMerge "Bluetooth: document status value in PHY read/update" am: 06abc2c404 am: 3d95c68d2e
Jakub Pawlowski [Tue, 25 Apr 2017 19:51:38 +0000 (19:51 +0000)]
Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c404 am: 3d95c68d2e
am: 6260ea5ab7

Change-Id: I5d45b8a8a33394d7e50479a4a4a920c59e999965

7 years agoMerge "Bluetooth: expand comments on new PHY constants"
Jakub Pawlowski [Tue, 25 Apr 2017 19:50:30 +0000 (19:50 +0000)]
Merge "Bluetooth: expand comments on new PHY constants"
am: bdeb8539e8

Change-Id: I5c2308f357ec419d5644ec57a014b2237e22e0aa

7 years agoMerge "Bluetooth: Add handler parameter to connectGatt"
Jakub Pawlowski [Tue, 25 Apr 2017 19:48:19 +0000 (19:48 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt"
am: 1f4e111808

Change-Id: I878bfa78c10de91b3b1b83c00bc94ccc4aa77a27

7 years agoMerge "Add getVisualVoicemailSettings()" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 19:45:42 +0000 (19:45 +0000)]
Merge "Add getVisualVoicemailSettings()" into oc-dev

7 years agoMerge "Bluetooth: document status value in PHY read/update" am: 06abc2c404
Jakub Pawlowski [Tue, 25 Apr 2017 19:41:54 +0000 (19:41 +0000)]
Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c404
am: 3d95c68d2e

Change-Id: I765bbeb4e21ef1102f92c708e93a339f928ee5e3

7 years agoFont provider cleaning ups.
Seigo Nonaka [Mon, 24 Apr 2017 21:46:23 +0000 (14:46 -0700)]
Font provider cleaning ups.

- Remove Columns.STYLE
- Decouple Context from Typeface.
- Make FontsContract constructor private since it is essentially static.
- Removed unused constants.

Bug: 37281200
Bug: 37268410
Test: am instrument -w -e class android.provider.FontsContractE2ETest
      com.android.frameworks.coretests/\
      android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.provider.FontsContractTest
      com.android.frameworks.coretests/\
      android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.graphics.cts.TypefaceTest
      android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic46c256141d27ca28f30023bcc40f4e1161d5338

7 years agoMerge "Allow some notifications in a group to be muted" into oc-dev
Julia Reynolds [Tue, 25 Apr 2017 19:39:30 +0000 (19:39 +0000)]
Merge "Allow some notifications in a group to be muted" into oc-dev
am: 9685128edf

Change-Id: I0a2823475a81c6570c6644153a8f7302dc59b058

7 years agoImmersiveCling: Allow interacting with underlying view
Adrian Roos [Tue, 25 Apr 2017 19:38:01 +0000 (12:38 -0700)]
ImmersiveCling: Allow interacting with underlying view

Fixes: 23740894
Test: adb shell settings delete secure immersive_mode_confirmations && "set an alarm" && "try interacting with the ringing alarm beneath the immersive mode confirmation"
Change-Id: Ic0c672603db34bcb71fc21c1a674a89fd4779f3d

7 years agoMerge "Bluetooth: expand comments on new PHY constants"
Treehugger Robot [Tue, 25 Apr 2017 19:36:35 +0000 (19:36 +0000)]
Merge "Bluetooth: expand comments on new PHY constants"

7 years agoMerge "Bluetooth: Add handler parameter to connectGatt"
Treehugger Robot [Tue, 25 Apr 2017 19:36:20 +0000 (19:36 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt"

7 years agoMerge "Fix javadoc to clearly express units and base for time value." into oc-dev
Pavel Grafov [Tue, 25 Apr 2017 19:34:04 +0000 (19:34 +0000)]
Merge "Fix javadoc to clearly express units and base for time value." into oc-dev
am: 0a001ed37f

Change-Id: I923e0ef23804d56214ac4454ef181eea20994f03

7 years agoMerge "Bluetooth: document status value in PHY read/update"
Jakub Pawlowski [Tue, 25 Apr 2017 19:32:15 +0000 (19:32 +0000)]
Merge "Bluetooth: document status value in PHY read/update"
am: 06abc2c404

Change-Id: I758c26a86e9f0f5b8c80bb946682ad0eb865b152

7 years agoMerge "Remove a11y web flags and associated settings" into oc-dev
Phil Weaver [Tue, 25 Apr 2017 19:25:18 +0000 (19:25 +0000)]
Merge "Remove a11y web flags and associated settings" into oc-dev

7 years agoMerge "Allow some notifications in a group to be muted" into oc-dev
Julia Reynolds [Tue, 25 Apr 2017 19:24:57 +0000 (19:24 +0000)]
Merge "Allow some notifications in a group to be muted" into oc-dev

7 years agoMerge "Bluetooth: document status value in PHY read/update"
Treehugger Robot [Tue, 25 Apr 2017 19:20:40 +0000 (19:20 +0000)]
Merge "Bluetooth: document status value in PHY read/update"

7 years agoMerge "Fix javadoc to clearly express units and base for time value." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 19:17:24 +0000 (19:17 +0000)]
Merge "Fix javadoc to clearly express units and base for time value." into oc-dev

7 years agoMerge "Do not deliver INSTALL_SHORTCUT." into oc-dev
Makoto Onuki [Tue, 25 Apr 2017 19:13:28 +0000 (19:13 +0000)]
Merge "Do not deliver INSTALL_SHORTCUT." into oc-dev
am: ecabc596b7

Change-Id: I0ffd46ea6c2ce53e509777cbbff7109a4ea0c0e5

7 years agoFix some issues found by new doclava linter.
Jeff Sharkey [Tue, 25 Apr 2017 00:06:20 +0000 (18:06 -0600)]
Fix some issues found by new doclava linter.

Add missing API annotations for permissions and SdkConstants, and
invoke doclava with new "-android" flag.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I970bb2655eb568fd25004636f134c794663a6c33

7 years agoMerge "Revert "Whitelist DMAgent from bg check"" into oc-dev
Tony Mak [Tue, 25 Apr 2017 19:11:24 +0000 (19:11 +0000)]
Merge "Revert "Whitelist DMAgent from bg check"" into oc-dev
am: 730bf42e44

Change-Id: Ie6a3237cbc3b11884260f2748c6c68e97110cf00

7 years agoMerge changes from topic 'experio-scoring' into oc-dev
Amin Shaikh [Tue, 25 Apr 2017 19:07:11 +0000 (19:07 +0000)]
Merge changes from topic 'experio-scoring' into oc-dev
am: bad4573bd4

Change-Id: Iff8a25fa18ff6e7cfd9fb8e7d9e265fdcdeed076

7 years agoMerge "Do not deliver INSTALL_SHORTCUT." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 18:58:53 +0000 (18:58 +0000)]
Merge "Do not deliver INSTALL_SHORTCUT." into oc-dev

7 years agoMerge "Revert "Whitelist DMAgent from bg check"" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 18:55:03 +0000 (18:55 +0000)]
Merge "Revert "Whitelist DMAgent from bg check"" into oc-dev

7 years agoMerge changes from topic 'experio-scoring' into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 18:51:47 +0000 (18:51 +0000)]
Merge changes from topic 'experio-scoring' into oc-dev

* changes:
  Remove Settings.CURATE_SAVED_OPEN_NETWORKS
  Remove request recommendation from AIDL files.
  Remove the recommendation request impl and test code.
  Deprecate the recommendation request code.

7 years agoSwitch ActivityRecord last reported config. to MergeConfiguration
Wale Ogunwale [Tue, 25 Apr 2017 17:23:48 +0000 (10:23 -0700)]
Switch ActivityRecord last reported config. to MergeConfiguration

Clean-up before actual fix for b/36897968 that makes the code easier to
follow.

Test: Existing tests pass
Bug: 36897968
Change-Id: I3039548929440f922dc69d7f130169a3d60b1eef

7 years agoMerge "Make new onFill/onSave methods abstract." into oc-dev
Felipe Leme [Tue, 25 Apr 2017 18:36:44 +0000 (18:36 +0000)]
Merge "Make new onFill/onSave methods abstract." into oc-dev
am: 3411adc4b3

Change-Id: I07a8d4ce4fefa0c47dc6712b298356353827ea92

7 years agoMerge "Make new onFill/onSave methods abstract." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 18:31:07 +0000 (18:31 +0000)]
Merge "Make new onFill/onSave methods abstract." into oc-dev

7 years agoMerge "Address API Review comments" into oc-dev
Tony Wickham [Tue, 25 Apr 2017 18:25:44 +0000 (18:25 +0000)]
Merge "Address API Review comments" into oc-dev
am: 974cea8f4c

Change-Id: I5991eeceabe0b7a3488173be330bcf02649d395d

7 years agoMerge "Address API Review comments" into oc-dev
Tony Wickham [Tue, 25 Apr 2017 18:16:50 +0000 (18:16 +0000)]
Merge "Address API Review comments" into oc-dev

7 years agoWindowManager: Take care with Surface lifetime during relayout to invisible.
Robert Carr [Mon, 24 Apr 2017 22:33:11 +0000 (15:33 -0700)]
WindowManager: Take care with Surface lifetime during relayout to invisible.

In the relayout to invisible case where we choose not to apply an exit
animation, we would call to WindowState#destroyOrSaveSurface bypassing
the app stopped check. Notice WindowManagerService.java L1953 we could
enter the relayout to invisible even if the client has not requested it
if clientHidden were set to true (but not yet processed by the client). This means
we can destroy the surface ahead of any notification to the client.  We instead
need to use the WindowState#destroySurface variant
and respect the app token mAppStopped flag. #destroySurface expects
mDestroying to have been set by the exit animation, so we will also need
to set that. If destruction is deferred, it will be completed later by
AppWindowToken#notifyAppStopped

Bug: 36561071
Bug: 37533373
Test: Manual from repro in bug.
Change-Id: If91b4c75fdbcbf87007551860f9eb64dbec9e032

7 years agoMerge "sensors: fix concurrent modification exception" into oc-dev
Peng Xu [Tue, 25 Apr 2017 18:01:05 +0000 (18:01 +0000)]
Merge "sensors: fix concurrent modification exception" into oc-dev
am: 9098a0260f

Change-Id: I0f40f8d3bd84f2b070c7d1bd99b46fb4ac08d971

7 years agoMerge "Update fontchain to read from additional sequences" into oc-dev
Siyamed Sinir [Tue, 25 Apr 2017 17:56:34 +0000 (17:56 +0000)]
Merge "Update fontchain to read from additional sequences" into oc-dev
am: a54b89e000

Change-Id: I9247993ea6a8997bff4ac5f978bdf7d32faa99a3

7 years agoMerge "sensors: fix concurrent modification exception" into oc-dev
Peng Xu [Tue, 25 Apr 2017 17:51:20 +0000 (17:51 +0000)]
Merge "sensors: fix concurrent modification exception" into oc-dev

7 years agoRevert "Revert "Integrate new looper apis into testables""
Jason Monk [Mon, 17 Apr 2017 15:34:22 +0000 (11:34 -0400)]
Revert "Revert "Integrate new looper apis into testables""

This reverts commit fd8f615953631863c94d7080441f8dd4a0a74f56.
+ some minor adjustments.

Test: runtest systemui
Change-Id: Ie4349fcfb2aadbbd8826506faa8a6fb1ecd5b589