Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
217,097 Commits 3 Branches 0 Tags
2fd7cc5ba593c47cb9028faced8fa64905a16121
Commit Graph

1788 Commits

Author SHA1 Message Date
Daniel Estrada Alva
3916e7e757 am 429b020e: am 280b4495: am 967c8816: am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev 
* commit '429b020e615eebd244208373c2a3e81c59da36ec':
  Add SUPL-specific network bcast
 2015-09-03 06:40:03 +00:00
Daniel Estrada Alva
429b020e61 am 280b4495: am 967c8816: am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev 
* commit '280b4495bd492f68e955ea8e1649abe832ced974':
  Add SUPL-specific network bcast
 2015-09-03 06:23:10 +00:00
Daniel Estrada Alva
967c8816e5 am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev 
* commit 'cfd45ae4718934d403a17410ab6a7c722bdd01fc':
  Add SUPL-specific network bcast
 2015-09-02 21:11:38 +00:00
Robert Greenwalt
e94a6ff5dc Add SUPL-specific network bcast 
Move SUPL CONNECTIVITY_ACTION bcasts to a different, hidden intent
to reduce the churn of apps when SUPL comes/goes.

Short term hack until SUPL moves to use the new APIs and there's
no bcast.

bug:23350688
Change-Id: I3dc14b42afa72465260aa41ccedfe1df27baabd9
 2015-09-01 15:06:04 -07:00
Robert Greenwalt
06eeda6b38 am 8096be27: am fbb28f55: am 77d02900: am 5799f428: 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
8096be2732 am fbb28f55: am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev 
* commit 'fbb28f5552fe42453ebaf48fc11a7c07a5c9bd8b':
  Reduce CONNECTIVITY_CHANGE bcasts
 2015-08-28 22:05:38 +00:00
Robert Greenwalt
77d02900d8 am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev 
* commit '5799f428063cec8f0b85cdff41185e0725b19b74':
  Reduce CONNECTIVITY_CHANGE bcasts
 2015-08-28 21:47:20 +00:00
Robert Greenwalt
5799f42806 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
74ab4fae90 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
Xiaohui Chen
cc791bc47c More cleanup USER_OWNER 
Bug: 19913735
Change-Id: I7fe1bb2a66231b7d1ae0670dff5e2ec736b2e541
 2015-08-27 18:05:21 +00:00
Lorenzo Colitti
e0938bed96 am a5bfd73a: am ab5e962e: am d7121f56: am 0257c82f: 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
a5bfd73ab6 am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'ab5e962e1dd05799980342757edd8e83f4a76a8e':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:15:22 +00:00
Lorenzo Colitti
d7121f5651 am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '0257c82fa122243e97e4a1f4ef4bc4b8c21bd692':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:01:33 +00:00
Lorenzo Colitti
0257c82fa1 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
aae613d961 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
Zach Johnson
b07427ce1f am 5d3a382a: am 6d7af4b7: Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev 
* commit '5d3a382aa4c7d93df15aaa2cd9b1144c7c8d2d1b':
  DO NOT MERGE Allow a custom component to handle network policy notifications
 2015-08-11 23:32:31 +00:00
Zach Johnson
143ebdb94e DO NOT MERGE Allow a custom component to handle network policy notifications 
Broadcasts information about network policy notifications
to a custom component, if specified, so it can handle them.

Also exposes an API to snooze warning notifications.

Change-Id: Ic89478fa437861e2d4b6a9443858bcaf12122fba
 2015-08-11 15:36:06 -07:00
Billy Lau
e37acf3256 am 4a10b66d: am 99271a39: am 9751afcf: am 26ab6ed3: am 70f998e5: 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
Shirish Kalele
822b4f3a8d am 4ecee3f8: am 558f1030: am 74f93f9a: am d7408469: am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev 
* commit '4ecee3f88e067ed0339a4e004996a3c69ce5480e':
  Fix check for caller being the active network scorer
 2015-08-08 02:48:37 +00:00
Billy Lau
4a10b66df3 am 99271a39: am 9751afcf: am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 
* commit '99271a3995e35c64105b2778f695ca6dd716a3f2':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
 2015-08-07 22:49:52 +00:00
Billy Lau
26ab6ed3ef am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 
* commit '70f998e57df2b3ed79331669a93a0ba314f25e7d':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
 2015-08-07 22:22:24 +00:00
Billy Lau
70f998e57d Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 2015-08-07 22:16:03 +00:00
Shirish Kalele
4ecee3f88e am 558f1030: am 74f93f9a: am d7408469: am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev 
* commit '558f10307c65e5c0a3e0e11a4abca4a083f751dc':
  Fix check for caller being the active network scorer
 2015-08-07 20:55:42 +00:00
Shirish Kalele
d7408469f7 am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev 
* commit '027e3b7f51cd172dae89f69cc358363b0cf20f5f':
  Fix check for caller being the active network scorer
 2015-08-07 20:30:59 +00:00
Shirish Kalele
027e3b7f51 Merge "Fix check for caller being the active network scorer" into mnc-dev 2015-08-07 20:25:06 +00:00
Billy Lau
a7238a397d 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
Shirish Kalele
4cab12d91d Fix check for caller being the active network scorer 
Compare caller and scorer uids to decide if caller is the
active scorer instead of calling AppOps.checkPackage().

Bug: 23000690
Change-Id: I64285f965716f3aceb24f193d86ab9d6be7202c5
 2015-08-06 12:53:59 -07:00
Paul Jensen
9180e2ea59 am abd27102: am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit 'abd27102f4e232be448bc6012e0bd833637ab3fa':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:44:46 +00:00
Paul Jensen
abd27102f4 am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit '41779e467a478e11de2df10ad97542e6f2d57ca7':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:38:26 +00:00
Paul Jensen
86e7d135ac resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
 2015-08-05 07:07:24 -04:00
Paul Jensen
dbc4edccfc Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 2015-08-05 10:03:47 +00:00
Paul Jensen
487ffe7d3d 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
Dianne Hackborn
53fdd0fe7e am 80d0df7c: am 62f05dfa: am 55a23950: am e8d3b394: am 692a244b: Fix build. 
* commit '80d0df7cd967d877422be706b250d46d33270477':
  Fix build.
 2015-08-01 17:53:17 +00:00
Dianne Hackborn
80d0df7cd9 am 62f05dfa: am 55a23950: am e8d3b394: am 692a244b: Fix build. 
* commit '62f05dfa6f3763479d289d747114c34832ab10f6':
  Fix build.
 2015-08-01 17:04:37 +00:00
Dianne Hackborn
e8d3b39467 am 692a244b: Fix build. 
* commit '692a244bffea11157c37c8de93482cb912599b98':
  Fix build.
 2015-07-31 19:42:24 +00:00
Dianne Hackborn
692a244bff Fix build. 
Change-Id: Icdf6fa14e53a1c030d0d90205d3bf2d7610b6196
 2015-07-31 10:35:34 -07:00
Lorenzo Colitti
00c8a9d60a am 5bbbf8ed: am 3b03916d: am c7a86e90: am c70348c1: am 496a9d26: 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
5bbbf8edfd am 3b03916d: am c7a86e90: am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit '3b03916de7d1d2c91d5d8c9d1f0f555814a9242f':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:43:26 +00:00
Lorenzo Colitti
c70348c194 am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 
* commit '496a9d269b0778ffa1965f3b11d768fe70fd7719':
  Stop supporting legacy ConnectivityManager routing methods in M.
 2015-07-31 05:24:49 +00:00
Lorenzo Colitti
ffc42b0b7b 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
722113aa5f am 917b275d: am 06287d1c: am 9a2314b0: am 682fd6ae: am a991c66c: 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
Paul Jensen
917b275d6b am 06287d1c: am 9a2314b0: am 682fd6ae: am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 
* commit '06287d1c1859c9eafb0b4e195e57215a7e9af59c':
  Fix missing onLost NetworkCallbacks when network loses capability
 2015-07-30 02:57:30 +00:00
Paul Jensen
682fd6aede am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 
* commit 'a991c66c12da30d0240ac6c98736edee93d95977':
  Fix missing onLost NetworkCallbacks when network loses capability
 2015-07-30 02:20:49 +00:00
Paul Jensen
a991c66c12 Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 2015-07-30 02:10:50 +00:00
Paul Jensen
dede231240 am 06eabfcc: am 4c55639a: am 8c83be09: am bf10991d: resolved conflicts for merge of 30813942 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
06eabfcc2d am 4c55639a: am 8c83be09: am bf10991d: resolved conflicts for merge of 30813942 to mnc-dr-dev 
* commit '4c55639a780caa3e0a3594795ab408c5a8618ff2':
  Disable WiFi autojoin when user decides via "Stay connected?" dialog
 2015-07-29 17:09:00 +00:00
Robin Lee
5bdaeeafe6 Merge "Fix funky javadoc" 2015-07-29 16:32:07 +00:00
Robin Lee
1472c92128 Fix funky javadoc 
Using @link for the first word of a @throws line is redundant and
generates strange HTML where the row appears twice.

See for example:
    http://developer.android.com/reference/android/net/VpnService.Builder.html#addAllowedApplication%28java.lang.String%29

Change-Id: I9c0bbe9156d292eb6f0e2e2ccb6dbcfef95bc312
 2015-07-29 17:25:06 +01:00
Paul Jensen
bf10991d76 resolved conflicts for merge of 30813942 to mnc-dr-dev 
Change-Id: I8b33797528f16596f0d350ad38458baa51fcacf6
 2015-07-29 11:31:53 -04:00
Paul Jensen
308139425e Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" into mnc-dev 2015-07-29 13:52:02 +00:00