OSDN Git Service
Hugo Benichi [Thu, 2 Feb 2017 06:52:37 +0000 (06:52 +0000)]
Merge "Define Network notification proto constants." am:
05550d9ed8 am:
6236f49f0e
am:
7b39349792
Change-Id: I3d475b36e505e402d18a3942f557e2823d21416f
Hugo Benichi [Thu, 2 Feb 2017 06:47:35 +0000 (06:47 +0000)]
Merge "Define Network notification proto constants." am:
05550d9ed8
am:
6236f49f0e
Change-Id: Ibb7620ea6946c2649d053859a2a1b55fbb78ed12
Hugo Benichi [Thu, 2 Feb 2017 06:42:32 +0000 (06:42 +0000)]
Merge "Define Network notification proto constants."
am:
05550d9ed8
Change-Id: I3a169ace694ed42c59f3d818f007b638fdf4969f
Hugo Benichi [Thu, 2 Feb 2017 06:36:21 +0000 (06:36 +0000)]
Merge "Define Network notification proto constants."
Erik Kline [Thu, 2 Feb 2017 05:25:05 +0000 (05:25 +0000)]
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am:
603eefd5d5 am:
180a3d07a8
am:
d85f448274
Change-Id: Ia629aa5dbdf10566c28525d9a05b096482db3f2d
Erik Kline [Thu, 2 Feb 2017 05:20:05 +0000 (05:20 +0000)]
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am:
603eefd5d5
am:
180a3d07a8
Change-Id: I9f80a3ff713b4b00136808051a717509f600bb9a
Erik Kline [Thu, 2 Feb 2017 05:15:23 +0000 (05:15 +0000)]
Merge "Add test for repeated calls to registerMobileUpstreamRequest()"
am:
603eefd5d5
Change-Id: I6b2a0d6df70df028ef9b8ff5d689c5a627d8daf8
Treehugger Robot [Thu, 2 Feb 2017 05:07:22 +0000 (05:07 +0000)]
Merge "Add test for repeated calls to registerMobileUpstreamRequest()"
Suprabh Shukla [Thu, 2 Feb 2017 03:03:20 +0000 (03:03 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours am:
773f85ec60 am:
029364c505 am:
2f1b2d82ca am:
ac8f44e387
am:
3ee26841fd
Change-Id: I7b4d65cc7a3d1b4f575d885e1c71b40a52cc90a4
Suprabh Shukla [Thu, 2 Feb 2017 02:57:58 +0000 (02:57 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours am:
773f85ec60 am:
029364c505 am:
2f1b2d82ca
am:
ac8f44e387
Change-Id: I7e4376740ddf167035a3274c19ca5ae3f113a9b0
Suprabh Shukla [Thu, 2 Feb 2017 02:53:21 +0000 (02:53 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours am:
773f85ec60 am:
029364c505
am:
2f1b2d82ca
Change-Id: I8094afc5c919b65d7f180ef9d3ad875f3ea4dacf
Suprabh Shukla [Thu, 2 Feb 2017 02:48:23 +0000 (02:48 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours am:
773f85ec60
am:
029364c505
Change-Id: Ibef494c57a80a7b0d871dd8a80f877816e6897d0
Suprabh Shukla [Thu, 2 Feb 2017 02:43:24 +0000 (02:43 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours
am:
773f85ec60
Change-Id: Ie83cb2dfd89fd808e906a802e16fd1943a898012
Suprabh Shukla [Thu, 2 Feb 2017 02:38:24 +0000 (02:38 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab
am:
588411fc7c -s ours
Change-Id: I1511e5dff681d06161cd18b78e7edaf7eddb897a
Suprabh Shukla [Thu, 2 Feb 2017 02:32:48 +0000 (02:32 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3
am:
2e6bdbeaab
Change-Id: I7e286445a887e467a7de42ce9b27a9dc009e47fd
Suprabh Shukla [Thu, 2 Feb 2017 02:28:13 +0000 (02:28 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8
am:
ab8d3febd3
Change-Id: If42411391fe2010162c51adf48e720e308a650ec
Suprabh Shukla [Thu, 2 Feb 2017 02:21:16 +0000 (02:21 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am:
4ffe72dcc8
Change-Id: Ic7b9ef6484df0b57c8f1ee7a483ef3bda05c7cc7
Makoto Onuki [Thu, 2 Feb 2017 01:25:19 +0000 (01:25 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
2317451acc am:
01f971dcdc am:
963cba5b5b am:
f1e276384d
am:
46bfcb9961 -s ours
Change-Id: Ie1cd5114414daeb1216827563333ed91df873604
Makoto Onuki [Thu, 2 Feb 2017 01:19:52 +0000 (01:19 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
2317451acc am:
01f971dcdc am:
963cba5b5b
am:
f1e276384d
Change-Id: I856ad657b894531f03bc145e033b0cebf4e722cd
Makoto Onuki [Thu, 2 Feb 2017 01:15:44 +0000 (01:15 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
2317451acc am:
01f971dcdc
am:
963cba5b5b
Change-Id: I3a1421f656d1a90970eac6156e0840625662fb17
Makoto Onuki [Thu, 2 Feb 2017 01:10:43 +0000 (01:10 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
2317451acc
am:
01f971dcdc
Change-Id: If5f5e5d47b97e2b8480adc5ca2cb08702056ca87
Makoto Onuki [Thu, 2 Feb 2017 01:03:21 +0000 (01:03 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am:
2317451acc
Change-Id: Id3441141d4feea4c7291350c9670bd59ec017240
Steven Moreland [Wed, 1 Feb 2017 21:03:54 +0000 (21:03 +0000)]
Merge "Cleanup hwbinder getService code." am:
9be24a3040 am:
4ede371d80
am:
ec840d1464
Change-Id: I83a7077f07689dc57ac4d8828508443cc4385292
Steven Moreland [Wed, 1 Feb 2017 20:57:59 +0000 (20:57 +0000)]
Merge "Cleanup hwbinder getService code." am:
9be24a3040
am:
4ede371d80
Change-Id: Ia0f3f88d8881f89cec6939dbb44d7dbbb8da9a7f
Steven Moreland [Wed, 1 Feb 2017 20:53:24 +0000 (20:53 +0000)]
Merge "Cleanup hwbinder getService code."
am:
9be24a3040
Change-Id: Idb75f2c41e6e0fd9c2eb03ef4960e40cb6556308
Treehugger Robot [Wed, 1 Feb 2017 20:46:45 +0000 (20:46 +0000)]
Merge "Cleanup hwbinder getService code."
Brad Ebinger [Wed, 1 Feb 2017 19:53:27 +0000 (19:53 +0000)]
Merge "Turn off Dynamic IMS switching for now" am:
2bb0d95e91 am:
9f1ccbf5f9
am:
cb8180033a
Change-Id: If5baf2ffc7b4010c6598ec730d48602b48738cc2
Brad Ebinger [Wed, 1 Feb 2017 19:49:24 +0000 (19:49 +0000)]
Merge "Turn off Dynamic IMS switching for now" am:
2bb0d95e91
am:
9f1ccbf5f9
Change-Id: If9be849f743e9722ca49543a92d33d09978dc6ce
Brad Ebinger [Wed, 1 Feb 2017 19:44:55 +0000 (19:44 +0000)]
Merge "Turn off Dynamic IMS switching for now"
am:
2bb0d95e91
Change-Id: Ie74b53ca5f0b6463b371368608c793d402878d50
Brad Ebinger [Wed, 1 Feb 2017 19:42:16 +0000 (19:42 +0000)]
Merge "Adds @hide permission granting API for ImsServices" am:
390ec27f9d am:
6734275c2f
am:
fa1dca0ad6
Change-Id: Id2875b5b60401405e31e76eb07968798144df700
Brad Ebinger [Wed, 1 Feb 2017 19:36:47 +0000 (19:36 +0000)]
Merge "Turn off Dynamic IMS switching for now"
Brad Ebinger [Wed, 1 Feb 2017 19:35:56 +0000 (19:35 +0000)]
Merge "Adds @hide permission granting API for ImsServices" am:
390ec27f9d
am:
6734275c2f
Change-Id: I6d502db3362aafcfed426b6598be0bd39dd38890
Brad Ebinger [Wed, 1 Feb 2017 19:30:41 +0000 (19:30 +0000)]
Merge "Adds @hide permission granting API for ImsServices"
am:
390ec27f9d
Change-Id: I0f3d38811925884681d11cf18e12f1b0574d64c6
Treehugger Robot [Wed, 1 Feb 2017 19:24:10 +0000 (19:24 +0000)]
Merge "Adds @hide permission granting API for ImsServices"
Steven Moreland [Wed, 1 Feb 2017 17:58:00 +0000 (09:58 -0800)]
Cleanup hwbinder getService code.
- Remove memory leaks.
- Make sure proper errors are getting thrown.
- Avoid SIGABRT
Test: hidl_test_java
Change-Id: Ia5680fd0ebf83d0f174bf0d8109bf60327be5f9d
Android Build Merger (Role) [Wed, 1 Feb 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Add Wear keycodes to emulator key layout file. am:
119a06ce55 am:
c85e503d52" into nyc-mr2-dev-plus-aosp
Nimrod Gileadi [Wed, 1 Feb 2017 18:02:17 +0000 (18:02 +0000)]
Add Wear keycodes to emulator key layout file. am:
119a06ce55
am:
c85e503d52
Change-Id: I6840265835199d454d735e443fb53228c0ae2fd2
Nimrod Gileadi [Wed, 1 Feb 2017 18:01:45 +0000 (18:01 +0000)]
Add Wear keycodes to emulator key layout file. am:
119a06ce55
am:
9576ce6696
Change-Id: Ic10c9e353a264c60cef3dac79a2fc4b57eebb244
Nimrod Gileadi [Wed, 1 Feb 2017 17:57:16 +0000 (17:57 +0000)]
Add Wear keycodes to emulator key layout file.
am:
119a06ce55
Change-Id: I33d2b0f9b8281c22422677f03d6046a1be0bd94f
Nimrod Gileadi [Wed, 1 Feb 2017 17:57:11 +0000 (17:57 +0000)]
Add Wear keycodes to emulator key layout file.
am:
119a06ce55
Change-Id: Ieb06380c3bd43af7087463543960cc4ee1889050
Erik Kline [Mon, 23 Jan 2017 10:05:28 +0000 (19:05 +0900)]
Add test for repeated calls to registerMobileUpstreamRequest()
Test: as follows
- built
- flashed
- booted
- runtest framework-net passes
Bug:
32163131
Change-Id: I6d2519601b7a9dcfda2917118214a7ceb9dbbb7f
Nimrod Gileadi [Wed, 1 Feb 2017 12:12:00 +0000 (12:12 +0000)]
Add Wear keycodes to emulator key layout file.
The SLEEP keycode is used by Android Wear to indicate a
"palming" gesture (covering the screen with one's hand).
The STEM_* buttons are used for side buttons on Wear.
The keycode values were added to the emulator in
http://r.android.com/330771
Bug:
19996432
Change-Id: Ib90c3b27209b0059ebc1c2cce46cc732a677d557
George Burgess IV [Wed, 1 Feb 2017 07:27:15 +0000 (07:27 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am:
53873df5fe am:
aea873ade0
am:
820768f034
Change-Id: Id9b31425cb8ba05687ff7dfa392b230865ec18e5
George Burgess IV [Wed, 1 Feb 2017 07:21:51 +0000 (07:21 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am:
53873df5fe
am:
aea873ade0
Change-Id: I747d94158c8a1c77f8ae1076c93a3d22f6c22ef5
George Burgess IV [Wed, 1 Feb 2017 07:15:00 +0000 (07:15 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
am:
53873df5fe
Change-Id: I102fb345244f922cb41a5ce31b2de0af8e68bf97
Treehugger Robot [Wed, 1 Feb 2017 07:09:50 +0000 (07:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
Justin Klaassen [Wed, 1 Feb 2017 05:21:01 +0000 (05:21 +0000)]
Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev
am:
42dfcc772b
Change-Id: I8d36badab79c40e5a65a88ca4ed418409cd17e24
Justin Klaassen [Wed, 1 Feb 2017 05:20:56 +0000 (05:20 +0000)]
Enable SMS in carrier demo mode
am:
f8a10959d2
Change-Id: Icc96ba3c6fafa5df0327297ed81f8c8dff8818fe
TreeHugger Robot [Wed, 1 Feb 2017 05:13:58 +0000 (05:13 +0000)]
Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev
Justin Klaassen [Wed, 1 Feb 2017 03:39:57 +0000 (19:39 -0800)]
Enable SMS in carrier demo mode
Fixes:
34861667
Test: manually verified default SMS app works in carrier demo mode.
Change-Id: Ic6f1065954e5bb54c6b78b3d604811333f6863e4
Peter Qiu [Wed, 1 Feb 2017 03:37:58 +0000 (03:37 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function" am:
2ac992fcad am:
9e7725040b
am:
ec61beaa7a
Change-Id: I26269af9bf18789ce40858df0645e17867f44469
Jeremy Joslin [Wed, 1 Feb 2017 03:32:27 +0000 (03:32 +0000)]
Merge "Print the package name and creator UID in dump()." am:
cf7f9dd6a1 am:
ba4bc08dae
am:
9c245a51f7
Change-Id: I33a60ce4525561705572ebaa0fe1851d46c24b63
Peter Qiu [Wed, 1 Feb 2017 03:30:58 +0000 (03:30 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs" am:
59da9b24ca am:
4ed5fe8191
am:
28630218cc
Change-Id: I264d4664bc9e69d9c70dce7ffcf75e3ae2e2e430
Peter Qiu [Wed, 1 Feb 2017 03:30:51 +0000 (03:30 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function" am:
2ac992fcad
am:
9e7725040b
Change-Id: I5b36bb042933a0a889b7f84281b174a7527ccaff
Jeremy Joslin [Wed, 1 Feb 2017 03:25:47 +0000 (03:25 +0000)]
Merge "Print the package name and creator UID in dump()." am:
cf7f9dd6a1
am:
ba4bc08dae
Change-Id: I3f7e2a6ecdbe04fad0358fadecdeb8341baa99eb
Peter Qiu [Wed, 1 Feb 2017 03:24:04 +0000 (03:24 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs" am:
59da9b24ca
am:
4ed5fe8191
Change-Id: I678ec9518c7c88acefd1bb99bcb3add27ca52b87
Peter Qiu [Wed, 1 Feb 2017 03:19:27 +0000 (03:19 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function"
am:
2ac992fcad
Change-Id: I15cec4598a8a97b25c6b8ce62864ccb6b240bfde
Treehugger Robot [Wed, 1 Feb 2017 03:12:12 +0000 (03:12 +0000)]
Merge "hotspot2: implement hashCode() for classes with equals() function"
Lorenzo Colitti [Wed, 1 Feb 2017 03:02:51 +0000 (03:02 +0000)]
Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f am:
2ec8b8bcb6 am:
8fcc6a34f0
am:
10d3007e66
Change-Id: I94fc11a6fba6a9ee47e130284c8abea64244f8a2
Lorenzo Colitti [Wed, 1 Feb 2017 03:01:52 +0000 (03:01 +0000)]
ConnectivityServiceTest: remove remaining poll loops. am:
d2706127d0 am:
54e9050710
am:
67d6d41954
Change-Id: I31681e1248721704a9b792962a2ef5955e375e93
Lorenzo Colitti [Wed, 1 Feb 2017 03:00:41 +0000 (03:00 +0000)]
Remove assertEventuallyTrue as it's unnecessary. am:
30145d755c am:
90a70cac26
am:
90babed246
Change-Id: Ib16f54aeaa783a6e26a9d80e61388cbd9ecd9bd3
Lorenzo Colitti [Wed, 1 Feb 2017 02:59:42 +0000 (02:59 +0000)]
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am:
58ebe1c6f1 am:
0bc8070fce
am:
338241de94
Change-Id: I91f1338f3488cfc60eef0c2147aa7b1d61107cdd
Lorenzo Colitti [Wed, 1 Feb 2017 02:58:24 +0000 (02:58 +0000)]
Attempt to make waitForIdleHandler reliable. am:
ae3ce81cc3 am:
8780a8afeb
am:
943808385a
Change-Id: I2369fbd693b467283232f47703fd471c8ff60c1f
Jeremy Joslin [Wed, 1 Feb 2017 02:50:25 +0000 (02:50 +0000)]
Merge "Print the package name and creator UID in dump()."
am:
cf7f9dd6a1
Change-Id: Ifd7812ff0acba03544a05a3fcea7721da8fe7d0f
Lorenzo Colitti [Wed, 1 Feb 2017 02:50:19 +0000 (02:50 +0000)]
Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f am:
2ec8b8bcb6
am:
8fcc6a34f0
Change-Id: If547b83ddc48d5a0c30ad172bbb2406885d1d5ee
Lorenzo Colitti [Wed, 1 Feb 2017 02:49:23 +0000 (02:49 +0000)]
ConnectivityServiceTest: remove remaining poll loops. am:
d2706127d0
am:
54e9050710
Change-Id: I06815166fe9ab4b7d6ab580a9eda5304067f9f91
Lorenzo Colitti [Wed, 1 Feb 2017 02:48:10 +0000 (02:48 +0000)]
Remove assertEventuallyTrue as it's unnecessary. am:
30145d755c
am:
90a70cac26
Change-Id: I7f6d543a3d05b0b165adc7a7c3938c7081c3f778
Lorenzo Colitti [Wed, 1 Feb 2017 02:47:16 +0000 (02:47 +0000)]
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am:
58ebe1c6f1
am:
0bc8070fce
Change-Id: I0ff0169ebc5e53cc9f57f224225fb0c93dc241ed
Peter Qiu [Wed, 1 Feb 2017 02:46:39 +0000 (02:46 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs"
am:
59da9b24ca
Change-Id: Ide7fa5aee33295bf813dd647fffcb69ce5edf9d8
Lorenzo Colitti [Wed, 1 Feb 2017 02:45:55 +0000 (02:45 +0000)]
Attempt to make waitForIdleHandler reliable. am:
ae3ce81cc3
am:
8780a8afeb
Change-Id: I72c03d3686858631aefdf96e13e8033f27788f8c
Treehugger Robot [Wed, 1 Feb 2017 02:40:59 +0000 (02:40 +0000)]
Merge "Print the package name and creator UID in dump()."
Lorenzo Colitti [Wed, 1 Feb 2017 02:39:35 +0000 (02:39 +0000)]
Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f
am:
2ec8b8bcb6
Change-Id: I2dd27a886aabfe0b4733ee9559886f917ccd921e
Lorenzo Colitti [Wed, 1 Feb 2017 02:39:30 +0000 (02:39 +0000)]
ConnectivityServiceTest: remove remaining poll loops.
am:
d2706127d0
Change-Id: I675096683c8ed4bc0e540491c0ff6aa828114313
Lorenzo Colitti [Wed, 1 Feb 2017 02:38:30 +0000 (02:38 +0000)]
Remove assertEventuallyTrue as it's unnecessary.
am:
30145d755c
Change-Id: Id574b27b40e35fbccac49910867e9735c03118d4
Lorenzo Colitti [Wed, 1 Feb 2017 02:37:31 +0000 (02:37 +0000)]
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker
am:
58ebe1c6f1
Change-Id: I7615c9128deed7011eb9ab6f2efdcfe2e237a1a5
Lorenzo Colitti [Wed, 1 Feb 2017 02:36:22 +0000 (02:36 +0000)]
Attempt to make waitForIdleHandler reliable.
am:
ae3ce81cc3
Change-Id: Id7e23c3a2c885ff239efa577a8d366d3df6ca9a2
Treehugger Robot [Wed, 1 Feb 2017 02:35:19 +0000 (02:35 +0000)]
Merge "hotspot2: update PasspointConfiguration APIs"
Lorenzo Colitti [Wed, 1 Feb 2017 02:25:42 +0000 (02:25 +0000)]
Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f
* changes:
ConnectivityServiceTest: remove remaining poll loops.
Remove assertEventuallyTrue as it's unnecessary.
Rename AvoidBadWifiTracker to MultinetworkPolicyTracker
Attempt to make waitForIdleHandler reliable.
Jeremy Joslin [Wed, 1 Feb 2017 01:48:05 +0000 (01:48 +0000)]
Merge "Post runnables instead of sending messages." am:
71317f4a6c am:
71a4792147
am:
31669e8924
Change-Id: Ia7937ea6d29924e1b717430e8330d81e3f7ee9e3
Jeremy Joslin [Wed, 1 Feb 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Post runnables instead of sending messages." am:
71317f4a6c
am:
71a4792147
Change-Id: Idff8f071f316942e8b520c913e96d3eb8b44227d
Jeremy Joslin [Wed, 1 Feb 2017 01:34:16 +0000 (01:34 +0000)]
Merge "Post runnables instead of sending messages."
am:
71317f4a6c
Change-Id: I13cb1fd38262f869b99245678c89f45b834210c8
Treehugger Robot [Wed, 1 Feb 2017 01:26:04 +0000 (01:26 +0000)]
Merge "Post runnables instead of sending messages."
Selim Cinek [Wed, 1 Feb 2017 01:02:07 +0000 (01:02 +0000)]
Merge "Fixed an issue where heads-upped notifications would stay" into nyc-mr2-dev
am:
e89a950b8b
Change-Id: Ic671da92251b3058e8f13395bebf7a44f3dc0cc3
Selim Cinek [Wed, 1 Feb 2017 01:01:59 +0000 (01:01 +0000)]
Fixed an issue where heads-upped notifications would stay
am:
23301afb8e
Change-Id: I04e8cf3ba5a0f44390c53867a43dacd22812da4e
Selim Cinek [Wed, 1 Feb 2017 00:52:08 +0000 (00:52 +0000)]
Merge "Fixed an issue where heads-upped notifications would stay" into nyc-mr2-dev
George Burgess IV [Tue, 24 Jan 2017 23:59:19 +0000 (15:59 -0800)]
Fix a use-of-uninitialized-value warning
This is the result of running ./gen after applying
I90bea0c94cf8d7f92a0d9a4db4e64e7e563bfb09.
Bug: None
Test: Still builds; warning is now gone.
Change-Id: Ibcd5e8dcec96406b529c5790ba0a2822dace25c2
Brad Ebinger [Tue, 31 Jan 2017 23:36:53 +0000 (15:36 -0800)]
Turn off Dynamic IMS switching for now
The new ImsService implementations must be in place before
ImsResolver/ImsManager can use the new Dynamic ImsService switching
system.
Test: Manual
Change-Id: Ie6454aec08a3f1ebd92271f1c0554c16dc57a868
Selim Cinek [Tue, 31 Jan 2017 22:37:14 +0000 (14:37 -0800)]
Fixed an issue where heads-upped notifications would stay
If a heads up notification was briefly removed right after
it was added it could linger around in systemUI until
the panel collapsed.
We need to make sure not to apply this improvement if
reordering isn't allowed, otherwise it will never time out
Test: existing tests pass
Bug:
34608075
Merged-In: I7768f6111ada30edcb997a42940e5e336efe1cf2
Change-Id: I7768f6111ada30edcb997a42940e5e336efe1cf2
Manu Cornet [Tue, 31 Jan 2017 23:36:52 +0000 (23:36 +0000)]
Merge "2D Recents: Keep nav bar hidden from transition thumbnail" into nyc-mr2-dev
am:
57071e8025
Change-Id: Iff6deb4ffd576de3f96de5c0762f8d692c16db8f
Manu Cornet [Tue, 31 Jan 2017 23:36:44 +0000 (23:36 +0000)]
2D Recents: Keep nav bar hidden from transition thumbnail
am:
b68b765cbf
Change-Id: I4a64e5ef354f16ba1bef1196f1a44bbffbc3c880
Manu Cornet [Tue, 31 Jan 2017 23:31:19 +0000 (23:31 +0000)]
Merge "2D recents: fix layout to show 3 tasks on a single line" into nyc-mr2-dev
am:
abfe26bad7
Change-Id: Id8714f350e775b177bffcfe8ded80a5509b213fe
Manu Cornet [Tue, 31 Jan 2017 23:31:14 +0000 (23:31 +0000)]
2D recents: fix layout to show 3 tasks on a single line
am:
776f6bacd6
Change-Id: I73cda7b837f91b78714db90c06617302201389fd
Manu Cornet [Tue, 31 Jan 2017 23:27:03 +0000 (23:27 +0000)]
Merge "2D Recents: Keep nav bar hidden from transition thumbnail" into nyc-mr2-dev
Manu Cornet [Tue, 31 Jan 2017 23:24:59 +0000 (23:24 +0000)]
Merge "2D recents: fix layout to show 3 tasks on a single line" into nyc-mr2-dev
Jeremy Joslin [Tue, 31 Jan 2017 21:48:21 +0000 (13:48 -0800)]
Print the package name and creator UID in dump().
Add a little more info to help differentiate the registered score
caches during a dump.
Test: adb shell dumpsys network_score
Change-Id: I59cb877b3237aaa85cb564795fb8a41c3d95e315
Peter Qiu [Wed, 25 Jan 2017 20:27:08 +0000 (12:27 -0800)]
hotspot2: implement hashCode() for classes with equals() function
According to API guideline, classes that override equals()
function should override hashCode() as well. Make it so.
Bug:
34198926
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I4c3afed78a2fc06cdc26dd04d076f579b3472139
Peter Qiu [Wed, 25 Jan 2017 00:01:43 +0000 (16:01 -0800)]
hotspot2: update PasspointConfiguration APIs
Based on the API guideline, use of public variables are discouraged.
So update PasspointConfiguration and its associated classes to use
private variables with public accessor methods.
While there, cleanup unit tests to reduce code duplications.
Bug:
34627062
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I6ea45bbcf03aec01c187425a66094fad6098d75d
Makoto Onuki [Wed, 4 Jan 2017 22:36:59 +0000 (14:36 -0800)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.
Test: Manually tested wipeData() with ApiDemos, both on 1) the primary user,
2) a secondary user and 3) work profile.
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Bug
30681079
Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
Merged-in: Ia832bed0f22396998d6307ab46e262dae9463838
(cherry picked from commit
efdec8f5688ce6b0a287eddb6d5dad93ffa0e1ee)
Suprabh Shukla [Tue, 31 Jan 2017 21:01:28 +0000 (13:01 -0800)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.
Bug
30681079
Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
Android Build Merger (Role) [Tue, 31 Jan 2017 20:58:14 +0000 (20:58 +0000)]
Merge "Correct the formula of battery capacity estimation. am:
c800ddc824 am:
d4d476943f" into nyc-mr2-dev-plus-aosp
OSDN Git Service
