OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am...
Jakub Pawlowski [Tue, 25 Apr 2017 21:27:32 +0000 (21:27 +0000)]
Merge "Merge "Bluetooth: Add handler parameter to connectGatt" am: 1f4e111808 am: 41eae807ef am: 36ceeb548e" into oc-dev-plus-aosp
am: 45ed148f6d

Change-Id: I22e5faa4068d47fe87a7572159ca6f2c4e1f3557

7 years agoMerge "Add getVisualVoicemailSettings()" into oc-dev am: 1c35554c5f
Ta-wei Yen [Tue, 25 Apr 2017 21:23:45 +0000 (21:23 +0000)]
Merge "Add getVisualVoicemailSettings()" into oc-dev am: 1c35554c5f
am: 315b7da07e

Change-Id: I55246b167fa0694ed8de706cf96d257cdd06e00e

7 years agoMerge "Merge "Remove a11y web flags and associated settings" into oc-dev am: cd68c334...
Phil Weaver [Tue, 25 Apr 2017 21:13:19 +0000 (21:13 +0000)]
Merge "Merge "Remove a11y web flags and associated settings" into oc-dev am: cd68c334ba" into oc-dev-plus-aosp
am: b471a37b10

Change-Id: Ic6ccf5e38686d5169d70bece449c3c6ade3ab9fd

7 years agoMerge "Bluetooth: document status value in PHY read/update" am: 06abc2c404 am: 3d95c6...
Jakub Pawlowski [Tue, 25 Apr 2017 21:04:48 +0000 (21:04 +0000)]
Merge "Bluetooth: document status value in PHY read/update" am: 06abc2c404 am: 3d95c68d2e am: 6260ea5ab7
am: 343ef5d024

Change-Id: I77f405aee8b4c7348bbd88b8e8d7745ec4325704

7 years agoMerge "Address API Council feedback."
TreeHugger Robot [Tue, 25 Apr 2017 20:53:33 +0000 (20:53 +0000)]
Merge "Address API Council feedback."

7 years agoMerge "Merge "Allow some notifications in a group to be muted" into oc-dev am: 968512...
Android Build Merger (Role) [Tue, 25 Apr 2017 20:48:40 +0000 (20:48 +0000)]
Merge "Merge "Allow some notifications in a group to be muted" into oc-dev am: 9685128edf am: 5bc54aad76"

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

Change-Id: If2ba099e67ccdabf756a62858a5244679f9c1547

7 years agoMerge "Merge "Fix javadoc to clearly express units and base for time value." into...
Android Build Merger (Role) [Tue, 25 Apr 2017 20:45:16 +0000 (20:45 +0000)]
Merge "Merge "Fix javadoc to clearly express units and base for time value." into oc-dev am: 0a001ed37f am: 31f94f28d2"

7 years agoMerge "Added metrics key for camera lift trigger."
Daniel Sheng [Tue, 25 Apr 2017 20:43:54 +0000 (20:43 +0000)]
Merge "Added metrics key for camera lift trigger."

7 years agoMerge "Added suggestion category for camera lift gesture"
Daniel Sheng [Tue, 25 Apr 2017 20:43:54 +0000 (20:43 +0000)]
Merge "Added suggestion category for camera lift gesture"

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

Change-Id: I0943630bf90e473814f14d44701ecb109f514726

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

Change-Id: I69b70d672f5a3f12d902303ff58faf02dd8cf6ef

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

Change-Id: I328bea0b7a38822feeea27cc9966815ffb2da013

7 years agoMerge changes from topic 'experio-scoring' into oc-dev am: bad4573bd4
Amin Shaikh [Tue, 25 Apr 2017 20:14:37 +0000 (20:14 +0000)]
Merge changes from topic 'experio-scoring' into oc-dev am: bad4573bd4
am: 592ecd0b5a

Change-Id: I4780e742c271df5e1c4d791c86ee77f697e46d6c

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

Change-Id: I0de894537e3cdd3a9ce07f33894c7a0c3b2f6343

7 years agoMerge "Merge "Address API Review comments" into oc-dev am: 974cea8f4c am: e90ece4635"
Android Build Merger (Role) [Tue, 25 Apr 2017 20:05:45 +0000 (20:05 +0000)]
Merge "Merge "Address API Review comments" into oc-dev am: 974cea8f4c am: e90ece4635"

7 years agoMerge "Use new GrVkBackendContext::Create api"
Greg Daniel [Tue, 25 Apr 2017 20:03:04 +0000 (20:03 +0000)]
Merge "Use new GrVkBackendContext::Create api"

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 "Address API Review comments" into oc-dev am: 974cea8f4c
Tony Wickham [Tue, 25 Apr 2017 20:01:24 +0000 (20:01 +0000)]
Merge "Address API Review comments" into oc-dev am: 974cea8f4c
am: e90ece4635

Change-Id: Ic5b5b663ec6bf88e647f4ee9958fe733970cb94b

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 "sensors: fix concurrent modification exception" into oc-dev am: 9098a0260f
Peng Xu [Tue, 25 Apr 2017 19:57:18 +0000 (19:57 +0000)]
Merge "sensors: fix concurrent modification exception" into oc-dev am: 9098a0260f
am: 90c60be02f

Change-Id: I105171194bc9ea807955b0b7251096d905b89c62

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 "Update fontchain to read from additional sequences" into oc-dev am: a54b89e000
Siyamed Sinir [Tue, 25 Apr 2017 19:53:18 +0000 (19:53 +0000)]
Merge "Update fontchain to read from additional sequences" into oc-dev am: a54b89e000
am: eb161e240e

Change-Id: Ia3a37d0ef797a27b1f42c7d8e7df8228cecbda33

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 "Fix some "leaks"" into oc-dev am: 011e07d7fd
Jorim Jaggi [Tue, 25 Apr 2017 19:49:55 +0000 (19:49 +0000)]
Merge "Fix some "leaks"" into oc-dev am: 011e07d7fd
am: 776762d64c

Change-Id: I14181a6d6278e1721bf45813251ef75e8c04f5e3

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 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 agoMerge "Remove Typeface.create" into oc-dev am: 0a7096dccb
Seigo Nonaka [Tue, 25 Apr 2017 19:38:26 +0000 (19:38 +0000)]
Merge "Remove Typeface.create" into oc-dev am: 0a7096dccb
am: 0582ccb776

Change-Id: Ie116f1f179730d488913bf89627dad1f76b635b3

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 "Update PACKAGE_REMOVED broadcast." into oc-dev am: 257ba8946e
Dmitry Dementyev [Tue, 25 Apr 2017 19:26:05 +0000 (19:26 +0000)]
Merge "Update PACKAGE_REMOVED broadcast." into oc-dev am: 257ba8946e
am: 08643b7507

Change-Id: Ib4a32f0a4ba767bc6a96180c816301f5f7049a3b

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 "Allow a11y listeners to specify handlers" into oc-dev am: efb859f2af
Phil Weaver [Tue, 25 Apr 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Allow a11y listeners to specify handlers" into oc-dev am: efb859f2af
am: 7aa63724c8  -s ours

Change-Id: I83b3c2dc9356af30c8b01d122c1e598cad663d71

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 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 "Reorder USB_STATE updates so config_changed is not replaced."
TreeHugger Robot [Tue, 25 Apr 2017 19:06:47 +0000 (19:06 +0000)]
Merge "Reorder USB_STATE updates so config_changed is not replaced."

7 years agoMerge "Create a metrics events for ag/2085657 (DO disclosure screens)"
TreeHugger Robot [Tue, 25 Apr 2017 19:03:04 +0000 (19:03 +0000)]
Merge "Create a metrics events for ag/2085657 (DO disclosure screens)"

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 "Perf: Fix RemoteViews memory leak" into oc-dev am: 4554332475
Adrian Roos [Tue, 25 Apr 2017 18:54:16 +0000 (18:54 +0000)]
Merge "Perf: Fix RemoteViews memory leak" into oc-dev am: 4554332475
am: f277953d83

Change-Id: I83dc18991a8e29ea70cb152c850f60f78b66006b

7 years agoMerge "Add tracing for onTaskStackChanged" into oc-dev am: f217fc0eff
Jorim Jaggi [Tue, 25 Apr 2017 18:52:24 +0000 (18:52 +0000)]
Merge "Add tracing for onTaskStackChanged" into oc-dev am: f217fc0eff
am: 400e29c8a9

Change-Id: I3b619d7c6983679fc6ddf9481b2b63a1326d801d

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 agoMerge "resolve merge conflicts of a2b0b7381c7e to master"
TreeHugger Robot [Tue, 25 Apr 2017 18:49:21 +0000 (18:49 +0000)]
Merge "resolve merge conflicts of a2b0b7381c7e to master"

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 agoMerge "Move common tar reading parts to separate class."
TreeHugger Robot [Tue, 25 Apr 2017 18:10:48 +0000 (18:10 +0000)]
Merge "Move common tar reading parts to separate class."

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 agoMerge "Update fontchain to read from additional sequences" into oc-dev
Siyamed Sinir [Tue, 25 Apr 2017 17:48:24 +0000 (17:48 +0000)]
Merge "Update fontchain to read from additional sequences" into oc-dev

7 years agoMerge "Fix some "leaks"" into oc-dev
Jorim Jaggi [Tue, 25 Apr 2017 17:48:00 +0000 (17:48 +0000)]
Merge "Fix some "leaks"" into oc-dev
am: 011e07d7fd

Change-Id: I76b3710a55de02d64865210d6272919f6264d903

7 years agoBluetooth: document status value in PHY read/update
Jakub Pawlowski [Tue, 25 Apr 2017 15:07:11 +0000 (08:07 -0700)]
Bluetooth: document status value in PHY read/update

Bug: 37544152
Test: none
Change-Id: I2bac468f833c73cd282b1dac80b6553917996604

7 years agoBluetooth: Add handler parameter to connectGatt
Jakub Pawlowski [Fri, 21 Apr 2017 10:49:00 +0000 (03:49 -0700)]
Bluetooth: Add handler parameter to connectGatt

Bug: 37544152
Test: sl4a GattReadTest GattWriteTest
Change-Id: I043dfefaafe9f3700418f2c855c52aac3644310f

7 years agoUse new GrVkBackendContext::Create api
Greg Daniel [Tue, 25 Apr 2017 17:44:00 +0000 (13:44 -0400)]
Use new GrVkBackendContext::Create api

Test: manual testing

Change-Id: Ia8daebd2e028082a8b3d58f29057648746398735

7 years agoAllow some notifications in a group to be muted
Julia Reynolds [Fri, 21 Apr 2017 14:29:57 +0000 (10:29 -0400)]
Allow some notifications in a group to be muted

Test: cts, runtest systemui-notification
Change-Id: I98b971c496c52f69e039a3a3101f71ac567b538a

7 years agoMerge "Remove Typeface.create" into oc-dev
Seigo Nonaka [Tue, 25 Apr 2017 17:39:20 +0000 (17:39 +0000)]
Merge "Remove Typeface.create" into oc-dev
am: 0a7096dccb

Change-Id: I2a454b2cafe187d369d7e6faf1f3fe9a0be05f08

7 years agoMerge "Update PACKAGE_REMOVED broadcast." into oc-dev
Dmitry Dementyev [Tue, 25 Apr 2017 17:34:39 +0000 (17:34 +0000)]
Merge "Update PACKAGE_REMOVED broadcast." into oc-dev
am: 257ba8946e

Change-Id: I9f902dd133d89298220fcc313f5e381113973f4c

7 years agoMerge "Fix some "leaks"" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 17:32:57 +0000 (17:32 +0000)]
Merge "Fix some "leaks"" into oc-dev

7 years agoUpdate fontchain to read from additional sequences
Siyamed Sinir [Thu, 20 Apr 2017 01:18:35 +0000 (18:18 -0700)]
Update fontchain to read from additional sequences

Test: make fontchain_lint

Bug: 37520224
Bug: 37169477
Change-Id: Ie01a2aca85314701654cc2397f0bcf8eafdbe608

7 years agoMerge "Remove Typeface.create" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 17:26:58 +0000 (17:26 +0000)]
Merge "Remove Typeface.create" into oc-dev

7 years agoMerge "Allow a11y listeners to specify handlers" into oc-dev
Phil Weaver [Tue, 25 Apr 2017 17:26:41 +0000 (17:26 +0000)]
Merge "Allow a11y listeners to specify handlers" into oc-dev
am: efb859f2af

Change-Id: Ifcee49e39f57d5991c15ebf7a2fa4f0fa3a53edf

7 years agoMerge "Update PACKAGE_REMOVED broadcast." into oc-dev
Dmitry Dementyev [Tue, 25 Apr 2017 17:22:30 +0000 (17:22 +0000)]
Merge "Update PACKAGE_REMOVED broadcast." into oc-dev

7 years agoMerge "Allow a11y listeners to specify handlers" into oc-dev
Phil Weaver [Tue, 25 Apr 2017 17:17:58 +0000 (17:17 +0000)]
Merge "Allow a11y listeners to specify handlers" into oc-dev

7 years agoresolve merge conflicts of a2b0b7381c7e to master
Jason Monk [Tue, 25 Apr 2017 17:16:45 +0000 (13:16 -0400)]
resolve merge conflicts of a2b0b7381c7e to master

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

7 years agoMerge "Perf: Fix RemoteViews memory leak" into oc-dev
Adrian Roos [Tue, 25 Apr 2017 17:15:38 +0000 (17:15 +0000)]
Merge "Perf: Fix RemoteViews memory leak" into oc-dev
am: 4554332475

Change-Id: I6f61ecea304c12ef965ad1ed2734c45dc4cee91d

7 years agoMerge "Add tracing for onTaskStackChanged" into oc-dev
Jorim Jaggi [Tue, 25 Apr 2017 17:12:08 +0000 (17:12 +0000)]
Merge "Add tracing for onTaskStackChanged" into oc-dev
am: f217fc0eff

Change-Id: I81db6d37d9c7a635b33353f0c98790029cb7de14

7 years agoMerge "Perf: Fix RemoteViews memory leak" into oc-dev
Adrian Roos [Tue, 25 Apr 2017 17:09:19 +0000 (17:09 +0000)]
Merge "Perf: Fix RemoteViews memory leak" into oc-dev

7 years agoMerge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18...
Pankaj Kanwar [Tue, 25 Apr 2017 17:05:16 +0000 (17:05 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18 am: d6465983f1 am: df2d829272  -s ours
am: 8c4cd989ae

Change-Id: I3d6add78d2394532ef504d828028ca5ac34d60f1

7 years agoMerge "Fix crash in plugin settings" into oc-dev
Jason Monk [Tue, 25 Apr 2017 17:03:59 +0000 (17:03 +0000)]
Merge "Fix crash in plugin settings" into oc-dev
am: 133eb460bd

Change-Id: I60b8fb3a05b46fef7375dd9dddafc5137f0624b0

7 years agoMerge "Add tracing for onTaskStackChanged" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 17:01:42 +0000 (17:01 +0000)]
Merge "Add tracing for onTaskStackChanged" into oc-dev

7 years agoMerge changes I3d96f55a,I581c100b,I5c424160
Juan Lang [Tue, 25 Apr 2017 17:00:38 +0000 (17:00 +0000)]
Merge changes I3d96f55a,I581c100b,I5c424160

* changes:
  Count and log the number of consecutive rapid power button presses.
  Add tests for MetricsLogger events.
  Add unit tests for power button-related pieces of the GestureLauncherService.

7 years agoMerge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18...
Pankaj Kanwar [Tue, 25 Apr 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18 am: d6465983f1
am: df2d829272  -s ours

Change-Id: I473b82e8a664634c84ad97e409254addee2b8d60

7 years agoMerge "Fix crash in plugin settings" into oc-dev
Jason Monk [Tue, 25 Apr 2017 16:56:32 +0000 (16:56 +0000)]
Merge "Fix crash in plugin settings" into oc-dev

7 years agoMerge "Fix BandConfig parcelable deserialization to properly interpret subclass data."
Tomasz Wasilczyk [Tue, 25 Apr 2017 16:55:26 +0000 (16:55 +0000)]
Merge "Fix BandConfig parcelable deserialization to properly interpret subclass data."

7 years agoMerge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings...
Antony Sargent [Tue, 25 Apr 2017 16:45:03 +0000 (16:45 +0000)]
Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev am: 3036e728e7
am: 8288594294

Change-Id: I6ae9f188bd2c25ccf3f6a0e8753e9b5e29b116ab

7 years agoRemove Typeface.create
Seigo Nonaka [Thu, 20 Apr 2017 21:27:32 +0000 (14:27 -0700)]
Remove Typeface.create

Test: Manually done
Bug: 37514611
Bug: 37463988
Bug: 37281200
Change-Id: Ida704af910e0ae195b96803de506fa1e1d66c9f5

7 years agoMerge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings...
Antony Sargent [Tue, 25 Apr 2017 16:38:35 +0000 (16:38 +0000)]
Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev
am: 3036e728e7

Change-Id: I409d7902c2dcb20bf5b31c3bc0c4719adcee6596

7 years agoMerge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings...
Antony Sargent [Tue, 25 Apr 2017 16:30:54 +0000 (16:30 +0000)]
Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev

7 years agoMake new onFill/onSave methods abstract.
Felipe Leme [Tue, 25 Apr 2017 16:19:49 +0000 (09:19 -0700)]
Make new onFill/onSave methods abstract.

Test: CtsAutoFillServiceTestCases pass
Test: manual verification

Bug: 37563972

Change-Id: I1447bcc3ac03b3cbf71362f370abedb9f00152b9

7 years agoFix javadoc to clearly express units and base for time value.
Pavel Grafov [Tue, 25 Apr 2017 11:12:25 +0000 (12:12 +0100)]
Fix javadoc to clearly express units and base for time value.

Bug: 37622877
Test: it's just javadoc.
Change-Id: I285b20f9ff6b82279f215879797fa263b318269a

7 years agoMerge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18
Pankaj Kanwar [Tue, 25 Apr 2017 16:20:51 +0000 (16:20 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am: 41f48e3f18
am: d6465983f1

Change-Id: I0660aab378b2deee3f52e710a0a413b806dd0792

7 years agoMerge "Explicitly wait for the WebView Zygote." into oc-dev am: 3202c10207
Gustav Sennton [Tue, 25 Apr 2017 16:16:34 +0000 (16:16 +0000)]
Merge "Explicitly wait for the WebView Zygote." into oc-dev am: 3202c10207
am: 60237ac50f

Change-Id: Ia6a54e429a38a444c7f4954963b4391a736a3f70

7 years agoMove common tar reading parts to separate class.
Artem Iglikov [Tue, 25 Apr 2017 13:48:05 +0000 (14:48 +0100)]
Move common tar reading parts to separate class.

This moves part of the common code for reading tar files from
PerformAdbRestoreTask and FullRestoreEngine to it's own class.

Change is mostly automated, but with some manual intervention which
doesn't change behaviour.

Bug: 37519282
Test: cts,gts,pts
Change-Id: I669b848e16196ae76fb9e820b786bbe248985e47

7 years agoMerge "Provide an API to make USSD calls and read the responses."
Pankaj Kanwar [Tue, 25 Apr 2017 16:14:14 +0000 (16:14 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
am: 41f48e3f18

Change-Id: Ia3244783e5df300ae6f8a4ad553e15e7e72f7965

7 years agoMerge "Explicitly wait for the WebView Zygote." into oc-dev
Gustav Sennton [Tue, 25 Apr 2017 16:10:33 +0000 (16:10 +0000)]
Merge "Explicitly wait for the WebView Zygote." into oc-dev
am: 3202c10207

Change-Id: I86b040d6ebb0ab8255351c27d92b7d2a818ed60a

7 years agoMerge "Provide an API to make USSD calls and read the responses."
Pankaj Kanwar [Tue, 25 Apr 2017 16:08:25 +0000 (16:08 +0000)]
Merge "Provide an API to make USSD calls and read the responses."

7 years agoMerge "Explicitly wait for the WebView Zygote." into oc-dev
Gustav Sennton [Tue, 25 Apr 2017 16:05:53 +0000 (16:05 +0000)]
Merge "Explicitly wait for the WebView Zygote." into oc-dev

7 years agoMerge "VolumeShaper: API change for duration" into oc-dev am: 44515357ce
Jean-Michel Trivi [Tue, 25 Apr 2017 15:51:51 +0000 (15:51 +0000)]
Merge "VolumeShaper: API change for duration" into oc-dev am: 44515357ce
am: d4561d4a90

Change-Id: Ieac8c4ff551537534eec88076d92557b90a052d9