summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-12Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi.android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5nougat-dr1-releaselinaro-android-7.1.0_r7Lorenzo Colitti
Bug: 31827713 Change-Id: I81471f2f3e6c1c4d7bdfebc9dd321bb9d76ad0b6 (cherry picked from commit f11ee9f5928d14d713bb1a7346629c506c968b58)
2016-10-12Slightly simplify IpManager#compareProvisioning.Lorenzo Colitti
Bug: 31827713 Change-Id: Icc1c8d98feef14c972891451fd94f855d78de43e (cherry picked from commit b77b77521373b9de0b79a96fca1e4b1857a140b1)
2016-10-12Conditionally accept loss of on-link IPv6 DNS serversErik Kline
Permit this if and only if we're not "avoiding bad wifi" in general. Bug: 31827713 Change-Id: I0874ec2d1d09e913ccdbe9f6e178090400808a04 (cherry picked from commit 5b437d6ff91116f25be946e07d5d90cd25c372a4)
2016-10-12Refactor "avoid bad wifi" logic into a utility classErik Kline
Additionally, add this utility class to IpManager for compatibility verification. A follow-on CL will make use of IpManager's local AvoidBadWifiTracker. Bug: 31827713 Change-Id: If8c56c3f8076d6a5157ea180e361bbdadc2bc1dd (cherry picked from commit 065ab6ee407dc8b3b5b477e483b6f48e50720113)
2016-10-12Continue if package is not in systemStuart Scott
bug:29546655 Change-Id: Ieb17534d60db4643180b915f9b10b0c79a2224e2 (cherry picked from commit 434c8db80f39d75a76152cd9820769703a5bd9d4)
2016-10-12Rematch wifi networks when the avoid bad wifi setting changes.Lorenzo Colitti
Currently, when the avoid bad wifi setting changes, we rematch all networks and requests, but do not update any NetworkFactories with new scores. This means that if a wifi network's score goes down as a result of enabling bad wifi avoidance, we will not look for another network (e.g., cell data) to satisfy its requests. This makes it so that when the user enables avoiding bad wifi, we will attempt to bring up cell data will if it is not already connected. Bug: 31075769 Change-Id: Ie5b685be8676999adea8c9ecbbc1abb92f81a74f (cherry picked from commit 836d8788a8ed4eb44dbd7e3a24c77c2cc435573e)
2016-10-12Add debug output for bad wifi avoidance restrictions.Lorenzo Colitti
Bug: 31075769 Change-Id: Ibd97f40917c946aa164c13c7e06c4696d21dc203 (cherry picked from commit 29bd384f2c63b3595d5a363de9ee4cd447b2964a)
2016-10-12Support "don't ask again" in the avoid bad wifi dialog.Lorenzo Colitti
This contains the following changes: 1. Make NETWORK_AVOID_BAD_WIFI a tristate: 0 means never avoid bad wifi, unset means prompt the user, 1 means always avoid. 2. Look at NETWORK_AVOID_BAD_WIFI only if the carrier restricts avoiding bad wifi (previously, we relied on the setting being null and defaulting to the value of the config variable). 3. Add an avoidUnvalidated bit to NetworkAgentInfo to track whether the user has requested switching away from this unvalidated network even though avoiding bad wifi is generally disabled. This is set to true when the user selects "switch" in the dialog without setting the "Don't ask again" checkbox. 4. Add a hidden setAvoidUnvalidated API to ConnectivityManager to set the avoidUnvalidated bit. 5. Additional unit test coverage. Bug: 31075769 Change-Id: I1be60c3016c8095df3c4752330149ce638bd0ce1 (cherry picked from commit 165c51c0eb9834a3d95ce0b31b07c7c8975a54d7)
2016-10-12Update the avoid bad wifi settings on the handler thread.Lorenzo Colitti
Currently, every call to avoidBadWifi fetches the current value of the config variable and setting whenever it is called. This means that the score of an unvalidated wifi network can unpredictably change at any time, creating a data race. Instead, persist the value and only update it when something changes. Bug: 31075769 Change-Id: I0f4e0e742c91ef77fabc95d3ebb494338396aca5 (cherry picked from commit 2618c1b7f0c8816375e662b89eceb8b2c69237e7)
2016-10-12Disable network switching toasts on Verizon.Hugo Benichi
Bug: 31025214 Bug: 31075769 Change-Id: I08fb351b713734f29b9c2caf69dfba2e1d73ca05 (cherry picked from commit 8041e897de1e95caec449353c9f2dca54a5f92fd)
2016-10-12Unit tests for avoid bad wifi networks setting.Lorenzo Colitti
Bug: 31075769 Change-Id: I21ba20df59ddce5731ef1ebe8846b3f00578a674 (cherry picked from commit 73b20938c7b0a27c027204a7d4bdcf18766cb167)
2016-10-12Support displaying a dialog when wifi becomes unvalidated.Lorenzo Colitti
Bug: 31075769 Change-Id: I7a6e7580769365bea930f638bd44edcaa28df134 (cherry picked from commit 9be58c55806faf3833d0288cb043d4eb9a37930d)
2016-10-12Support ignoring penalty for bad wifi networksHugo Benichi
This patch adds a way to configure devices so that a validated network that becomes unvalidated is not penalized in the network scoring and selection logic. The intent is to prevent devices configured to do so from switching to a lower scoring network such as cellular networks when a higher scoring network such as wifi networks loses internet connectivity. Bug: 31075769 Change-Id: Ie7e0f2607d214a178367fedfbef6c44768fa00a4 (cherry picked from commit c8e9e1229a91e22d6ab32d491d4c60086fbc9199)
2016-10-12Explicitly pass old score to updateCapabilitiesHugo Benichi
This allows simplification of getCurrentScore function in NetworkAgentInfo and its return value to depend on everValidated and lastValidated. Bug: 31075769 Change-Id: I0b3c85e3a61b006733e900e0a231424878317476 (cherry picked from commit f15b2824b6f954e3a8b039a0836530f571d663d0)
2016-10-12Change bang to x for indication of no internetJason Monk
Bug: 31271895 Change-Id: I14f71974f0549991d448fe68b30573d2ae033b19 (cherry picked from commit d67fbe62018c9a0c30d69091a17e32aaff215734)
2016-10-12Fixed a bug with incorrect handling of onUnlockUserFyodor Kupolov
userId should be passed as arg1 instead of obj. Bug: 31321500 Change-Id: I11e8c146d83773c73ec6bb5f5cfac566759b7bcc (cherry picked from commit 0f57cce644ae8b5bb87de3e7fba9e9c00f9a0b1a)
2016-10-12Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 ↵Paul Jensen
am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 Change-Id: Ib0023b44e521b936ab2f9450ad367b1feda64492 (cherry picked from commit d37eb7646581a2ffc68b11ccb67e3457716d878e)
2016-10-12DO NOT MERGE Check caller for sending media key to global priority sessionJaewan Kim
Prevent sending media key events from the non-system app to the global priority session through the MediaSessionManager.dispatchMediaKeyEvent(). Note that any app can use the API indirectly with the public API AudioManager.dispatchMediaKeyEvent(). Bug: 29833954 Tested: Installed malicious apps and confirmed that they don't work. Tested: Run CtsTelecomTestCases and CtsMediaTestCases Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15 (cherry picked from commit 09c3df004bad9343092e377a7e74e11f9635734a)
2016-10-12Fix build break due to automerge of 7d2198b5Paul Jensen
Bug: 30100884 Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f (cherry picked from commit baae57ab24db7d3b0bf7f84c05954173f1ee15fe)
2016-10-12Catch all exceptions when parsing IME meta dataTadashi G. Takaoka
Bug: 30568284 Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2 (cherry picked from commit dddc438e97509a858319e91988908b27085792d6)
2016-10-12Fix deadlock in AcitivityManagerService.Sudheer Shanka
Don't hold mPidsSelfLocked lock when calling cleanUpApplicationRecordLocked. Bug: 31463143 Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98 (cherry picked from commit 67e05b4d28bb63974f88f6abaf8b3636215c9511)
2016-10-12Only return password for account session flow if the caller is signedHongming Jin
with system key and have get_password permission. Bug: 30455516 Change-Id: I78484c59e4de1dff685ab91a0a8e7a756fffd9bf (cherry picked from commit 9342e137c68e9d31e61b774f7a6583ed5f8353f9)
2016-10-12Ensure munmap matches mmapJohn Reck
Bug: 31350622 Change-Id: I6d3f9faec32d54360caa6706d17405e20b50966c (cherry picked from commit aa394dd42c049479bface1991f11b863dc1a0922)
2016-10-12Fix setPairingConfirmation permissions issue (2/2)Marie Janssen
setPairingConfirmation was set to only require BLUETOOTH_ADMIN permission which shouldn't be able to set the confirmation itself. This is restricted to BLUETOOTH_PRIVILEGED permission. Bug: 29043989 Change-Id: I887de32d156e672ec44aa0b286cd7ea7f9f8ad55 (cherry picked from commit 93326cfd9fb8a20081baa9b975275772798cfd80)
2016-10-12DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before ↵Sungsoo
change ExifInterface object can be created with a unsupported file format. If saveAttribute is called with an unsupported file format, ExifInterface makes the file corrupted. This CL prevents those cases by throwing an exception before making any change on the file. Bug: 30936376 Change-Id: I115a42601c774062485974042464abb0d65c35e9 (cherry picked from commit a8f9a075b14c526a0de75c2ade81ebc4e05e4ef8) (cherry picked from commit 56ea7b490107e4531ab4db6f74671c34b5c59fd3)
2016-10-12Backport changes to whitelist sockets opened by the zygote.Narayan Kamath
This is the backport of the following commits : Reopen whitelisted zygote file descriptors after a fork. We don't want these descriptors to be shared post-fork, so we'll have to close and reopen them when the zygote forks. The set of open descriptors is checked against a whitelist and it is a fatal error if a non whitelisted FD is opened. It is also a fatal error if anything other than a regular file / character device or socket is opened at the time of forking. This work is done in two stages : - An initial list of FDs is constructed and cached prior to the first zygote fork. - On each subsequent fork, we check whether the list of open FDs has changed. We are currently tolerant of changes, but in the longer term, it should be a fatal error if the set of open file descriptors in the zygote changes. - Post fork, we traverse the list of open descriptors and reopen them if necessary. bug: 30963384 (cherry picked from commit c5f27a7cb2ec816f483a65255034a1b57a8aa221) Fix clang build breakage (-Werror -Wformat). Use %zd for size_t. Note that this will break only on (-plus-)aosp because clang is disabled on the N development branches. bug: 30963384 (cherry picked from commit b334c33d65894f5ca9833fa55c3a1cf75e01c497) Add a whitelist of sockets on fork. Maintain a whitelist of AF_UNIX sockets that are permitted to exist at the time of forking. If an open socket does not belong to the whitelist (or is not AF_UNIX), the process will abort. If an open socket is whitelisted, it will be redirected to /dev/null after a sucessful fork. This allows us to unify our handling of the special zygote sockets (/dev/socket/zygote[_secondary]) with the existing whitelist of non socket file descriptors. This change also removes non-fatal ALOGW messages since they have the side effect of reopening the logging socket. bug: 30963384 (cherry picked from commit 3764a260f0c90dcb323caeda14baf903cc108759) fd_utils: Remove whitelist for "/dev/pmsg0". We're now calling __android_log_close prior to a fork, so this file shouldn't need to be open. bug: 31243313 bug: 30963384 (cherry picked from commit 8dee0541904e4f792cdebdee4f23f768561cb276) fd_utils: Fix broken usage of iterators. There were two separate issues here : - RestatInternal was using an iterator after a call to erase(). This will not work because it will be invalidated. - The "standard" for loop idiom for iterating over a map while making structural changes to it is broken. Switch to a while loop and treat cases where elements are erased differently from cases where they aren't. bug: 31092930 bug: 30963384 (cherry picked from commit 0b76d6a28e6978151bf245a775329cdae5e574d5) add dri device to zygote whitelisted FDs The driver can be used just like /dev/ion for graphic buffers. (cherry picked from commit 8977e424ee2d6d85fec419532ae510131aa88c45) (cherry picked from commit a1252ccbdbae686cb41e7efba769c4935f664220)
2016-10-12DO NOT MERGE Stop work challenge freeform bypassRobin Lee
Bypassing work challenge in freeform mode was trivial by just keeping work apps open in freeform mode and then switching focus to them from another app. Because the only interception point is startActivity this never triggered work challenge. The solution is to trigger the check on focus change events and also to allow passing the result back into the freeform stack instead of dumping our user out into the homescreen. Change-Id: I141ecf90b5f0e708a21d27141b6fec6074e5d475 Fix: 30693465 (cherry picked from commit 0737c2b4c2ae6415eced00926235f848d1957bae)
2016-10-12Merge "Use "all_downloads" instead of "my_downloads"." into nyc-dr1-releaseKuan-Tung Pan
2016-10-12merge in nyc-dr1-release history after reset to nyc-dr1-devgitbuildkicker
2016-10-12Use "all_downloads" instead of "my_downloads".Jeff Sharkey
Fix Merge Conflict into nyc-release We can no longer return the "my_downloads" paths: if those Uris were shared beyond the app that requested the download, access would be denied. Instead, we need to switch to using "all_downloads" Uris so that permission grants can be issued to third-party viewer apps. Since an app requesting a download doesn't normally have permission to "all_downloads" paths, DownloadProvider now issues narrow grants toward the owner of each download, both at device boot and when new downloads are started. Bug: 30537115, 30945409 Change-Id: I533125b36444877f54373d88922f2acc777e250b (cherry picked from commit 9fab683c9598d234dd8461335c276ed3e37c91e8)
2016-10-04Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi.android-7.1.0_r4Lorenzo Colitti
Bug: 31827713 Change-Id: I81471f2f3e6c1c4d7bdfebc9dd321bb9d76ad0b6 (cherry picked from commit f11ee9f5928d14d713bb1a7346629c506c968b58)
2016-10-04Slightly simplify IpManager#compareProvisioning.Lorenzo Colitti
Bug: 31827713 Change-Id: Icc1c8d98feef14c972891451fd94f855d78de43e (cherry picked from commit b77b77521373b9de0b79a96fca1e4b1857a140b1)
2016-10-04Conditionally accept loss of on-link IPv6 DNS serversErik Kline
Permit this if and only if we're not "avoiding bad wifi" in general. Bug: 31827713 Change-Id: I0874ec2d1d09e913ccdbe9f6e178090400808a04 (cherry picked from commit 5b437d6ff91116f25be946e07d5d90cd25c372a4)
2016-10-04Refactor "avoid bad wifi" logic into a utility classErik Kline
Additionally, add this utility class to IpManager for compatibility verification. A follow-on CL will make use of IpManager's local AvoidBadWifiTracker. Bug: 31827713 Change-Id: If8c56c3f8076d6a5157ea180e361bbdadc2bc1dd (cherry picked from commit 065ab6ee407dc8b3b5b477e483b6f48e50720113)
2016-09-21Continue if package is not in systemandroid-7.1.0_r3Stuart Scott
bug:29546655 Change-Id: Ieb17534d60db4643180b915f9b10b0c79a2224e2 (cherry picked from commit 434c8db80f39d75a76152cd9820769703a5bd9d4)
2016-09-21Rematch wifi networks when the avoid bad wifi setting changes.Lorenzo Colitti
Currently, when the avoid bad wifi setting changes, we rematch all networks and requests, but do not update any NetworkFactories with new scores. This means that if a wifi network's score goes down as a result of enabling bad wifi avoidance, we will not look for another network (e.g., cell data) to satisfy its requests. This makes it so that when the user enables avoiding bad wifi, we will attempt to bring up cell data will if it is not already connected. Bug: 31075769 Change-Id: Ie5b685be8676999adea8c9ecbbc1abb92f81a74f (cherry picked from commit 836d8788a8ed4eb44dbd7e3a24c77c2cc435573e)
2016-09-21Add debug output for bad wifi avoidance restrictions.Lorenzo Colitti
Bug: 31075769 Change-Id: Ibd97f40917c946aa164c13c7e06c4696d21dc203 (cherry picked from commit 29bd384f2c63b3595d5a363de9ee4cd447b2964a)
2016-09-21Support "don't ask again" in the avoid bad wifi dialog.Lorenzo Colitti
This contains the following changes: 1. Make NETWORK_AVOID_BAD_WIFI a tristate: 0 means never avoid bad wifi, unset means prompt the user, 1 means always avoid. 2. Look at NETWORK_AVOID_BAD_WIFI only if the carrier restricts avoiding bad wifi (previously, we relied on the setting being null and defaulting to the value of the config variable). 3. Add an avoidUnvalidated bit to NetworkAgentInfo to track whether the user has requested switching away from this unvalidated network even though avoiding bad wifi is generally disabled. This is set to true when the user selects "switch" in the dialog without setting the "Don't ask again" checkbox. 4. Add a hidden setAvoidUnvalidated API to ConnectivityManager to set the avoidUnvalidated bit. 5. Additional unit test coverage. Bug: 31075769 Change-Id: I1be60c3016c8095df3c4752330149ce638bd0ce1 (cherry picked from commit 165c51c0eb9834a3d95ce0b31b07c7c8975a54d7)
2016-09-16Update the avoid bad wifi settings on the handler thread.Lorenzo Colitti
Currently, every call to avoidBadWifi fetches the current value of the config variable and setting whenever it is called. This means that the score of an unvalidated wifi network can unpredictably change at any time, creating a data race. Instead, persist the value and only update it when something changes. Bug: 31075769 Change-Id: I0f4e0e742c91ef77fabc95d3ebb494338396aca5 (cherry picked from commit 2618c1b7f0c8816375e662b89eceb8b2c69237e7)
2016-09-16Disable network switching toasts on Verizon.Hugo Benichi
Bug: 31025214 Bug: 31075769 Change-Id: I08fb351b713734f29b9c2caf69dfba2e1d73ca05 (cherry picked from commit 8041e897de1e95caec449353c9f2dca54a5f92fd)
2016-09-16Unit tests for avoid bad wifi networks setting.Lorenzo Colitti
Bug: 31075769 Change-Id: I21ba20df59ddce5731ef1ebe8846b3f00578a674 (cherry picked from commit 73b20938c7b0a27c027204a7d4bdcf18766cb167)
2016-09-16Support displaying a dialog when wifi becomes unvalidated.Lorenzo Colitti
Bug: 31075769 Change-Id: I7a6e7580769365bea930f638bd44edcaa28df134 (cherry picked from commit 9be58c55806faf3833d0288cb043d4eb9a37930d)
2016-09-16Support ignoring penalty for bad wifi networksHugo Benichi
This patch adds a way to configure devices so that a validated network that becomes unvalidated is not penalized in the network scoring and selection logic. The intent is to prevent devices configured to do so from switching to a lower scoring network such as cellular networks when a higher scoring network such as wifi networks loses internet connectivity. Bug: 31075769 Change-Id: Ie7e0f2607d214a178367fedfbef6c44768fa00a4 (cherry picked from commit c8e9e1229a91e22d6ab32d491d4c60086fbc9199)
2016-09-16Explicitly pass old score to updateCapabilitiesHugo Benichi
This allows simplification of getCurrentScore function in NetworkAgentInfo and its return value to depend on everValidated and lastValidated. Bug: 31075769 Change-Id: I0b3c85e3a61b006733e900e0a231424878317476 (cherry picked from commit f15b2824b6f954e3a8b039a0836530f571d663d0)
2016-09-14Change bang to x for indication of no internetandroid-7.1.0_r2Jason Monk
Bug: 31271895 Change-Id: I14f71974f0549991d448fe68b30573d2ae033b19 (cherry picked from commit d67fbe62018c9a0c30d69091a17e32aaff215734)
2016-09-09Fixed a bug with incorrect handling of onUnlockUserFyodor Kupolov
userId should be passed as arg1 instead of obj. Bug: 31321500 Change-Id: I11e8c146d83773c73ec6bb5f5cfac566759b7bcc (cherry picked from commit 0f57cce644ae8b5bb87de3e7fba9e9c00f9a0b1a)
2016-09-01merge in nyc-dr1-release history after reset to nyc-dr1-devandroid-7.1.0_r1gitbuildkicker
2016-09-01Canada AGNSS settings updateWyatt Riley
Esp. LPP. See also some overlay changes. Change-Id: I0a694cf25df12c51e7d01ec4d8f2ab419786de00
2016-09-01docs: Typo fix in multi-window docsAndrew Solovay
am: 0b423e5eae Change-Id: I18fe652d972196630006517bacc26b7441efe9ed
2016-08-31docs: Typo fix in multi-window docsAndrew Solovay
Referred to the "android:resizableActivity" property; should have been "android:resizeableactivity". English prose, however, consistently uses the (preferred) spelling "resizable". See first comment for stage location. bug: 30566808 Change-Id: I2570ff9269b4d2dc8b11f1c98817e50726be78fc