OSDN Git Service
Hakan Seyalioglu [Thu, 2 Feb 2017 20:16:23 +0000 (20:16 +0000)]
DO NOT MERGE - Check exported status in chooser
am:
e3286c3145
Change-Id: I55a6e9ed942a4542dcdf497e297654b666d88fb0
Peter Qiu [Thu, 2 Feb 2017 19:46:51 +0000 (19:46 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am:
e724f82b3d am:
281fae21f8
am:
eeeb10c645
Change-Id: Ib218b76e03bb6a6082113d27ec514b03f2348b6e
Peter Qiu [Thu, 2 Feb 2017 19:42:51 +0000 (19:42 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am:
e724f82b3d
am:
281fae21f8
Change-Id: I1baeb7afdff6fbc399ab16ef7aa266506ef7aacb
Peter Qiu [Thu, 2 Feb 2017 19:37:50 +0000 (19:37 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field"
am:
e724f82b3d
Change-Id: I250566dbd8dff8c50692e47b1b3e9bb7568bb8b4
Manu Cornet [Thu, 2 Feb 2017 19:30:29 +0000 (19:30 +0000)]
Merge "2D Recents: Less drastic scale reduction for dismiss animation" into nyc-mr2-dev
am:
c01308a03c
Change-Id: Ie25f4dffc768f99f99de72f6ac56692dd4c2fc82
Manu Cornet [Thu, 2 Feb 2017 19:30:21 +0000 (19:30 +0000)]
2D Recents: Less drastic scale reduction for dismiss animation
am:
8ea36af22b
Change-Id: Ie90263b3eff6ecc7b469fe7c6fa028c2ff1afc62
Treehugger Robot [Thu, 2 Feb 2017 19:29:51 +0000 (19:29 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field"
Suprabh Shukla [Thu, 2 Feb 2017 19:29:02 +0000 (19:29 +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:
674cefc5f5
Change-Id: Ib8471fb2dd4f3939fb603fb324d0955f8242ce5f
Manu Cornet [Thu, 2 Feb 2017 19:26:58 +0000 (19:26 +0000)]
Merge "2D Recents: Fix issues with thumbnail scaling transitions" into nyc-mr2-dev
am:
f41a8c5a3d
Change-Id: I2aa5e9e671d6c206c87792d2c3759c4e797f4ee2
Manu Cornet [Thu, 2 Feb 2017 19:26:43 +0000 (19:26 +0000)]
2D Recents: Fix issues with thumbnail scaling transitions
am:
57b6149f8b
Change-Id: Iacd79a63699736c9b8fb7794d45bc8891c57b513
Makoto Onuki [Thu, 2 Feb 2017 19:23:21 +0000 (19:23 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
2317451acc am:
01f971dcdc am:
963cba5b5b am:
f1e276384d -s ours
am:
3d45f12cad -s ours
Change-Id: I45d90081978d31863b6b29701fbf1cd051699053
Philip P. Moltmann [Thu, 2 Feb 2017 19:21:45 +0000 (19:21 +0000)]
Merge "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" into nyc-mr2-dev
am:
65924030d6
Change-Id: Ib41328d4c9759d521cf2b27327ca0bc0baa5591a
Philip P. Moltmann [Thu, 2 Feb 2017 19:21:40 +0000 (19:21 +0000)]
[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms
am:
2fc44947dd
Change-Id: Ie0bb1c0c23928318cbaf3dc22ca0aa6761bbfa75
Paul Lawrence [Thu, 2 Feb 2017 18:38:09 +0000 (18:38 +0000)]
Merge "Install seccomp into zygote not init" am:
ba9bbd8517 am:
dcf63748fc
am:
5a389e7e44
Change-Id: Ibe0c3f397e820609401a53d18177691181ab7f49
Paul Lawrence [Thu, 2 Feb 2017 18:37:22 +0000 (18:37 +0000)]
Install seccomp into zygote not init am:
ef85477470 am:
521d25294b
am:
e6e8c7a1dd
Change-Id: I97d2843a2c2940b558f216cf550891a80963be54
Alex Deymo [Thu, 2 Feb 2017 18:33:57 +0000 (18:33 +0000)]
Merge "Compile native network functionis into libandroid_net." am:
b1cb60d920 am:
5292c727b7
am:
b92ba328e4
Change-Id: I1ef1f2caebed6e7eab3a68981886a0bdd758c0e9
Alex Deymo [Thu, 2 Feb 2017 18:32:23 +0000 (18:32 +0000)]
Compile native network functionis into libandroid_net. am:
f3b7411060 am:
af657d14fc
am:
74a410ec81
Change-Id: I0072d540b707d217b28bc6f1ba0a6947bb812639
Paul Lawrence [Thu, 2 Feb 2017 18:31:42 +0000 (18:31 +0000)]
Merge "Install seccomp into zygote not init" am:
ba9bbd8517
am:
dcf63748fc
Change-Id: I7cb6ff86a8466aa0ca45691b2d169b4b7467bd9a
Paul Lawrence [Thu, 2 Feb 2017 18:30:49 +0000 (18:30 +0000)]
Install seccomp into zygote not init am:
ef85477470
am:
521d25294b
Change-Id: I7c2c84a5bd67490070777d11d7f930c5dba90cbe
Hakan Seyalioglu [Mon, 30 Jan 2017 19:14:48 +0000 (11:14 -0800)]
DO NOT MERGE - Check exported status in chooser
Relevant change in master is ag/
1844170
bug:
34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
Alex Deymo [Thu, 2 Feb 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Compile native network functionis into libandroid_net." am:
b1cb60d920
am:
5292c727b7
Change-Id: I81f4a2ecf25fe324afa78b5dfb9fd4f7d264e1c6
Alex Deymo [Thu, 2 Feb 2017 18:23:21 +0000 (18:23 +0000)]
Compile native network functionis into libandroid_net. am:
f3b7411060
am:
af657d14fc
Change-Id: Ic8e457c36a35afd296ae97704e0703dbae781d40
Paul Lawrence [Thu, 2 Feb 2017 18:18:15 +0000 (18:18 +0000)]
Merge "Install seccomp into zygote not init"
am:
ba9bbd8517
Change-Id: I989c34f133e37b68dbd387b263dc5191ac8d6215
Paul Lawrence [Thu, 2 Feb 2017 18:18:08 +0000 (18:18 +0000)]
Install seccomp into zygote not init
am:
ef85477470
Change-Id: I22745a759cc4f9797cb3c806bbdd4d69d6cccdcb
Alex Deymo [Thu, 2 Feb 2017 18:16:45 +0000 (18:16 +0000)]
Merge "Compile native network functionis into libandroid_net."
am:
b1cb60d920
Change-Id: Ia0cf31b962cd26b9c7d1d4917b3523e7f3fbfa2c
Alex Deymo [Thu, 2 Feb 2017 18:11:40 +0000 (18:11 +0000)]
Compile native network functionis into libandroid_net.
am:
f3b7411060
Change-Id: Ib01eaf11caacb35ba905012f06d0777d237dd2d1
Paul Lawrence [Thu, 2 Feb 2017 18:09:17 +0000 (18:09 +0000)]
Merge "Install seccomp into zygote not init"
Treehugger Robot [Thu, 2 Feb 2017 17:59:52 +0000 (17:59 +0000)]
Merge "Compile native network functionis into libandroid_net."
Paul Lawrence [Tue, 31 Jan 2017 17:54:31 +0000 (09:54 -0800)]
Install seccomp into zygote not init
Bug:
34710876
Test: Boots, correct size filter installed, blocks unallowed calls
Change-Id: I3e66e8724ace37f7d30451b98a5e574766252ea0
Manu Cornet [Thu, 2 Feb 2017 15:51:53 +0000 (15:51 +0000)]
Merge "2D Recents: Less drastic scale reduction for dismiss animation" into nyc-mr2-dev
Hugo Benichi [Thu, 2 Feb 2017 07:33:33 +0000 (07:33 +0000)]
Merge "Revert "Merge "Define Network notification proto constants." am:
05550d9ed8 am:
6236f49f0e am:
7b39349792"" into nyc-mr2-dev-plus-aosp
Hugo Benichi [Thu, 2 Feb 2017 07:32:16 +0000 (07:32 +0000)]
Revert "Merge "Define Network notification proto constants." am:
05550d9ed8 am:
6236f49f0e am:
7b39349792"
This reverts commit
814a59ba829642d09b6d1eaf9bcf06ee44bffad4 because it broke the build by duplicating code that was already there.
Change-Id: I1e32fd9e70629e5725e503ca372fb20c0aa0035d
Erik Kline [Thu, 2 Feb 2017 07:32:09 +0000 (07:32 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am:
c313123afe am:
6f32aa0259
am:
7196e935a8
Change-Id: I2ab05143299f13012dc2a88efca52160e08c6d97
Erik Kline [Thu, 2 Feb 2017 07:27:13 +0000 (07:27 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am:
c313123afe
am:
6f32aa0259
Change-Id: I6828bc3bb094ca8597ca2d8538045758638c374f
Erik Kline [Thu, 2 Feb 2017 07:22:05 +0000 (07:22 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()"
am:
c313123afe
Change-Id: I0ad50fbf38f11b383fd889dc598cfddd47051477
Treehugger Robot [Thu, 2 Feb 2017 07:15:03 +0000 (07:15 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()"
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:57:52 +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: I09011dbff8a5126e7323d650a069a979ede7bc64
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
Manu Cornet [Thu, 2 Feb 2017 02:22:03 +0000 (02:22 +0000)]
Merge "2D Recents: Fix issues with thumbnail scaling transitions" into nyc-mr2-dev
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
Erik Kline [Thu, 26 Jan 2017 09:08:28 +0000 (18:08 +0900)]
Add ConnectivityManager.networkCapabilitiesForType()
This static method returns a NetworkCapabilities instance with
transports and capabilities set according to the given legacy type.
Also:
- add NetworkRequest.Builder.setCapabilities(), to be able to use
the NetworkCapabilities instances returned from the above
- update UpstreamNetworkMonitor to make immediate use of this
Test: as follows
- build (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- WiFi to DUN upstream tethering works
Bug:
32163131
Change-Id: Idfe1ddd2815c355cbf27cf29eb0e3de177de84e9
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 -s ours
Change-Id: I7bca9ba27360ef311bb82356ca16643bc2ff82a2
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
TreeHugger Robot [Wed, 1 Feb 2017 23:08:53 +0000 (23:08 +0000)]
Merge "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" into nyc-mr2-dev
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
OSDN Git Service
