summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Move NMS observers to RemoteCallbackList."Jeff Sharkey2011-12-151-29/+33
|\
| * Move NMS observers to RemoteCallbackList.Jeff Sharkey2011-12-151-29/+33
| | | | | | | | | | | | | | Internally uses Binder.linkToDeath() to handle case where remote observer dies. Change-Id: I9ae0ee6e011a9715172fa079098b108f895ae956
* | Merge "Improve resistance to leaks for ConfigEvent"Glenn Kasten2011-12-152-8/+7
|\ \
| * | Improve resistance to leaks for ConfigEventGlenn Kasten2011-12-152-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | A Vector of pointers is risky, as there is no ownership (and the ThreadBase destructor was not deleting them, so if there were any left over at end it would leak). Replaced by a Vector of values. Change-Id: Iddde72dc30134adfcf724dec26cbe0a742509b8c
* | | Merge "Use NULL not 0 for pointers"Glenn Kasten2011-12-153-29/+29
|\ \ \ | |_|/ |/| |
| * | Use NULL not 0 for pointersGlenn Kasten2011-12-153-29/+29
| |/ | | | | | | Change-Id: Iab3f9abbdab617dc5a599e657ec46a0b0a002eef
* | Merge "Restrict app data on metered networks."Jeff Sharkey2011-12-153-14/+77
|\ \
| * | Restrict app data on metered networks.Jeff Sharkey2011-12-153-14/+77
| | | | | | | | | | | | | | | | | | | | | | | | This separates the definition of "metered network" and "network with limit." For now, all mobile networks are considered metered. Bug: 5571454 Change-Id: I394cd385bd33add75e53bfc9cf2fefd06a00208a
* | | Add ContentProvider.dump()Marco Nelissen2011-12-151-0/+125
|/ / | | | | | | | | | | | | | | This is similar to the existing dump() facility for services. ContentProviders can now implement dump() and that info will be shown when running "dumpsys activity provider" and when taking a bugreport. Change-Id: I33b3b132e3c4f920153355cc368eda2f725a715f
* | Merge "Move NMS to CONNECTIVITY_INTERNAL permission."Jeff Sharkey2011-12-152-63/+62
|\ \
| * | Move NMS to CONNECTIVITY_INTERNAL permission.Jeff Sharkey2011-12-142-63/+62
| | | | | | | | | | | | Change-Id: I6043c1b9cb10aeeafb93d1b5c60da571d2fec5c9
* | | Merge "Fix indentation and whitespace"Glenn Kasten2011-12-142-54/+53
|\ \ \
| * | | Fix indentation and whitespaceGlenn Kasten2011-12-142-54/+53
| | |/ | |/| | | | | | | | | | | | | Use git diff -w to verify. Change-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638
* | | Merge "Improve AudioFlinger error logging"Glenn Kasten2011-12-141-3/+8
|\ \ \
| * | | Improve AudioFlinger error loggingGlenn Kasten2011-12-141-3/+8
| |/ / | | | | | | | | | Change-Id: I8ce9aff4038cd7fa0067600faa8080b137db1939
* | | Merge "AudioMixer uninitialized simple fields"Glenn Kasten2011-12-141-0/+6
|\ \ \
| * | | AudioMixer uninitialized simple fieldsGlenn Kasten2011-12-141-0/+6
| |/ / | | | | | | | | | Change-Id: I47e3849f048d4d990c9634f9c8a2ca2de0339e93
* | | Merge "Audio C++ comments"Glenn Kasten2011-12-142-4/+4
|\ \ \ | |_|/ |/| |
| * | Audio C++ commentsGlenn Kasten2011-12-142-4/+4
| |/ | | | | | | Change-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1
* | Merge "Use const char correctly in AudioFlinger"Glenn Kasten2011-12-141-3/+3
|\ \
| * | Use const char correctly in AudioFlingerGlenn Kasten2011-12-141-3/+3
| |/ | | | | | | | | | | | | Use const char [] instead of const char * to eliminate unnecessary pointer. Make the array audio_interfaces also const, in addition to the strings. Change-Id: I31f33d1dcb9a657ee136f4280fd2d46492496831
* | Merge "Use units after all times"Glenn Kasten2011-12-141-10/+12
|\ \
| * | Use units after all timesGlenn Kasten2011-12-141-10/+12
| |/ | | | | | | Change-Id: I48d3f29c37228b5d03189e4c9600824c9360cac9
* | Merge "Remove redundant clear()"Glenn Kasten2011-12-141-1/+0
|\ \
| * | Remove redundant clear()Glenn Kasten2011-12-141-1/+0
| |/ | | | | | | Change-Id: Ie5e4e63cbc8fa85ef50451dddf8f149fa864b132
* | Merge "Fix includes"Glenn Kasten2011-12-142-3/+1
|\ \
| * | Fix includesGlenn Kasten2011-12-142-3/+1
| |/ | | | | | | | | | | | | | | | | | | | | Remove unused #include dlfcn.h Add #include String8.h Forward class declaration is only for references and pointers. In this case, we need the full class declaration, and were incorrectly depending on another header file to do it. Change-Id: Iff65cceb3982698cc1ebaeec405695fc190c03ff
* | Merge "Track scan count by UID"Irfan Sheriff2011-12-141-0/+28
|\ \
| * | Track scan count by UIDIrfan Sheriff2011-12-141-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Helps track down misbehaving apps that are initiating too many scans Bug:5722180 Change-Id: I0bc396cf5e68ed53b900e8a65abb56acdbd8d8a5
* | | Merge "Avoid reading network stats when disabled."Jeff Sharkey2011-12-141-0/+14
|\ \ \
| * | | Avoid reading network stats when disabled.Jeff Sharkey2011-12-131-0/+14
| | |/ | |/| | | | | | | | | | Bug: 5518868 Change-Id: Idb5c588b018bf735597ad7ff904ecc69224dd0a0
* | | am 0be53567: am 19a06fe9: Merge "Fix issue #5755172: Soft menu key ↵Dianne Hackborn2011-12-131-0/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | disappears when menu is open" into ics-mr1 * commit '0be53567c1c2299c548d3204d2b9240108fbd53a': Fix issue #5755172: Soft menu key disappears when menu is open
| * | | Fix issue #5755172: Soft menu key disappears when menu is openDianne Hackborn2011-12-131-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to work more like before in determining whether the menu key is needed -- in some cases look back in the window list to determine this if we don't know the value from the current window. This requires adding a new private flag indicating whether the compat menu state is known for a window, which is set by PhoneWindow as part of its existing process of computing the flag for its own windows. Now we can have a new API on WindowState to determine the value of this flag for a window, which if needed walks back in the window list to find a window the value is known for (or stops at what the policy has determined is the top full-screen window, so we stop like we used to at things like the lock screen or the bottom of an application). Change-Id: I829de6d629b5af8bcb422cb85249ee4041c7205e
* | | | am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ↵Jeff Sharkey2011-12-121-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'f0213bf1833e49744b29be97e44c3e9eaad9449d': Avoid NPE when missing network stats.
| * | | Avoid NPE when missing network stats.Jeff Sharkey2011-12-121-2/+4
| | | | | | | | | | | | | | | | | | | | Bug: 5750339 Change-Id: I4b739dbd076b270a5a2b2e2a1e0f6e445d8c124e
* | | | Add logging to country detector logicKatherine Kuan2011-12-122-5/+140
| |_|/ |/| | | | | | | | | | | | | | | | | | | | This is for debugging purposes to verify the effects of change Id45abeba1b1e843053ac2c946861b439ca568de4. Bug: 5670680 Change-Id: Ia065dec6ba651e7e77205f812b7606b15eebdc17
* | | Merge "Clean up synchronization"Irfan Sheriff2011-12-121-1/+6
|\ \ \
| * | | Clean up synchronizationIrfan Sheriff2011-12-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add delayed disk write in WifiConfigStore - Remove synchronization and keep all access to config store throught the state machine thread Change-Id: I53768a17895e48da7b99542ac95c6c2fddbcb021
* | | | Merge "Use the carrier-given dns addrs for tethering."Robert Greenwalt2011-12-121-6/+18
|\ \ \ \
| * | | | Use the carrier-given dns addrs for tethering.Robert Greenwalt2011-12-091-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a complaint from carriers (that we used 8.8.8.8), but also fixes the case where there is only room for one live radio connection: the secondary connection (tethering) doesn't have a default route to prevent on-device traffic from slipping out on the tethering connection, but tethered dns is proxied through dnsmasq, so it is appearing as on-device traffic and is unroutable. By switching to the carrier-indicated dns servers we can use the host-routes already set for those and kill two bugs with one fix. bug:5525764 bug:3045311 Change-Id: Ib1ccea81e0c0ed2d1462dc9721c2647124a790da
* | | | | am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before ↵Chia-chi Yeh2011-12-121-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | starting VPN daemons." into ics-mr1 * commit 'fa71962fe4595f484071ac0deb23f68d44932d83': VPN: delete the "abort" file before starting VPN daemons.
| * | | | Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1Chia-chi Yeh2011-12-081-0/+1
| |\ \ \ \
| | * | | | VPN: delete the "abort" file before starting VPN daemons.Chia-chi Yeh2011-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5714296 Change-Id: Idba41b9f3907747a84387ea4f3e930b3a185a06e
* | | | | | am c34306e4: am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1Irfan Sheriff2011-12-121-18/+31
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | * commit 'c34306e46e0f53a9478216c2d5fd3129a3bc6f8e': Fix wifi bring up at boot up
| * | | | Merge "Fix wifi bring up at boot up" into ics-mr1Irfan Sheriff2011-12-081-18/+31
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix wifi bring up at boot upIrfan Sheriff2011-12-081-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5719176 Change-Id: Iac879fc634f6ab6289b73c46931d754bc0af2f87
* | | | | Merge "MCC detection fixes for CountryDetector"Makoto Onuki2011-12-102-33/+21
|\ \ \ \ \
| * | | | | MCC detection fixes for CountryDetectorMakoto Onuki2011-12-092-33/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't get and cache phone tpe at the initialization time. At this point TelephonyManager is probably not ready yet. - Refresh MCC whenever we get the service state changed callback, even when the state hasn't actually changed, in order to make sure we get refresh country properly when MCC changes. - Also remove the initialization of mPhoneStateListener, which prevented us from registering phone state listener properly. - Also fix tests which were already failing. Bug 5670680 Change-Id: Id45abeba1b1e843053ac2c946861b439ca568de4
* | | | | am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" ↵Irfan Sheriff2011-12-091-4/+4
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | into ics-mr1 * commit 'a3c7c35873235486787d58fa8310eebd87508bc9': Handle emergency call back mode correctly
| * | | Handle emergency call back mode correctlyIrfan Sheriff2011-12-081-4/+4
| | |/ | |/| | | | | | | | | | Bug: 5726996 Change-Id: I5815dd402bd73c530b9ba6d545d8956064949aa2