Peter Qiu
d26acda230
hotspot2: update Passpoint intent definitions am: 5679145d9a
...
am: c4d5850d3e
2017-03-14 16:32:45 +00:00
Peter Qiu
c4d5850d3e
hotspot2: update Passpoint intent definitions
...
am: 5679145d9a
2017-03-14 16:19:19 +00:00
Kenny Guy
9b9158f9f9
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0 am: 11c5ff0399
...
am: d49386eaa5
2017-03-14 12:25:59 +00:00
Kenny Guy
d49386eaa5
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0
...
am: 11c5ff0399
2017-03-14 12:21:00 +00:00
Kenny Guy
11c5ff0399
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3
...
am: 00b77edec0
2017-03-14 12:16:23 +00:00
Kenny Guy
00b77edec0
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0
...
am: c5d86736d3
2017-03-14 12:11:54 +00:00
Kenny Guy
c5d86736d3
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev
...
am: 2df7f9f9c0
2017-03-14 12:07:26 +00:00
Kenny Guy
2df7f9f9c0
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev
2017-03-14 12:01:57 +00:00
Erik Kline
eb04c52063
Merge "Address some comments on IpManagerTest" am: b2afa1ede5
...
am: dea2371e71
2017-03-14 06:13:10 +00:00
Erik Kline
dea2371e71
Merge "Address some comments on IpManagerTest"
...
am: b2afa1ede5
2017-03-14 06:08:34 +00:00
Treehugger Robot
b2afa1ede5
Merge "Address some comments on IpManagerTest"
2017-03-14 06:00:35 +00:00
Erik Kline
246bc1f795
Address some comments on IpManagerTest
...
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug: 26991160
Change-Id: Ib543874188537e31422206d67d1760762a7c85cd
2017-03-14 13:02:49 +09:00
Erik Kline
4e8ae3eddc
Merge "Skeleton of an IpManagerTest" am: db4333a2c2
...
am: cf07e0d541
2017-03-14 03:19:56 +00:00
Erik Kline
cf07e0d541
Merge "Skeleton of an IpManagerTest"
...
am: db4333a2c2
2017-03-14 03:11:15 +00:00
Treehugger Robot
db4333a2c2
Merge "Skeleton of an IpManagerTest"
2017-03-14 03:02:20 +00:00
Erik Kline
aa95ae57ec
Skeleton of an IpManagerTest
...
Test: as follows
- biult (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug: 26991160
Change-Id: Idddddf0c1a7a8d0a8acff8a5526b02a533d5f3ec
2017-03-14 10:19:52 +09:00
fionaxu
7c825ee40d
Merge "carrier default app notification polish" am: b2bb98e62d
...
am: 921a49f7f8
2017-03-14 01:15:46 +00:00
fionaxu
921a49f7f8
Merge "carrier default app notification polish"
...
am: b2bb98e62d
2017-03-14 01:10:51 +00:00
Treehugger Robot
b2bb98e62d
Merge "carrier default app notification polish"
2017-03-14 00:55:06 +00:00
fionaxu
7c4ad78907
carrier default app notification polish
...
change notification string and app name
Bug: 36002256
Test: Manual
Change-Id: Iec2658850522585157bdc7edd7330ac930bf751d
2017-03-13 16:09:43 -07:00
Jakub Pawlowski
2ebaf34259
Merge "Bluetooth 5 spelling fixes" am: 5465fe0a2d
...
am: 58569de4de
2017-03-13 18:16:24 +00:00
Jakub Pawlowski
58569de4de
Merge "Bluetooth 5 spelling fixes"
...
am: 5465fe0a2d
2017-03-13 18:11:58 +00:00
Jakub Pawlowski
5465fe0a2d
Merge "Bluetooth 5 spelling fixes"
2017-03-13 17:58:26 +00:00
Hiroshi Yamauchi
4c618d8933
Merge "Fix the reset of boosted zygote thread priority." am: 83aceea07d
...
am: 55310df6bc
2017-03-13 17:50:46 +00:00
Jakub Pawlowski
bc2991e866
Bluetooth 5 spelling fixes
...
Bug: 30622771
Test: manual
Change-Id: I46b6486619cc7366e56b25ca48937e6792f53e1d
(cherry picked from commit 53501ad210
2017-03-13 17:48:42 +00:00
Hiroshi Yamauchi
55310df6bc
Merge "Fix the reset of boosted zygote thread priority."
...
am: 83aceea07d
2017-03-13 17:42:50 +00:00
Peter Qiu
5679145d9a
hotspot2: update Passpoint intent definitions
...
Address API Councils comment on the newly added intent definitions
for Passpoint events:
- Use a Parcelable class to represent icon info
- Document all extras that are included for an action
- Document that the new intents will only be sent to registered
receivers, and not manifest receivers
- Rename extras to be more generic
While there, removed the deprecated hidden Passpoint intent
definitions.
Bug: 35857805
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
Merged-In: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
2017-03-13 10:39:04 -07:00
Hiroshi Yamauchi
83aceea07d
Merge "Fix the reset of boosted zygote thread priority."
2017-03-13 17:32:31 +00:00
Hiroshi Yamauchi
04ed650083
Fix the reset of boosted zygote thread priority.
...
This fixes the unexpected priority 112 of the daemon threads
(eg. HeapTaskDaemon). The problem was that when the zygote main
thread's priority is reset, it directly calls setpriority() and fails
to update the priority value in java.lang.Thread, which in turn causes
any threads created by the thread to unexpectedly inherit the boosted
priority. Calling java.lang.Thread.setPriority instead fixes.
(cherry picked from commit 1e3db871e5
2017-03-13 10:31:30 -07:00
Hugo Benichi
3d61c89305
Merge "Minor formatting cleanup to remove overlong line" am: d6998d4bd6
...
am: cc935f5e6d
2017-03-13 07:35:48 +00:00
Hugo Benichi
cc935f5e6d
Merge "Minor formatting cleanup to remove overlong line"
...
am: d6998d4bd6
2017-03-13 07:31:54 +00:00
Hugo Benichi
d6998d4bd6
Merge "Minor formatting cleanup to remove overlong line"
2017-03-13 07:23:06 +00:00
Hugo Benichi
1673f71afb
Merge "ConnectivityManager: unhide methods with Handler argument" am: e940d5458d
...
am: 5c5850d2f0
2017-03-13 07:14:12 +00:00
Hugo Benichi
5c5850d2f0
Merge "ConnectivityManager: unhide methods with Handler argument"
...
am: e940d5458d
2017-03-13 07:09:49 +00:00
Hugo Benichi
e940d5458d
Merge "ConnectivityManager: unhide methods with Handler argument"
2017-03-13 06:58:30 +00:00
Hugo Benichi
bc559bad9d
Merge "Simple cleanups to Tethering" am: 7eaa2ad172
...
am: 921c40c0ce
2017-03-13 00:18:57 +00:00
Hugo Benichi
921c40c0ce
Merge "Simple cleanups to Tethering"
...
am: 7eaa2ad172
2017-03-13 00:14:55 +00:00
Hugo Benichi
7eaa2ad172
Merge "Simple cleanups to Tethering"
2017-03-13 00:03:59 +00:00
Jeff Vander Stoep
7f9630868c
Merge "Move mac_permissions to etc/selinux" am: b063fe384f
...
am: 1376b937ed
2017-03-11 23:36:09 +00:00
Jeff Vander Stoep
1376b937ed
Merge "Move mac_permissions to etc/selinux"
...
am: b063fe384f
2017-03-11 23:30:01 +00:00
Treehugger Robot
b063fe384f
Merge "Move mac_permissions to etc/selinux"
2017-03-11 23:23:09 +00:00
Jeff Vander Stoep
d2820e4e89
Move mac_permissions to etc/selinux
...
Test: Build and boot Marlin
Test: See the following in the logs:
01-01 02:10:28.756 1345 1345 D SELinuxMMAC: Using policy file /system/etc/selinux/plat_mac_permissions.xml
01-01 02:10:28.787 1345 1345 D SELinuxMMAC: Using policy file /vendor/etc/selinux/nonplat_mac_permissions.xml
Bug: 36003167
Change-Id: I97479260eabe14c1b1dcc238d7322016f6b5c4dd
2017-03-10 16:07:04 -08:00
Randy Pan
bb76af7c44
Merge "Add a config for WiFi exponential backoff scan base interval" am: c25e2b79b1
...
am: aa72261023
2017-03-10 23:11:43 +00:00
Randy Pan
aa72261023
Merge "Add a config for WiFi exponential backoff scan base interval"
...
am: c25e2b79b1
2017-03-10 23:08:15 +00:00
Treehugger Robot
c25e2b79b1
Merge "Add a config for WiFi exponential backoff scan base interval"
2017-03-10 22:58:53 +00:00
Paul Duffin
ac4eac8970
Merge "Refactor code incompatible with Mockito 2.7.13" am: 2a3a4f81f9
...
am: 17e5a2d851
2017-03-10 20:47:09 +00:00
Paul Duffin
17e5a2d851
Merge "Refactor code incompatible with Mockito 2.7.13"
...
am: 2a3a4f81f9
2017-03-10 20:43:07 +00:00
Paul Duffin
2a3a4f81f9
Merge "Refactor code incompatible with Mockito 2.7.13"
2017-03-10 20:33:21 +00:00
Randy Pan
9c0c173da2
Add a config for WiFi exponential backoff scan base interval
...
Bug: 36026947
Test: bulid and boot up the phone
Change-Id: I4971c1c7d0fc162ac5934becbdf28fba50d65c11
2017-03-10 09:47:49 -08:00
Etan Cohen
dff2c71b86
Merge "[AWARE] Update network API: make open/encrypted explicit" am: 3dee29581e
...
am: 652aa82d7e
2017-03-10 17:22:01 +00:00
