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

Adrian Roos [Wed, 26 Apr 2017 17:46:17 +0000 (17:46 +0000)]

Merge "AOD: Fix layout" into oc-dev am: f84b208a12
am: 2c3fb2b733

Change-Id: Iab89ffd7e778124a73fe6141319fbe7610e9b086

Adrian Roos [Wed, 26 Apr 2017 17:38:00 +0000 (17:38 +0000)]

Merge "AOD: Remove wake up fully config flag" into oc-dev am: ce83c81b84
am: 95c71928fd

Change-Id: I1d34072cf451c80f414b9cc06a5af4d391c5220f

commit | commitdiff | tree

Adrian Roos [Wed, 26 Apr 2017 17:36:11 +0000 (17:36 +0000)]

Merge "AOD: Limit visible icons on shelf" into oc-dev am: 6b7c0e9da8
am: c1b183a583

Change-Id: I508c66894bd3b859f0c7d81510132b1d3b580bab

commit | commitdiff | tree

Dongwon Kang [Wed, 26 Apr 2017 17:34:17 +0000 (17:34 +0000)]

Merge "TIF: fix documentation in TvContract" into oc-dev am: e1a795379d
am: edf3936f17

Change-Id: I0c65d242166c734dc82b3a04c8132683760c4e63

commit | commitdiff | tree

Jean-Michel Trivi [Wed, 26 Apr 2017 17:32:23 +0000 (17:32 +0000)]

Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev am: c4a169cfb4
am: ecbe5f0305

Change-Id: Ic534a390b4d2ba25a5b330e1abc65814d4e5c992

commit | commitdiff | tree

Philip P. Moltmann [Wed, 26 Apr 2017 17:20:14 +0000 (17:20 +0000)]

Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev am: dd91a5636b
am: 934238ff22

Change-Id: Ief2c8bcae4c39a7f51d368cb2b0426deea6bae99

commit | commitdiff | tree

Wale Ogunwale [Wed, 26 Apr 2017 17:15:09 +0000 (17:15 +0000)]

Merge "Reduce use of static variables in window manager unit tests" into oc-dev am: 0f8764485b
am: 2fcba5d920

Change-Id: I25e60066a85cac59fd002ab5153f3db125e8aa6d

commit | commitdiff | tree

Narayan Kamath [Wed, 26 Apr 2017 17:13:11 +0000 (17:13 +0000)]

Merge "Improvements to ActivityManagerService stack dumping" am: 2529f65e87 am: 9e9270ee3d am: 30ad6b8cee -s ours
am: eaecc4397c -s ours

Change-Id: I4b29aa84f097314346323e101acb172e09ae9392

commit | commitdiff | tree

Adrian Roos [Wed, 26 Apr 2017 16:57:20 +0000 (16:57 +0000)]

Merge "AOD: Fix layout" into oc-dev
am: f84b208a12

Change-Id: Ifd1cc55308896a69a805d80d56f321eb272d8bf8

commit | commitdiff | tree

Adrian Roos [Wed, 26 Apr 2017 16:53:18 +0000 (16:53 +0000)]

Merge "AOD: Remove wake up fully config flag" into oc-dev
am: ce83c81b84

Change-Id: I7295e4bb27e863dd144d1f79068f9e00a249368e

commit | commitdiff | tree

Adrian Roos [Wed, 26 Apr 2017 16:51:13 +0000 (16:51 +0000)]

Merge "AOD: Limit visible icons on shelf" into oc-dev
am: 6b7c0e9da8

Change-Id: Ife25cd6f91ec6997267e8fdd6b82b78b4bac8223

commit | commitdiff | tree

Adrian Roos [Wed, 26 Apr 2017 16:43:50 +0000 (16:43 +0000)]

Merge "AOD: Fix layout" into oc-dev

commit | commitdiff | tree

Adrian Roos [Wed, 26 Apr 2017 16:43:30 +0000 (16:43 +0000)]

Merge "AOD: Remove wake up fully config flag" into oc-dev

commit | commitdiff | tree

Adrian Roos [Wed, 26 Apr 2017 16:43:19 +0000 (16:43 +0000)]

Merge "AOD: Limit visible icons on shelf" into oc-dev

commit | commitdiff | tree

Dongwon Kang [Wed, 26 Apr 2017 16:27:39 +0000 (16:27 +0000)]

Merge "TIF: fix documentation in TvContract" into oc-dev
am: e1a795379d

Change-Id: Ibe63e4397fac8c1a5d0190ae10dcf4598e1fd1ca

commit | commitdiff | tree

Dongwon Kang [Wed, 26 Apr 2017 16:22:08 +0000 (16:22 +0000)]

Merge "TIF: fix documentation in TvContract" into oc-dev

commit | commitdiff | tree

Jean-Michel Trivi [Wed, 26 Apr 2017 15:33:34 +0000 (15:33 +0000)]

Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev
am: c4a169cfb4

Change-Id: Iad6d5099e2c1b7dbeaf53cb5fcbf21ed7469b55e

commit | commitdiff | tree

Jean-Michel Trivi [Wed, 26 Apr 2017 15:26:59 +0000 (15:26 +0000)]

Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev

commit | commitdiff | tree

Philip P. Moltmann [Wed, 26 Apr 2017 14:22:48 +0000 (14:22 +0000)]

Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
am: dd91a5636b

Change-Id: I1b75b8e8ef125620817a1baaea0431b041871bae

commit | commitdiff | tree

Philip P. Moltmann [Wed, 26 Apr 2017 14:16:46 +0000 (14:16 +0000)]

Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev

* changes:
Return all previous FillContexts onFill
Report multiple FillContext-s onSave

commit | commitdiff | tree

Wale Ogunwale [Wed, 26 Apr 2017 12:39:11 +0000 (12:39 +0000)]

Merge "Reduce use of static variables in window manager unit tests" into oc-dev
am: 0f8764485b

Change-Id: Ia10f8954ec3524cd76f0327f8edc0bb04f90915d

commit | commitdiff | tree

Wale Ogunwale [Wed, 26 Apr 2017 12:35:08 +0000 (12:35 +0000)]

Merge "Reduce use of static variables in window manager unit tests" into oc-dev

commit | commitdiff | tree

Narayan Kamath [Wed, 26 Apr 2017 12:24:13 +0000 (12:24 +0000)]

Merge "Improvements to ActivityManagerService stack dumping" am: 2529f65e87 am: 9e9270ee3d
am: 30ad6b8cee -s ours

Change-Id: Ic2ba253aabaa9f39f9825d9ab6c69d98b7ace5dc

commit | commitdiff | tree

Narayan Kamath [Wed, 26 Apr 2017 12:18:05 +0000 (12:18 +0000)]

Merge "Improvements to ActivityManagerService stack dumping" am: 2529f65e87
am: 9e9270ee3d

Change-Id: I273b307256c3bf6d2255a7c092c4985c90d26942

commit | commitdiff | tree

Narayan Kamath [Wed, 26 Apr 2017 12:12:29 +0000 (12:12 +0000)]

Merge "Improvements to ActivityManagerService stack dumping"
am: 2529f65e87

Change-Id: Iabbf138719296a882aa98261fb2c4da8bbf027cc

commit | commitdiff | tree

Narayan Kamath [Wed, 26 Apr 2017 12:01:15 +0000 (12:01 +0000)]

Merge "Improvements to ActivityManagerService stack dumping"

commit | commitdiff | tree

Michal Karpinski [Wed, 26 Apr 2017 10:49:00 +0000 (11:49 +0100)]

resolve merge conflicts of 970525ef3225 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia4860b81fbd1f45e6594197b1de75ff3531c4826

commit | commitdiff | tree

Jakub Pawlowski [Wed, 26 Apr 2017 10:19:25 +0000 (10:19 +0000)]

Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev am: 5df218c5c4 -s ours
am: 92502878a1

Change-Id: I42ba60d66511f569c40677dd834d2a045328465f

commit | commitdiff | tree

Michal Karpinski [Wed, 26 Apr 2017 10:15:16 +0000 (10:15 +0000)]

Merge "Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread" into oc-dev
am: c38e2af0d1

Change-Id: I60cc10f8c1e734c5c701cf461ed1f18c3c1d10fa

commit | commitdiff | tree

Jakub Pawlowski [Wed, 26 Apr 2017 10:13:19 +0000 (10:13 +0000)]

Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev
am: 5df218c5c4 -s ours

Change-Id: Ie541540172e4e34869d37ae7f4824d055a363ef1

commit | commitdiff | tree

Michal Karpinski [Wed, 26 Apr 2017 09:44:49 +0000 (09:44 +0000)]

Merge "Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread" into oc-dev

commit | commitdiff | tree

Jakub Pawlowski [Wed, 26 Apr 2017 08:16:48 +0000 (08:16 +0000)]

Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev

* changes:
  Bluetooth: expand comments on new PHY constants
  Bluetooth: document status value in PHY read/update
  Bluetooth: Add handler parameter to connectGatt
  Get rid of the IAdvertiserCallabck

commit | commitdiff | tree

Joe Fernandez [Wed, 26 Apr 2017 05:17:03 +0000 (05:17 +0000)]

Merge "docs: Update ListView JavaDoc comments" into oc-dev am: bc6c82c20d
am: 2af635339e

Change-Id: If056887bb290c78d41a32ed679abc61f646e2d28

commit | commitdiff | tree

Joe Fernandez [Wed, 26 Apr 2017 05:15:14 +0000 (05:15 +0000)]

Merge "docs: Update ArrayAdapter JavaDoc comments" into oc-dev am: 0de19fcf6a
am: 6eb2726d40

Change-Id: Ica7261d081dd4e1a4a287732a5c4c8261e9b3e99

commit | commitdiff | tree

Joe Fernandez [Wed, 26 Apr 2017 05:09:28 +0000 (05:09 +0000)]

Merge "docs: Update ListView JavaDoc comments" into oc-dev
am: bc6c82c20d

Change-Id: Iffe54d8fffee067e08d8da194fb8d3e984d46708

commit | commitdiff | tree

Joe Fernandez [Wed, 26 Apr 2017 05:06:58 +0000 (05:06 +0000)]

Merge "docs: Update ArrayAdapter JavaDoc comments" into oc-dev
am: 0de19fcf6a

Change-Id: Ic2caf678a0231344b5e26f7641b2570394ad857a

commit | commitdiff | tree

Joe Fernandez [Wed, 26 Apr 2017 04:56:06 +0000 (04:56 +0000)]

Merge "docs: Update ListView JavaDoc comments" into oc-dev

commit | commitdiff | tree

Joe Fernandez [Wed, 26 Apr 2017 04:55:33 +0000 (04:55 +0000)]

Merge "docs: Update ArrayAdapter JavaDoc comments" into oc-dev

commit | commitdiff | tree

Wale Ogunwale [Wed, 26 Apr 2017 03:29:13 +0000 (20:29 -0700)]

Reduce use of static variables in window manager unit tests

This was causing test cross-contamination since different test might
expect different states from the variables.

Bug: 37682538
Test: tons of it!
Change-Id: Ie8a1ea400695b6346d7dfa3369b5c44bb467a33d

commit | commitdiff | tree

Felipe Leme [Wed, 26 Apr 2017 03:10:34 +0000 (03:10 +0000)]

Merge "Added missing importantForAutofill values on attributes." into oc-dev am: 6fba10b037
am: 341003106a

Change-Id: I349b8afa3f7d3150fa58e7238924f3f8e2e742e3

commit | commitdiff | tree

Felipe Leme [Wed, 26 Apr 2017 03:02:50 +0000 (03:02 +0000)]

Merge "Added missing importantForAutofill values on attributes." into oc-dev
am: 6fba10b037

Change-Id: Icfe6f41e86b8b47fad7737acb83c25eff912fd93

commit | commitdiff | tree

Felipe Leme [Wed, 26 Apr 2017 02:56:04 +0000 (02:56 +0000)]

Merge "Added missing importantForAutofill values on attributes." into oc-dev

commit | commitdiff | tree

Svetoslav Ganov [Wed, 26 Apr 2017 02:24:31 +0000 (02:24 +0000)]

Make sure autofill service is backed up am: d8561a26da
am: 92e412dfb3

Change-Id: If46c616d922701493f797be1919b158707bc5574

commit | commitdiff | tree

Svetoslav Ganov [Wed, 26 Apr 2017 02:16:43 +0000 (02:16 +0000)]

Make sure autofill service is backed up
am: d8561a26da

Change-Id: I6964ccdc64621e4aab330afc2c0faa836d35dced

commit | commitdiff | tree

Svetoslav Ganov [Tue, 25 Apr 2017 22:26:03 +0000 (15:26 -0700)]

Make sure autofill service is backed up

Test: manual

bug:36638606

Change-Id: I3367b9eb40a542267fb5d49f9a8bb7aa97ca57fa

commit | commitdiff | tree

Dongwon Kang [Wed, 26 Apr 2017 01:22:38 +0000 (01:22 +0000)]

Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev am: a35e4e5584
am: de938e3695

Change-Id: I1a345ce26aea1946d42c8b79eaf9981ae80bbea6

commit | commitdiff | tree

Todd Kennedy [Wed, 26 Apr 2017 01:16:00 +0000 (01:16 +0000)]

Merge "Merge "Add concept of implicitly exposed components" into oc-dev am: 0a4b7f5a86" into oc-dev-plus-aosp
am: eeb311e47d

Change-Id: I3857f3d588497024caab36d6a3a11f9374018c78

commit | commitdiff | tree

Wale Ogunwale [Wed, 26 Apr 2017 01:12:10 +0000 (01:12 +0000)]

Merge "Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev am: e44e9e94da" into oc-dev-plus-aosp
am: 13bda11ce2

Change-Id: I55947258f3c8467649d52dafd78cbff73822d530

commit | commitdiff | tree

Pankaj Kanwar [Wed, 26 Apr 2017 01:05:58 +0000 (01:05 +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
am: 63b5ec1155 -s ours

Change-Id: I4d5f6aff90c4c9843748e2d51053ccccb7515a18

commit | commitdiff | tree

Chris Craik [Wed, 26 Apr 2017 01:04:02 +0000 (01:04 +0000)]

Merge "Fix include" into oc-dev am: 7e44951bb7
am: 4554fa6b7c

Change-Id: I44871c8098ffc01ca86dd8c16657cacaf26be3b3

commit | commitdiff | tree

Peng Xu [Wed, 26 Apr 2017 01:01:48 +0000 (01:01 +0000)]

Merge "Return correct value at initDataInjection and avoid crash" into oc-dev am: 1c5b71ec1f
am: b66e6c26d1

Change-Id: I110c83decf811d388095ee307dcb2c6b5e41e81f

commit | commitdiff | tree

Chris Craik [Wed, 26 Apr 2017 00:59:58 +0000 (00:59 +0000)]

Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev am: db8f2fc025
am: a08dd9fff3

Change-Id: Icd0035e3b21e679f3fff01d165b5b3170b497929

commit | commitdiff | tree

Makoto Onuki [Wed, 26 Apr 2017 00:54:07 +0000 (00:54 +0000)]

Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev am: 781c8cb65e
am: 1ddaa67a59

Change-Id: Ice1a513a00e4b8962b11db6091f0bfe9e0f279f1

commit | commitdiff | tree

Winson Chung [Wed, 26 Apr 2017 00:51:00 +0000 (00:51 +0000)]

Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev am: 5b4e16c3a5
am: d02aa22f18

Change-Id: I2b689c23fbb1fb6157ab7f57d67315152888a713

commit | commitdiff | tree

Hall Liu [Wed, 26 Apr 2017 00:49:07 +0000 (00:49 +0000)]

Merge "Add Error specifiers to the API." am: 4c4a55a67b am: f729fccde9 am: 65030630fd
am: 84c1ff86f6

Change-Id: Ie7ee3cdf9fa2a75a88f68c5fe7d7c4e28d91b549

commit | commitdiff | tree

Eino-Ville Talvala [Wed, 26 Apr 2017 00:46:33 +0000 (00:46 +0000)]

Merge "Camera: Update docs for new auto-generation features" into oc-dev am: f879357cae
am: 50c37ee12e

Change-Id: I1c0c83a92bcf8fce2670d6bcd68415ac3585b9e3

commit | commitdiff | tree

Chen Xu [Wed, 26 Apr 2017 00:43:47 +0000 (00:43 +0000)]

Merge "Merge "Add VisualVoicemailService" am: 8c6925a88f am: ac78d9ae25 am: 6c65be4d3e -s ours" into oc-dev-plus-aosp
am: 3b328b0402 -s ours

Change-Id: Idbb0a16aec8f34b03f2d5e146ebffa20bcdfef28

commit | commitdiff | tree

Chen Xu [Wed, 26 Apr 2017 00:43:39 +0000 (00:43 +0000)]

Merge "Add VisualVoicemailService" am: 8c6925a88f am: ac78d9ae25 am: 6c65be4d3e -s ours
am: 9e3b41ddef -s ours

Change-Id: Id809127620df186cdc05eaa408427e21a8b45a90

commit | commitdiff | tree

Jeff Sharkey [Wed, 26 Apr 2017 00:41:04 +0000 (00:41 +0000)]

Merge "Fix some issues found by new doclava linter." into oc-dev am: a00c7c0a99
am: db73950734

Change-Id: I388d85c9eedccee594832e9947e2f8f095fbb10d

commit | commitdiff | tree

Seigo Nonaka [Wed, 26 Apr 2017 00:39:15 +0000 (00:39 +0000)]

Merge "Font provider cleaning ups." into oc-dev am: 5313eee98a
am: a3d5786a3d

Change-Id: Ic9a30e9bf8404c3a469bb0c998fd876ee94a3488

commit | commitdiff | tree

Eugene Susla [Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +0000)]

Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f4466
am: 56620feed0

Change-Id: I3a35f668dde82a8ccb1094988943039b4c93e4fa

commit | commitdiff | tree

Dongwon Kang [Wed, 26 Apr 2017 00:35:39 +0000 (00:35 +0000)]

Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev
am: a35e4e5584

Change-Id: I44b887de9aa6ef402ba0b6ee1092fd9274ba3fcb

commit | commitdiff | tree

Fan Zhang [Wed, 26 Apr 2017 00:34:54 +0000 (00:34 +0000)]

Merge "Add tests for iconSpaceReserved attribute in Preference" into oc-dev am: 105f55ee8f
am: 488db94e16

Change-Id: Icad5cf4ab4a96c100ba4ff3184ac90d7afc5bc96

commit | commitdiff | tree

Adrian Roos [Wed, 26 Apr 2017 00:30:16 +0000 (00:30 +0000)]

Merge "ImmersiveCling: Allow interacting with underlying view" into oc-dev am: afad82ba85
am: 792b8d6e6c

Change-Id: I8e80caaa8df899f83df8aacedfb16005148a58bf

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Apr 2017 00:27:53 +0000 (00:27 +0000)]

Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev

commit | commitdiff | tree

Wale Ogunwale [Wed, 26 Apr 2017 00:27:56 +0000 (00:27 +0000)]

Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev am: 3ce611f1b4
am: a17d99a389

Change-Id: I3abcabf0bf75fb7217fb8045d2b6404300f4255f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 25 Apr 2017 23:50:17 +0000 (23:50 +0000)]

Merge "Add concept of implicitly exposed components" into oc-dev

commit | commitdiff | tree

Philip P. Moltmann [Tue, 25 Apr 2017 20:33:41 +0000 (13:33 -0700)]

Return all previous FillContexts onFill

Test: CtsAutoFillServiceTestCases
Fixes: 37673341
Change-Id: I80feb5bd8d6027fb4ec2dd32f5c486dae7c6bc4c

commit | commitdiff | tree

Wale Ogunwale [Tue, 25 Apr 2017 23:47:53 +0000 (23:47 +0000)]

Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev

commit | commitdiff | tree

Adrian Roos [Tue, 25 Apr 2017 23:46:49 +0000 (16:46 -0700)]

AOD: Limit visible icons on shelf

Only show up to 5 icons on AOD1.

Change-Id: I7d962ef2a4eb5e47ab35a8bdc8f133fddfb1fd84
Test: Have more than 5 notifications, trigger ambient display, observe that at most 5 icons are visible and the rest is collapsed to dots
Fixes: 37641322

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Craik [Tue, 25 Apr 2017 23:39:39 +0000 (23:39 +0000)]

Merge "Fix include" into oc-dev
am: 7e44951bb7

Change-Id: I6e7ec68d95dc12fa3d87a0e366cf924a4dba32bc

commit | commitdiff | tree

TreeHugger Robot [Tue, 25 Apr 2017 23:32:07 +0000 (23:32 +0000)]

Merge "Fix include" into oc-dev

commit | commitdiff | tree

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."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 25 Apr 2017 23:15:47 +0000 (23:15 +0000)]

Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev

commit | commitdiff | tree

Adrian Roos [Tue, 25 Apr 2017 23:09:27 +0000 (16:09 -0700)]

AOD: Fix layout

Top had too much padding, while bottom had too
little. Now looking as spec'd.

Bug: 30876804
Test: Trigger Ambient Display, observe that layout matches mocks.
Change-Id: I3ef5e7fba5ca3fbb1b6e800ed11cbe9885c1830e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 25 Apr 2017 22:38:49 +0000 (22:38 +0000)]

Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev

commit | commitdiff | tree

Felipe Leme [Tue, 25 Apr 2017 22:26:46 +0000 (15:26 -0700)]

Added missing importantForAutofill values on attributes.

Fixes: 37677115
Test: manual verification compiling an app using it

Change-Id: Iaa2650c7354e8c1c476cb3803d40104ae6fc864a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 25 Apr 2017 22:23:17 +0000 (15:23 -0700)]

Audio focus enforcement: duck automatically apps for SDK O+

Enforce automatic ducking only for apps written for an SDK target
level above 25 (N-MR1)

Test: play notification while Podcast Addict is playing, verify it pauses instead of being ducked
Bug: 37506138
Change-Id: Id7e01a92a51308bd7a3f24abc417d2434b532c12

commit | commitdiff | tree

Philip P. Moltmann [Tue, 25 Apr 2017 18:57:37 +0000 (11:57 -0700)]

Report multiple FillContext-s onSave

To make life easier the reponseId is not part of the FillResponse.

Test: CtsAutofillServiceTestCases (added test for multiple Contexts)
Change-Id: If09e00b7267d293e4234a7a9837ad88d73af1b24
Fixes: 36481649

commit | commitdiff | tree

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