OSDN Git Service
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
Chen Xu [Tue, 25 Apr 2017 22:10:21 +0000 (22:10 +0000)]
Merge "Add VisualVoicemailService" am:
8c6925a88f
am:
ac78d9ae25
Change-Id: I541ad952ccab5a466e9d26c11478cc18fa69ddc0
Chen Xu [Tue, 25 Apr 2017 22:04:07 +0000 (22:04 +0000)]
Merge "Add VisualVoicemailService"
am:
8c6925a88f
Change-Id: I248baea501c4e1a47981e3aecfe476f89440f0af
Chen Xu [Tue, 25 Apr 2017 21:54:51 +0000 (21:54 +0000)]
Merge "Add VisualVoicemailService"
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
Seigo Nonaka [Tue, 25 Apr 2017 21:40:35 +0000 (21:40 +0000)]
Merge "Font provider cleaning ups." 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
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
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
TreeHugger Robot [Tue, 25 Apr 2017 21:26:09 +0000 (21:26 +0000)]
Merge "Remove underscore from Companion service name" 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
TreeHugger Robot [Tue, 25 Apr 2017 21:07:48 +0000 (21:07 +0000)]
Merge "Add tests for iconSpaceReserved attribute in Preference" 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
TreeHugger Robot [Tue, 25 Apr 2017 20:58:33 +0000 (20:58 +0000)]
Merge "Switch ActivityRecord last reported config. to MergeConfiguration" 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
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
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
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
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
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
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
TreeHugger Robot [Tue, 25 Apr 2017 20:36:53 +0000 (20:36 +0000)]
Merge "Fixed issue with turn-screen-on activities" 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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Tue, 25 Apr 2017 19:45:42 +0000 (19:45 +0000)]
Merge "Add getVisualVoicemailSettings()" into oc-dev
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
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
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
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
Treehugger Robot [Tue, 25 Apr 2017 19:36:35 +0000 (19:36 +0000)]
Merge "Bluetooth: expand comments on new PHY constants"
Treehugger Robot [Tue, 25 Apr 2017 19:36:20 +0000 (19:36 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt"
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
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
Phil Weaver [Tue, 25 Apr 2017 19:25:18 +0000 (19:25 +0000)]
Merge "Remove a11y web flags and associated settings" 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
Treehugger Robot [Tue, 25 Apr 2017 19:20:40 +0000 (19:20 +0000)]
Merge "Bluetooth: document status value in PHY read/update"
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
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
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
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
TreeHugger Robot [Tue, 25 Apr 2017 18:58:53 +0000 (18:58 +0000)]
Merge "Do not deliver INSTALL_SHORTCUT." 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
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.
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
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
TreeHugger Robot [Tue, 25 Apr 2017 18:31:07 +0000 (18:31 +0000)]
Merge "Make new onFill/onSave methods abstract." 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
Tony Wickham [Tue, 25 Apr 2017 18:16:50 +0000 (18:16 +0000)]
Merge "Address API Review comments" into oc-dev
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
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
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
Peng Xu [Tue, 25 Apr 2017 17:51:20 +0000 (17:51 +0000)]
Merge "sensors: fix concurrent modification exception" into oc-dev
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
Siyamed Sinir [Tue, 25 Apr 2017 17:48:24 +0000 (17:48 +0000)]
Merge "Update fontchain to read from additional sequences" 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
Jakub Pawlowski [Fri, 21 Apr 2017 11:26:12 +0000 (04:26 -0700)]
Bluetooth: expand comments on new PHY constants
Bug:
37544152
Test: the all-knowing eyes of the reviewers
Change-Id: I8f5a756a204fe90960700e1dc42f64824d3b844a
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
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
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
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
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
TreeHugger Robot [Tue, 25 Apr 2017 17:32:57 +0000 (17:32 +0000)]
Merge "Fix some "leaks"" into oc-dev
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
TreeHugger Robot [Tue, 25 Apr 2017 17:26:58 +0000 (17:26 +0000)]
Merge "Remove Typeface.create" 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
Dmitry Dementyev [Tue, 25 Apr 2017 17:22:30 +0000 (17:22 +0000)]
Merge "Update PACKAGE_REMOVED broadcast." into oc-dev
Fan Zhang [Tue, 25 Apr 2017 16:52:38 +0000 (09:52 -0700)]
Add tests for iconSpaceReserved attribute in Preference
Change-Id: Id789f3ab6c0c5f864d08bd21966c2e1fea00473d
Fix:
37572025
Test: runtest --path ...
Phil Weaver [Tue, 25 Apr 2017 17:17:58 +0000 (17:17 +0000)]
Merge "Allow a11y listeners to specify handlers" 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
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
Adrian Roos [Tue, 25 Apr 2017 17:09:19 +0000 (17:09 +0000)]
Merge "Perf: Fix RemoteViews memory leak" 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
TreeHugger Robot [Tue, 25 Apr 2017 17:01:42 +0000 (17:01 +0000)]
Merge "Add tracing for onTaskStackChanged" into oc-dev
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
Jason Monk [Tue, 25 Apr 2017 16:56:32 +0000 (16:56 +0000)]
Merge "Fix crash in plugin settings" into oc-dev
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
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
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
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
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
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
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
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
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."
Gustav Sennton [Tue, 25 Apr 2017 16:05:53 +0000 (16:05 +0000)]
Merge "Explicitly wait for the WebView Zygote." into oc-dev
Jean-Michel Trivi [Tue, 25 Apr 2017 15:42:21 +0000 (15:42 +0000)]
Merge "VolumeShaper: API change for duration" into oc-dev
am:
44515357ce
Change-Id: I9bbf338a3c3170bd2304637a197c643c8da0a00f
Wale Ogunwale [Tue, 25 Apr 2017 14:44:21 +0000 (07:44 -0700)]
Fixed issue with turn-screen-on activities
Regression introduced by ag/
2147938 where we set the visibility of an
app to false after pausing because it might have been previously
defered. However, the change did it for all activities regardless of if
it was previously deferred or not. We now only do the visibility change
to false if we previouly deferred.
Change-Id: Ifde46587e1ddf38304b73cec45c56f0acd955f37
Fixes:
37657105
Test: cts.ActivityManagerActivityVisibilityTests#testTurnScreenOnActivity
Jean-Michel Trivi [Tue, 25 Apr 2017 15:36:33 +0000 (15:36 +0000)]
Merge "VolumeShaper: API change for duration" into oc-dev
Adam Lesinski [Tue, 25 Apr 2017 15:33:01 +0000 (15:33 +0000)]
Merge "AAPT2: Add better error message when processing invalid files" into oc-dev
am:
b9dbee430d
Change-Id: I64df2268e9dbc80fe4630c068ad8ee58ced5765e
OSDN Git Service
