Robert Greenwalt
845b32d9d8
am 325c15df: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit '325c15dfe3c31ea4d5e343fb170a0d20ad71bb4f':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 22:34:16 +00:00
Robert Greenwalt
21fc1a295e
am 8096be27: am fbb28f55: am 77d02900: am 325c15df: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit '8096be27323b26ae177255381366823c8448e3c5':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 22:16:02 +00:00
Robert Greenwalt
325c15dfe3
am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
...
* commit 'e3bcde94caf8440d5e3958a340b3d276d03f7691':
Reduce CONNECTIVITY_CHANGE bcasts
2015-08-28 21:36:39 +00:00
Robert Greenwalt
1bb9827d76
Reduce CONNECTIVITY_CHANGE bcasts
...
If an app uses the new api (requestNetwork) to bring up MMS, don't
mark it as a legacy request. This was done because the messaging
service had to use a combination of new API and old
(requestRouteToHost) due to api problems. This has been resolved
so don't mark these as legacy requests anymore.
The general stuff is still in for other types due to lack of testing
time but this should be removed altogether in the future.
bug:23350688
Change-Id: I41c27efb253c39d8af1357ae7916ed5315c716db
2015-08-28 12:37:54 -07:00
Paul Jensen
d3e8d7b4ce
Don't mark NetworkRequests restricted when they don't have restricted caps
...
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted. Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.
Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
(cherry picked from commit 5d87922526 )
2015-08-28 12:50:09 -04:00
Paul Jensen
e203d89de7
Fix NOT_RESTRICTED network capability and enforce it.
...
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission
Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 1b2d980e40 )
2015-08-28 12:48:11 -04:00
Lorenzo Colitti
749bfc1606
am a5bfd73a: am ab5e962e: am d7121f56: am 3e4966ed: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
...
* commit 'a5bfd73ab683d3310ee3ce31d7ad3edb656aa858':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-08-19 21:23:03 +00:00
Lorenzo Colitti
a825353efe
am 3e4966ed: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
...
* commit '3e4966ed2195172b8cf93abe17a2dc2192668024':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-08-19 20:58:44 +00:00
Lorenzo Colitti
3e4966ed21
am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
...
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-08-19 20:54:48 +00:00
Paul Jensen
5d87922526
Don't mark NetworkRequests restricted when they don't have restricted caps
...
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted. Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.
Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
2015-08-19 11:08:38 -04:00
Adam Lesinski
dd8a92a5b9
am 3170650a: am 56df15d3: am 5b3a38e0: am daf7e5be: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
...
* commit '3170650a2b611f175e401634436c650a56d957e9':
Change default cellular activity timeout to 10
2015-08-19 02:22:12 +00:00
Adam Lesinski
4a6bc3d477
am daf7e5be: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
...
* commit 'daf7e5befdf829b3e8ef83e5a0af998859265091':
Change default cellular activity timeout to 10
2015-08-19 01:39:03 +00:00
Adam Lesinski
daf7e5befd
am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
...
* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
Change default cellular activity timeout to 10
2015-08-19 00:53:35 +00:00
Adam Lesinski
6d4ebd786f
Change default cellular activity timeout to 10
...
LTE radios take 10 seconds to power down, so we should set the
activity timeout to 10 seconds.
Bug:23294704
Change-Id: I7478b77f134b0fe2d82e39acd5c370add12735ca
2015-08-18 11:47:07 -07:00
Billy Lau
1b28ba07b5
am a0984c71: am 0ed58c3f: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit 'a0984c71a173718a864cb9d06a2a9176d989d1bf':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-09 19:40:47 +00:00
Billy Lau
85b90229bd
am 4a10b66d: am 99271a39: am 9751afcf: am a0984c71: am 0ed58c3f: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '4a10b66df364092cdc42a3cfaa990c877b389624':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-08 02:49:54 +00:00
Billy Lau
a0984c71a1
am 0ed58c3f: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '0ed58c3f002db531fa499913f8ba047a62f39df3':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:22:24 +00:00
Billy Lau
0ed58c3f00
Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
2015-08-07 22:16:03 +00:00
Billy Lau
ce3f9dc328
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
...
Merge the CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.
AndroidManifest.xml:
Raised the protection level of CHANGE_NETWORK_STATE permission from
normal to signature|appops and pre23|preinstall for compatibility
provider/Settings:
Wrote new helper methods to check if app is allowed to change network
state.
ConnectivityManager.java & ConnectivityService.java:
Replace enforcement checks for CHANGE_NETWORK_STATE with
checkAndNoteChangeNetworkStateOperations instead.
Change-Id: If8c2dd3c76a5324ca43f1d90fa17973216c2bcc5
2015-08-07 19:29:51 +01:00
Paul Jensen
8d8db52e89
am abd27102: am 41779e46: am 95297732: am 4f74dbe1: resolved conflicts for merge of f5b01767 to mnc-dr-dev
...
* commit 'abd27102f4e232be448bc6012e0bd833637ab3fa':
Fix NOT_RESTRICTED network capability and enforce it.
2015-08-05 11:44:46 +00:00
Paul Jensen
23e37057e6
am 4f74dbe1: resolved conflicts for merge of f5b01767 to mnc-dr-dev
...
* commit '4f74dbe114cd7b2d6f9c113777424e5a4e1a37a3':
Fix NOT_RESTRICTED network capability and enforce it.
2015-08-05 11:24:35 +00:00
Paul Jensen
4f74dbe114
resolved conflicts for merge of f5b01767 to mnc-dr-dev
...
Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
2015-08-05 07:07:24 -04:00
Paul Jensen
f5b0176786
Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
2015-08-05 10:03:47 +00:00
Paul Jensen
1b2d980e40
Fix NOT_RESTRICTED network capability and enforce it.
...
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission
Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
2015-08-04 07:24:24 -04:00
Abodunrinwa Toki
90c145b2cd
Merge "Turn off failing tests in FrameworksCoreTests."
2015-08-01 18:32:11 +00:00
Dianne Hackborn
3317ea3798
am 80d0df7c: am 62f05dfa: am 55a23950: am 34300e4b: am 18c1d830: Fix build.
...
* commit '80d0df7cd967d877422be706b250d46d33270477':
Fix build.
2015-08-01 17:53:17 +00:00
Abodunrinwa Toki
47a70d00e7
Turn off failing tests in FrameworksCoreTests.
...
We want a green state so we can confidence in tests we write
going forward.
Change-Id: I2c8db848897b56d0c64202ad28861eb4a7572e07
2015-07-31 18:13:30 -07:00
Dianne Hackborn
953c40cf61
am 34300e4b: am 18c1d830: Fix build.
...
* commit '34300e4bd479d3e85692202688826662e7661eb1':
Fix build.
2015-07-31 19:53:59 +00:00
Dianne Hackborn
34300e4bd4
am 18c1d830: Fix build.
...
* commit '18c1d8301d8f544ae133198459bbf2698d80a14b':
Fix build.
2015-07-31 19:42:24 +00:00
Dianne Hackborn
18c1d8301d
Fix build.
...
Change-Id: Icdf6fa14e53a1c030d0d90205d3bf2d7610b6196
2015-07-31 10:35:34 -07:00
Lorenzo Colitti
1a119d520b
am 5bbbf8ed: am 3b03916d: am c7a86e90: am 25c1e480: am 4024ad11: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
...
* commit '5bbbf8edfd74389f9b38d3497d6d86afb543b8f2':
Stop supporting legacy ConnectivityManager routing methods in M.
2015-07-31 05:49:08 +00:00
Lorenzo Colitti
2e0d5f45f5
am 25c1e480: am 4024ad11: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
...
* commit '25c1e480f5fd3f67b4a4d2d9616c8af822db8de5':
Stop supporting legacy ConnectivityManager routing methods in M.
2015-07-31 05:31:13 +00:00
Lorenzo Colitti
25c1e480f5
am 4024ad11: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
...
* commit '4024ad119816ed4c4ab62e8c6252c9d484e74a5f':
Stop supporting legacy ConnectivityManager routing methods in M.
2015-07-31 05:24:49 +00:00
Lorenzo Colitti
4024ad1198
Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
2015-07-31 05:17:08 +00:00
Hung-ying Tyan
2604fa162f
am 058fbd0f: am 4581ca53: am 7b2b74e1: am dc7add28: am f049071d: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
...
* commit '058fbd0fef35e62d2baf3e58b7a0c2f24b155dff':
Revise lockdown check in getLegacyVpnInfo()
2015-07-31 03:23:43 +00:00
Hung-ying Tyan
6a9f6f6738
am dc7add28: am f049071d: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
...
* commit 'dc7add287de5ef1e7c96596924bf73ee2d1c0f5d':
Revise lockdown check in getLegacyVpnInfo()
2015-07-31 03:04:41 +00:00
Hung-ying Tyan
dc7add287d
am f049071d: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
...
* commit 'f049071da45bec441813e29593e2bcd323a97bd0':
Revise lockdown check in getLegacyVpnInfo()
2015-07-31 02:57:19 +00:00
Hung-ying Tyan
f049071da4
Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
2015-07-31 02:51:32 +00:00
Lorenzo Colitti
2780e4bc0b
Stop supporting legacy ConnectivityManager routing methods in M.
...
The methods startUsingNetworkFeature, stopUsingNetworkFeature and
requestRouteToHost were @removed in all the M preview builds, but
internal and external developers have noted that this imposes
additional burden for applications that need to work across
multiple platform versions because it causes compile-time errors.
We switched from @removed back to @deprecated to avoid these
problems. In order to effectively deprecate these methods, which
are error-prone and insecure, make them throw
UnsupportedOperationException if the app's target SDK is M or
above.
Because there are still one or two places in system code that use
these APIs, exempt Process.SYSTEM_UID and the OMA-DM client from
the check for now.
Bug: 22728205
Change-Id: I790bd32f3aa8067cbb625962a209bb9232f4b58c
2015-07-31 11:08:27 +09:00
Paul Jensen
841092d2a2
am 917b275d: am 06287d1c: am 9a2314b0: am 6995b9e5: am 13156c7d: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
...
* commit '917b275d6b54b08edb6326512d7e48a02163e730':
Fix missing onLost NetworkCallbacks when network loses capability
2015-07-30 03:12:21 +00:00
Hung-ying Tyan
dd494fb2f3
Revise lockdown check in getLegacyVpnInfo()
...
Return null instead of raising exception in lockdown mode.
BUG=22749146
Change-Id: I0e9e3ded0d189e3fa9e872b7af9fe363799c85d6
2015-07-30 10:52:25 +08:00
Paul Jensen
9a846179b7
am 6995b9e5: am 13156c7d: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
...
* commit '6995b9e5866aa03b23baeb957881a0c8c84a1282':
Fix missing onLost NetworkCallbacks when network loses capability
2015-07-30 02:34:36 +00:00
Paul Jensen
6995b9e586
am 13156c7d: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
...
* commit '13156c7d07e0e1d839b5d54dfe0e983c4f7cb93f':
Fix missing onLost NetworkCallbacks when network loses capability
2015-07-30 02:20:49 +00:00
Paul Jensen
13156c7d07
Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
2015-07-30 02:10:50 +00:00
Paul Jensen
72530b5d9d
am bbfacbbc: resolved conflicts for merge of 2813d5ba to mnc-dr-dev
...
* commit 'bbfacbbc960d57d0471b5e9a9943af2edf1475d6':
Disable WiFi autojoin when user decides via "Stay connected?" dialog
2015-07-29 19:57:05 +00:00
Robert Greenwalt
59dbc9a7ad
am 91892f55: am f5a934b6: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
...
* commit '91892f55247d71452c9c9de74878de771484d8e9':
Un-remove legacy ConnectivityManager API.
2015-07-29 19:49:04 +00:00
Paul Jensen
4cca5cbc29
am 06eabfcc: am 4c55639a: am 8c83be09: am bbfacbbc: resolved conflicts for merge of 2813d5ba to mnc-dr-dev
...
* commit '06eabfcc2d82833ec89bf92d087210bab18d78bb':
Disable WiFi autojoin when user decides via "Stay connected?" dialog
2015-07-29 17:31:12 +00:00
Paul Jensen
bbfacbbc96
resolved conflicts for merge of 2813d5ba to mnc-dr-dev
...
Change-Id: I8b33797528f16596f0d350ad38458baa51fcacf6
2015-07-29 11:31:53 -04:00
Paul Jensen
2813d5ba39
Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" into mnc-dev
2015-07-29 13:52:02 +00:00
Lorenzo Colitti
9a9ab05153
resolved conflicts for merge of 2d2a8d16 to mnc-vt-dev
...
Change-Id: Ic16a7e4b146e6b2af00ae17976f876ace29a60e8
2015-07-29 09:52:48 +09:00