OSDN Git Service
Erik Kline [Thu, 20 Apr 2017 13:00:52 +0000 (13:00 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" am:
4c7a999d79
am:
6af3dd0fc3
Change-Id: Icef7c38313576219b4a55eb10648297b18597ef6
Erik Kline [Thu, 20 Apr 2017 12:55:48 +0000 (12:55 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast"
am:
4c7a999d79
Change-Id: I911be691b15604a63aa02bf4db607ae1cd701cfe
Hugo Benichi [Thu, 20 Apr 2017 12:53:22 +0000 (12:53 +0000)]
Merge "ConnectivityManager: remove obsolete callback types" am:
458f75ef69
am:
23ee1621c7
Change-Id: Ib7ff014bd0b7729ca2d02956c190f368963ff632
Treehugger Robot [Thu, 20 Apr 2017 12:47:53 +0000 (12:47 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast"
Hugo Benichi [Thu, 20 Apr 2017 12:47:44 +0000 (12:47 +0000)]
Merge "ConnectivityManager: remove obsolete callback types"
am:
458f75ef69
Change-Id: I180b5ae5890172f14dd910ce3ef3d1c907e3475b
Hugo Benichi [Thu, 20 Apr 2017 12:38:27 +0000 (12:38 +0000)]
Merge "ConnectivityManager: remove obsolete callback types"
Erik Kline [Mon, 17 Apr 2017 07:47:23 +0000 (16:47 +0900)]
Add local-only hotspot info into tether state change broadcast
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug:
31466854
Bug:
32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
Erik Kline [Thu, 20 Apr 2017 04:47:16 +0000 (04:47 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission" am:
fe86a197a1
am:
0d1f04384f
Change-Id: I8c0d0037bace2b9a3992e78dc0f853b92a8e0484
Hugo Benichi [Thu, 20 Apr 2017 04:40:34 +0000 (04:40 +0000)]
Merge "ConnectivityManager: unify prety printing of callback types." am:
0a4dc6a5d2
am:
3a0e92fada
Change-Id: Ie639f2c9685f19ef00ddb4ac937e6e9576998b80
Erik Kline [Thu, 20 Apr 2017 04:38:16 +0000 (04:38 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission"
am:
fe86a197a1
Change-Id: Iee0af54745c3341b2aeeee05690e0377cb807ad9
Hugo Benichi [Thu, 20 Apr 2017 04:35:22 +0000 (04:35 +0000)]
Merge "ConnectivityManager: unify prety printing of callback types."
am:
0a4dc6a5d2
Change-Id: Ifa2d9455b666c068b13973eb1dee2bfb97b7d446
Erik Kline [Thu, 20 Apr 2017 04:28:52 +0000 (04:28 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission"
Hugo Benichi [Thu, 20 Apr 2017 04:28:43 +0000 (04:28 +0000)]
Merge "ConnectivityManager: unify prety printing of callback types."
Hugo Benichi [Thu, 23 Mar 2017 13:40:44 +0000 (22:40 +0900)]
ConnectivityManager: remove obsolete callback types
This patch also:
- suppresses callback triggers from ConnectivityService for these
obsolete callback types.
- marginally refactors callCallbackForRequest().
Test: runtest frameworks-net
Change-Id: Idfb75640732943c599de4975f252f706d21ad594
Hugo Benichi [Wed, 22 Mar 2017 08:07:57 +0000 (17:07 +0900)]
ConnectivityManager: unify prety printing of callback types.
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
Jakub Pawlowski [Wed, 19 Apr 2017 21:44:50 +0000 (21:44 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)" am:
f2e6988350
am:
fc99848b96
Change-Id: Ie3ded1b0237b56bb4c81ad7a51c50b82267bc536
Jakub Pawlowski [Wed, 19 Apr 2017 21:39:11 +0000 (21:39 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)"
am:
f2e6988350
Change-Id: I5b494f00fb88381a7caf95aa206e2fcd373c7129
Jakub Pawlowski [Wed, 19 Apr 2017 21:33:43 +0000 (21:33 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)"
Jakub Pawlowski [Wed, 19 Apr 2017 13:52:08 +0000 (06:52 -0700)]
Expose LE advertiser address for easier PTS tests (1/6)
This patchset adds a hidden method getOwnAddress, that lets app with
BLUETOOTH_PRIVILEGED permission to lear their own addreess. This is done
exclusively for PTS tests.
Bug:
35147497
Test: manual
Change-Id: Iaf0f2fe0613de44b8430ac25e691d66a4ad44f8d
Zheng Zhang [Wed, 19 Apr 2017 18:31:30 +0000 (18:31 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am:
5b84ba3b15 -s ours
am:
74b8c15d2b -s ours
Change-Id: I8f4523d90480e3b56bf223468ba42157fe6e97eb
Zheng Zhang [Wed, 19 Apr 2017 18:26:33 +0000 (18:26 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
am:
5b84ba3b15 -s ours
Change-Id: Ic447d9ee4910f467e8ca6dad7d02693846e4fab8
TreeHugger Robot [Wed, 19 Apr 2017 18:21:43 +0000 (18:21 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev
Jeff Hao [Wed, 19 Apr 2017 17:30:06 +0000 (17:30 +0000)]
Merge "Handle shared libraries for split apks." am:
9487dff8ab
am:
dae160f51b
Change-Id: I3b8fd7be7bf987858df229cfd95ca8d4dc170b54
Jeff Hao [Wed, 19 Apr 2017 17:21:36 +0000 (17:21 +0000)]
Merge "Handle shared libraries for split apks."
am:
9487dff8ab
Change-Id: I3414ba72ba8e3c3fc2d169a2a892c851d2577f3b
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Handle shared libraries for split apks."
Zheng Zhang [Wed, 19 Apr 2017 01:16:33 +0000 (18:16 -0700)]
DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123.
HFP profile config landed late in Emerald development, and was committed
as version 122 there.
When it merged to master, there were conflicts since 122 was already
taken, so it was resolved as version 123.
We didn't catch the subtle bug then:
This means Emerald devices will reset HFP profile config in error once
they upgrade to Feldspar.
Correct this by merging 122, and making 123 a no-op.
Bug:
37338202
Change-Id: Ibf4c824d27300641fd1bb15f5884baf056bd8d7e
Jakub Pawlowski [Wed, 19 Apr 2017 16:13:50 +0000 (16:13 +0000)]
Merge "Read by UUID for PTS tests (1/5)" am:
7826c08e21
am:
0c9c0969cc
Change-Id: Ia850b9ad1d0d2e92a2c987c2c1cd24a44f7cfb3f
Jakub Pawlowski [Wed, 19 Apr 2017 16:04:45 +0000 (16:04 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
am:
7826c08e21
Change-Id: I380a38460b1e00f405fdde0683c40dbc9c5b3807
Tetsutoki Shiozawa [Wed, 16 Mar 2016 14:30:57 +0000 (23:30 +0900)]
Make tetherChangePermission to be secured for AppOps permission
Symptom:
AppOps verified the incorrect package of calling tether state
changing API.
It threw SecurityException by mistake.
Solution:
Pass the correct package name to enforceTetherChangePermission.
Bug:
32931147
Change-Id: Ia1167f26f556678b189a24a4a716f1a7e5cb12eb
Treehugger Robot [Wed, 19 Apr 2017 06:08:48 +0000 (06:08 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
Jeff Hao [Thu, 6 Apr 2017 00:09:59 +0000 (17:09 -0700)]
Handle shared libraries for split apks.
As we dexopt all the code paths of a package, we now append the code
paths to the list of shared libraries. These paths are passed as
relative paths since the apks are staged during installation, and are
not where they will be at runtime.
Part of a multi-project change.
Bug:
34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
Merged-In: I73823ca575560cbd445d78a6cfbfc72031943265
(cherry-picked from commit
16d4843433e024100b4ecd183f827ad5bd8772a6)
Change-Id: I943bf8234899e1b25d4eb5e98af15d9150a7a842
Jaewan Kim [Tue, 18 Apr 2017 23:40:54 +0000 (23:40 +0000)]
Merge "Add callback for AVRCP 1.6 support" am:
58b5789cde
am:
16e5c08cbd
Change-Id: Ie38c7ea468285625a6a0e88d5abfe43bb977b504
Jaewan Kim [Tue, 18 Apr 2017 23:37:26 +0000 (23:37 +0000)]
Merge "Add callback for AVRCP 1.6 support"
am:
58b5789cde
Change-Id: I13633358bb5fbc0bb52808d2e9213434cc27546f
Treehugger Robot [Tue, 18 Apr 2017 23:25:25 +0000 (23:25 +0000)]
Merge "Add callback for AVRCP 1.6 support"
nharold [Tue, 18 Apr 2017 22:02:48 +0000 (22:02 +0000)]
Merge changes from topic 'ipsec-hide-overloads' am:
fe358c6adf
am:
8508bc52d2
Change-Id: I114e0175d72cdbabf47ed230b2971b57a6c210f1
Nathan Harold [Tue, 18 Apr 2017 22:01:32 +0000 (22:01 +0000)]
Consistenly Throw IOExceptions from IpSecManager am:
0bfb207532
am:
5db180bbb7
Change-Id: I85ec1413eff50887853f13fa02dcc461071fb210
nharold [Tue, 18 Apr 2017 21:51:25 +0000 (21:51 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
am:
fe358c6adf
Change-Id: Ia28149a13cae7b5bdcb6f41d1f6cd4d37fbaf88b
Nathan Harold [Tue, 18 Apr 2017 21:50:30 +0000 (21:50 +0000)]
Consistenly Throw IOExceptions from IpSecManager
am:
0bfb207532
Change-Id: I42f4526b43a8de19178a23e5106596f94050c1d4
Jakub Pawlowski [Fri, 14 Apr 2017 14:21:20 +0000 (07:21 -0700)]
Read by UUID for PTS tests (1/5)
Add a hidden api for reading characteristic by UUID for PTS.
Bug:
35150313
Test: sl4a GattReadTest.byUuid
Change-Id: Ice4076d99e4694d20374ba0fdcae74d5ae841147
Jaewan Kim [Fri, 3 Feb 2017 07:21:38 +0000 (16:21 +0900)]
Add callback for AVRCP 1.6 support
Bug:
33828042
Test: Build
Change-Id: Iaf5cecfa38065cfeed096929952559d7cb2e248b
Erik Wolsheimer [Tue, 18 Apr 2017 20:09:31 +0000 (20:09 +0000)]
DO NOT MERGE Mask case of base or tree permission being null am:
cb8a640cef
am:
28fc6a28aa
Change-Id: Ia0dab8845a34753ed46199462a9e12c25f9a615f
Erik Wolsheimer [Tue, 18 Apr 2017 20:03:46 +0000 (20:03 +0000)]
DO NOT MERGE Mask case of base or tree permission being null
am:
cb8a640cef
Change-Id: I43289a33b8e1e6df9307cd11891feff4d739da14
Erik Wolsheimer [Tue, 18 Apr 2017 16:27:31 +0000 (09:27 -0700)]
DO NOT MERGE Mask case of base or tree permission being null
Bug:
34850544
Change-Id: I4bf9e85d7e615ccdb75752503e58d7e7f47b04c2
nharold [Tue, 18 Apr 2017 18:35:20 +0000 (18:35 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
* changes:
Hide Socket+DatagramSocket IpSecTransform methods
Consistenly Throw IOExceptions from IpSecManager
Erik Kline [Tue, 18 Apr 2017 08:55:13 +0000 (08:55 +0000)]
Merge "Flatten the transitions to tethering and hotspot." am:
af5f00ee5e
am:
22b9eb972e
Change-Id: Idadc3d15c58a9cc6ac28784e3d507b4d2a83755a
Erik Kline [Tue, 18 Apr 2017 08:50:09 +0000 (08:50 +0000)]
Merge "Flatten the transitions to tethering and hotspot."
am:
af5f00ee5e
Change-Id: I0dd0a95e29b645d018d4d4f44696c2339f5d1127
Lorenzo Colitti [Tue, 18 Apr 2017 08:40:41 +0000 (08:40 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" am:
a9cbda5bd8
am:
1d82eb0612
Change-Id: I05548901d1fddb67775bf2079c769b6bbc2b194c
Treehugger Robot [Tue, 18 Apr 2017 08:39:40 +0000 (08:39 +0000)]
Merge "Flatten the transitions to tethering and hotspot."
Lorenzo Colitti [Tue, 18 Apr 2017 08:30:13 +0000 (08:30 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier"
am:
a9cbda5bd8
Change-Id: I1cad06f1296a9c94a9184d8424f7fc57c8f41adb
Lorenzo Colitti [Tue, 18 Apr 2017 08:22:51 +0000 (08:22 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier"
Nathan Harold [Tue, 18 Apr 2017 02:34:33 +0000 (19:34 -0700)]
Hide Socket+DatagramSocket IpSecTransform methods
These methods do not currently work for IPv4 sockets,
so they need to be hidden until the underlying kernel
code can be made to work properly in a dual-stack
environment.
Bug:
36073210
Test: compilation
Change-Id: Idce367f638a42da374a7f1dc5ebb8931c9555e06
Nathan Harold [Tue, 18 Apr 2017 00:11:58 +0000 (17:11 -0700)]
Consistenly Throw IOExceptions from IpSecManager
Bug:
36073210
Test: api-update
Change-Id: Ia3825e85b09b6330f1326a26cf9e1cadf9dacf71
Yifan Hong [Mon, 17 Apr 2017 18:35:52 +0000 (18:35 +0000)]
Merge changes from topic 'vintf_check_compat_native' am:
6d033475b3
am:
4fccec4f81
Change-Id: Ib2691dd7d9b35d20ac71b50a090392e736b51bf7
Yifan Hong [Mon, 17 Apr 2017 18:27:00 +0000 (18:27 +0000)]
Merge changes from topic 'vintf_check_compat_native'
am:
6d033475b3
Change-Id: I7cc64ab9938d17848379537b57d7092c0968c6a3
Jordan Liu [Mon, 17 Apr 2017 18:21:56 +0000 (18:21 +0000)]
Merge "Update api for ServiceStateProvider" am:
286b5f117d
am:
ea4a67ddd1
Change-Id: Ib0ac43e24dbd4b1c0f037f6f3f3bc81b9acbae62
Jordan Liu [Mon, 17 Apr 2017 18:14:23 +0000 (18:14 +0000)]
Merge "Update api for ServiceStateProvider"
am:
286b5f117d
Change-Id: I8404dad9be43a0ea41a973d289014a4fe1529ab3
Yifan Hong [Mon, 17 Apr 2017 18:12:27 +0000 (18:12 +0000)]
Merge changes from topic 'vintf_check_compat_native'
* changes:
Update for removing mount arg to VintfObject::CheckCompatibility
Add Java API for libvintf.
Treehugger Robot [Mon, 17 Apr 2017 18:05:02 +0000 (18:05 +0000)]
Merge "Update api for ServiceStateProvider"
Rebecca Silberstein [Mon, 17 Apr 2017 17:30:08 +0000 (17:30 +0000)]
Merge "WifiManager: add new methods to start softap" am:
be2653d41e
am:
334fe54661
Change-Id: I3e0455020c5b0c1896c1994a821832e0e45ae4e6
Rebecca Silberstein [Mon, 17 Apr 2017 17:20:42 +0000 (17:20 +0000)]
Merge "WifiManager: add new methods to start softap"
am:
be2653d41e
Change-Id: Ic73c0b8f52c86f00a6d03687b37b4c02f41d4fcc
Rebecca Silberstein [Mon, 17 Apr 2017 17:10:37 +0000 (17:10 +0000)]
Merge "WifiManager: add new methods to start softap"
Erik Kline [Thu, 13 Apr 2017 13:54:34 +0000 (22:54 +0900)]
Flatten the transitions to tethering and hotspot.
The previous version could trigger a Log.wtf() if an error occured within
ServingState.enter() that caused a transition while a tranistion was
already in flight.
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
31466854
Change-Id: I66a47caf22e39ab4ad7f4ddd60940e9fe1580729
Yifan Hong [Fri, 14 Apr 2017 22:39:20 +0000 (15:39 -0700)]
Update for removing mount arg to VintfObject::CheckCompatibility
It is default to false.
Test: pass
Bug:
36814503
Change-Id: Ib06850d3355f54996b17cc6c2980a7d17af132e5
Tyler Gunn [Sat, 15 Apr 2017 06:17:18 +0000 (06:17 +0000)]
Merge "Expose phone account register/unregister intents." am:
24299f5b06
am:
b993a44272
Change-Id: Ic3f8044b7df278b33208fae671abef21ae8f55d2
Tyler Gunn [Sat, 15 Apr 2017 06:13:21 +0000 (06:13 +0000)]
Merge "Expose phone account register/unregister intents."
am:
24299f5b06
Change-Id: Ifbc60e3221bee3813e2c854305144af901067b13
Treehugger Robot [Sat, 15 Apr 2017 06:07:25 +0000 (06:07 +0000)]
Merge "Expose phone account register/unregister intents."
Tyler Gunn [Fri, 14 Apr 2017 20:43:30 +0000 (13:43 -0700)]
Expose phone account register/unregister intents.
These were previously @SystemApi. Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Test: Manual
Bug:
37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
Nathan Harold [Sat, 15 Apr 2017 01:59:13 +0000 (01:59 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am:
02278a5a02
am:
d50a325553
Change-Id: I6d55820dc1710035fcab839f6cae809fa44f16da
Nathan Harold [Sat, 15 Apr 2017 01:52:24 +0000 (01:52 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
am:
02278a5a02
Change-Id: I473f438a0336b8c5183f385f062493abb53966fe
Treehugger Robot [Sat, 15 Apr 2017 01:42:58 +0000 (01:42 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
Jordan Liu [Wed, 1 Mar 2017 02:15:07 +0000 (18:15 -0800)]
Update api for ServiceStateProvider
ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.
Test: flashed onto device locally
Bug:
33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Merged-In: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Nathan Harold [Fri, 14 Apr 2017 20:13:11 +0000 (13:13 -0700)]
Update doc string for getForbiddenPlmns() to READ_PHONE_STATE
For whatever reason when I chose the permission for this API I
chose the internal READ_PRIVILEGED_PHONE_STATE. Updating this to
use the equivalent public permission (since this is a public API)
requires me to use READ_PHONE_STATE
Bug:
35261110
Test: docstring only change. Compilation
Change-Id: I3647271798b33040751905c13b20da727eacfd9b
Andrew Zeng [Fri, 14 Apr 2017 20:02:57 +0000 (20:02 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am:
2c42db20e4 -s ours
am:
812594f573
Change-Id: Ifb03ad1b13aa59e18ff658f6a0a5779d42d1d226
Andrew Zeng [Fri, 14 Apr 2017 19:52:58 +0000 (19:52 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev
am:
2c42db20e4 -s ours
Change-Id: I1c4ddbf044df414cffa282d9e9aba4261b23a975
Andrew Zeng [Fri, 14 Apr 2017 19:40:51 +0000 (19:40 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev
Hall Liu [Fri, 14 Apr 2017 18:43:19 +0000 (18:43 +0000)]
Merge "Helper method in VideoCallImpl for testing" am:
14d27fccad
am:
8fa1c9c899
Change-Id: I148108bcf8636d553852201b0a70e9cfc97d7d44
Hall Liu [Fri, 14 Apr 2017 18:39:18 +0000 (18:39 +0000)]
Merge "Helper method in VideoCallImpl for testing"
am:
14d27fccad
Change-Id: I5e298b40a83041d759e9e5c59d51be0ec5450d11
Hall Liu [Fri, 14 Apr 2017 18:30:25 +0000 (18:30 +0000)]
Merge "Helper method in VideoCallImpl for testing"
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:13:50 +0000 (18:13 +0000)]
Merge "Add PID info into ANR crash log header" am:
2fe972c822
am:
5d57502c89
Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:09:56 +0000 (18:09 +0000)]
Merge "Add PID info into ANR crash log header"
am:
2fe972c822
Change-Id: Ib7ec151a3a4b1759022a9a663836a73087ea85ec
Treehugger Robot [Fri, 14 Apr 2017 18:03:11 +0000 (18:03 +0000)]
Merge "Add PID info into ANR crash log header"
Hugo Benichi [Fri, 14 Apr 2017 15:29:09 +0000 (15:29 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback." am:
1a8f04b1b2
am:
4d80366762
Change-Id: I8c5d3fba8aaa19e8ffd1146ddb68c4279140f921
Hugo Benichi [Fri, 14 Apr 2017 15:22:39 +0000 (15:22 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
am:
1a8f04b1b2
Change-Id: I30d3790822430d250d6005cc165e7fa10f56649e
Treehugger Robot [Fri, 14 Apr 2017 15:10:08 +0000 (15:10 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
Hugo Benichi [Mon, 6 Mar 2017 00:17:06 +0000 (09:17 +0900)]
ConnectivityManager: release all requests mapping to a callback.
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
- callback recycling: releasing then reregistering a callback again.
- multiple request registrations with the same callback.
The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.
In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
- request to callback unmapping is done synchronously at callback
release time.
- all requests associated to a callback are unmapped at callback
release time.
This fixes the following issues:
- a callback stops being triggered as soon as it is released.
Otherwise when recycling the callback immediately, it is possible
the previous request associated with it triggers it, confusing the
app.
- when a callback is registered multiple times, the requests are not
leaked.
- when a callback is registered multiple times and then released, the
N-1 first registrations do not trigger the callback anymore.
In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.
Bug:
35921499,
35955593,
20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
recycling, and a disabled test for no multiple regristration.
- new tests catch regression causing b/
35921499, b/
35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
Hugo Benichi [Fri, 14 Apr 2017 07:00:41 +0000 (07:00 +0000)]
Merge "Captive portal: rotate fallback urls" am:
76b3537dfd
am:
605eafe0a5
Change-Id: I456d8a2af20dc2fa1553e0e27ec0280380ae6f38
Hugo Benichi [Fri, 14 Apr 2017 06:54:10 +0000 (06:54 +0000)]
Merge "Captive portal: rotate fallback urls"
am:
76b3537dfd
Change-Id: I5583659f2f79cf5d42e7825dfbda875ce359ddb0
Treehugger Robot [Fri, 14 Apr 2017 06:41:07 +0000 (06:41 +0000)]
Merge "Captive portal: rotate fallback urls"
Rebecca Silberstein [Fri, 14 Apr 2017 04:19:02 +0000 (04:19 +0000)]
Merge "Add a default SSID prefix for local only hotspot" am:
e98a2942a4
am:
6fc5051613
Change-Id: If99dc4527f2d85d803d7ef8eabfbb8601be11071
Rebecca Silberstein [Fri, 14 Apr 2017 04:12:34 +0000 (04:12 +0000)]
Merge "Add a default SSID prefix for local only hotspot"
am:
e98a2942a4
Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2
Rebecca Silberstein [Fri, 14 Apr 2017 04:03:48 +0000 (04:03 +0000)]
Merge "Add a default SSID prefix for local only hotspot"
Andrew Zeng [Fri, 17 Mar 2017 00:25:07 +0000 (17:25 -0700)]
DO NOT MERGE Notify keyguard of when power button is pressed.
This is done on wear power button doesn't turn off the screen,
when the device wakes from keyguard UI isn't visible yet, so
it needs to react to power press in some way.
Bug:
35147955
Change-Id: I22619ea446770d09b53370e9244215646b60a9db
Yifan Hong [Wed, 5 Apr 2017 21:42:05 +0000 (14:42 -0700)]
Add Java API for libvintf.
android.os.VintfObject has two methods:
- report: return device info that can be reported to OTA server
- verify: verify that metadata for a given OTA package is
compatible.
Test: pass
Test: adb shell am instrument -w -e class android.os.VintfObjectTest \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug:
36814503
Change-Id: Iff8fae289eec8ae9cfc327d0d0d36a1cdd5e6800
Hugo Benichi [Mon, 10 Apr 2017 08:43:08 +0000 (17:43 +0900)]
Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.
(not like commit
0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b, this patch
uses a comma to separate fallback urls, which works as expected with
Java's String.split())
Test: built, flashed, tested manually with various portal networks.
Bug:
36532213
Change-Id: I3c010bfee5b99db03a500776fbf47959a29d0578
Dave Friedman [Thu, 13 Apr 2017 17:28:34 +0000 (17:28 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb am:
4eff74f8cb am:
2d642f9e2d
am:
f125662db1
Change-Id: I5220c1ef4ac51e876c3461b64e2a3dd54c9e2b48
Dave Friedman [Thu, 13 Apr 2017 17:19:36 +0000 (17:19 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb am:
4eff74f8cb
am:
2d642f9e2d
Change-Id: I5257f51a37e6e45a928befea94b2ecdb0cf01f45
Dave Friedman [Thu, 13 Apr 2017 17:06:11 +0000 (17:06 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb
am:
4eff74f8cb
Change-Id: Id237b5c6ead732111feb29e1dc0dcd8a444366ee
Dave Friedman [Thu, 13 Apr 2017 17:00:44 +0000 (17:00 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50
am:
506a8b39fb
Change-Id: If60b7db71fe92508daaec1255c637927432d7b55
Dave Friedman [Thu, 13 Apr 2017 16:48:41 +0000 (16:48 +0000)]
Docs: Fixes broken link in Javadoc.
am:
df0fd34d50
Change-Id: I76ed5361426065d5e532c5a11c2d11f28ba8c2d7
Hugo Benichi [Thu, 13 Apr 2017 13:46:32 +0000 (13:46 +0000)]
Merge "Revert "Captive portal: rotate fallback urls"" am:
9ea45b6106
am:
4d47eba86a
Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc