summaryrefslogtreecommitdiffstats
path: root/services/java/com
Commit message (Collapse)AuthorAgeFilesLines
* am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ↵Robert Greenwalt2012-02-141-11/+25
|\ | | | | | | | | | | | | ics-mr1 * commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd': Stop using shared DUN APN when tethering stops.
| * Stop using shared DUN APN when tethering stops.Robert Greenwalt2012-02-141-11/+25
| | | | | | | | | | | | | | | | | | | | | | Backported from master, including a bug fix and a cdma enhancement. Even if other people are sharing the connection (ie, carrier wants default and tethered traffic on the same APN) stop using a carrier- described APN when the tethering stops. bug:5972599 Change-Id: I25e4831855e6b62c0c3ab3a6f4d4846aaee6ac50
* | am ffc89899: Merge "Don\'t pulse LED on new notification unless notification ↵Mike Lockwood2012-02-141-1/+3
|\ \ | |/ | | | | | | | | | | has LED flag set" into ics-mr1 * commit 'ffc89899652f5c815b6d156f55a909001420891e': Don't pulse LED on new notification unless notification has LED flag set
| * Don't pulse LED on new notification unless notification has LED flag setMike Lockwood2012-02-131-1/+3
| | | | | | | | | | | | | | Bug: 6006131 Change-Id: I719c7d68e310bfaca227f6286159b3993784926b Signed-off-by: Mike Lockwood <lockwood@google.com>
* | am 197fe269: Merge "Add OEM specific USB mode enumeration based on ↵Wink Saville2012-02-101-1/+69
|\ \ | |/ | | | | | | | | | | ro.bootmode property" into ics-mr1 * commit '197fe26940022be75384f4038dd789f446d33122': Add OEM specific USB mode enumeration based on ro.bootmode property
| * Add OEM specific USB mode enumeration based on ro.bootmode propertyKazuhiro Ondo2012-02-101-1/+69
| | | | | | | | | | | | | | | | | | This patch is adding a capability so that OEM can override USB mode in case the device is boot up with OEM specific mode. (i.e. modem debug, factory test etc.) Bug:5964042 Change-Id: Ic8e23d302563ce71eedb74ce94cca8c65838a4f7
* | Add the CommonTimeManagementService.John Grossman2012-02-062-0/+392
| | | | | | | | | | | | | | | | | | | | | | Add a small service to the high level core set of system services to control the configuration of the native common time service. This service is responsible for controlling policy regarding when the common time service should be allowed to run, which networks it is allowed to run on, what priority it runs at in the master election algorithm, and so on. Change-Id: I37308e882a0e8c4cd3e38c4f47b7c40b9150ba31
* | am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1Robert Greenwalt2012-01-251-2/+14
|\ \ | |/ | | | | | | * commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2': Filter our v6 address from tethering dns.
| * Filter our v6 address from tethering dns.Robert Greenwalt2012-01-241-2/+14
| | | | | | | | | | | | | | | | Don't support IPv6 yet, and the tools crash when they see one, so filter them out. bug:5913888 Change-Id: Id7096aa70da4e3cc8e4702b0b489c0228a100db9
* | am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1Robert Greenwalt2012-01-241-6/+18
|\ \ | |/ | | | | | | * commit 'f449ea9e96162698f4ec6d62c70750eb50744da7': Use the carrier-given dns addrs for tethering.
| * Merge "Use the carrier-given dns addrs for tethering." into ics-mr1Robert Greenwalt2012-01-241-6/+18
| |\
| | * Use the carrier-given dns addrs for tethering.Robert Greenwalt2012-01-231-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:5898904 Change-Id: Ida8777687994f353b2d4f2c7db5d6ea4b6ac3882
* | | am 47163685: Merge "Another attempt at issue #5823276: home repaints after ↵Dianne Hackborn2012-01-242-7/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | full-screen app is exited" into ics-mr1 * commit '47163685eb90f9520e7ae0ac0984b4e1535e8e5b': Another attempt at issue #5823276: home repaints after full-screen app is exited
| * | Merge "Another attempt at issue #5823276: home repaints after full-screen ↵Dianne Hackborn2012-01-242-7/+23
| |\ \ | | | | | | | | | | | | app is exited" into ics-mr1
| | * | Another attempt at issue #5823276: home repaints after full-screen app is exitedDianne Hackborn2012-01-232-7/+23
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This is between the two previous attempts. I returned the part from the original that was breaking gallery, but have some new code to detect when something about the window params has changed that would require a layout pass to make sure we still do a layout then, even if the window is not currently visible. Change-Id: I07745e1f66022583e3076b84cc8bbe8bd2acd48f
* | | am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread ↵Jim Miller2012-01-231-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | priority"" into ics-mr1 * commit '44760b106a4bafcf83fb356bf91683db40e0e5a2': Revert "Fix 5797764: Increase lock screen's thread priority"
| * | Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ↵Jim Miller2012-01-231-1/+1
| |\ \ | | |/ | |/| | | | ics-mr1
| | * Revert "Fix 5797764: Increase lock screen's thread priority"Jim Miller2012-01-231-1/+1
| | | | | | | | | | | | | | | This reverts commit 6d6a70a33746ef5147ab146f1802f0db424dd2f1 This doesn't appear to have a measurable impact for this issue.
* | | am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" ↵Jim Miller2012-01-201-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ics-mr1 * commit 'eaa11a723150f1ea79446d7ba4bf77eb47b73337': Fix 5797764: Increase lock screen's thread priority
| * | Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1Jim Miller2012-01-201-1/+1
| |\ \ | | |/
| | * Fix 5797764: Increase lock screen's thread priorityJim Miller2012-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that might stall lock screen when the screen turns on. Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
* | | am 1bae8066: Merge "Fix issue #5823276 again: home repaints after ↵Dianne Hackborn2012-01-202-14/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | full-screen app is exited" into ics-mr1 * commit '1bae80668cc1d12bb4a4b93bce1960b2601de131': Fix issue #5823276 again: home repaints after full-screen app is exited
| * | Fix issue #5823276 again: home repaints after full-screen app is exitedDianne Hackborn2012-01-202-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't consider a window as a candidate for the top fullscreen window if it is not going to be a candiate for layout. This fix does not include the change to ignore app tokens that are hidden. This causes problems in some dialogs that stay hidden until their app is ready to display, but need to perform a series of relayouts during that time to get to the right size. Dropping this part of the change still (mostly?) seems to allow us to avoid the bad states. Change-Id: Ic052cb1499d3287f47e9ffeac5cd2470ee5a308c
* | | am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints ↵Justin Ho2012-01-192-28/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | after full-screen app is exited"" into ics-mr1 * commit '820b45c0a21980a43532b9fb9823f8aa08c64a15': DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"
| * | DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app ↵Justin Ho2012-01-192-28/+14
| | | | | | | | | | | | | | | | | | | | | | | | is exited" This reverts commit 01b02a734d2988c22b00f5df6346ad03d8bf52b6. Change-Id: I848c01fc44eb9a51ead1116b2647ed838ec1825f
* | | am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." ↵Jim Miller2012-01-182-0/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ics-mr1 * commit '230a709285abc5dfd92f05d91a8997d52a59d3c7': Fix 5863053: Add method to lock screen immediately.
| * | Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1Jim Miller2012-01-182-0/+17
| |\ \
| | * | Fix 5863053: Add method to lock screen immediately.Jim Miller2012-01-172-0/+17
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the device fails to lock when DevicePolicyManagerService requests the device to be locked and the screen was off because the user hit the power button. The change allows DPMS to directly invoke screen lock, bypasssing the screen state. Change-Id: Iecdda6fc61e9c519119de495be23c69c3b983921
* | | am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app ↵Dianne Hackborn2012-01-132-14/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | is exited" into ics-mr1 * commit '2e282f35b009fe4c23daca35592dae2032641643': Fix issue #5823276: home repaints after full-screen app is exited
| * | Merge "Fix issue #5823276: home repaints after full-screen app is exited" ↵Dianne Hackborn2012-01-132-14/+28
| |\ \ | | | | | | | | | | | | into ics-mr1
| | * | Fix issue #5823276: home repaints after full-screen app is exitedDianne Hackborn2012-01-122-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't consider a window as a candidate for the top fullscreen window if it is not going to be a candiate for layout. Also don't consider windows a candidate for layout if their app token is hidden. This fixes a transient state where we are preparing to unhide the window but have not done so yet. Change-Id: Ife5299ffa003c1df1a4f787b7a2809cbf614ec16
* | | | am 2cf18d28: Merge "Streamline package-installed handling by the Backup ↵Christopher Tate2012-01-131-57/+55
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Manager" into ics-mr1 * commit '2cf18d28785fdd188641867503586627cb212302': Streamline package-installed handling by the Backup Manager
| * | | Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1Christopher Tate2012-01-131-57/+55
| |\ \ \ | | |_|/ | |/| |
| | * | Streamline package-installed handling by the Backup ManagerChristopher Tate2012-01-121-57/+55
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, don't do O(asec_apps * installed_apps) work during the broadcast receiver's operation. On devices with many installed apps and a large number of them moved to ASECs, this was causing the system process to become unresponsive and the watchdog to fire -- which in turn would initiate a restart loop, as the same package-installed broadcast would then be issued again once the package manager rescanned the ASEC containers, ad infinitum. With this change, the expensive call to the package manager is only made once rather than asec_apps times. Bug 5850283 Change-Id: I14e280ea1fa6af19cebc58869a20fbb599c92c8c
* | | am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1Chia-chi Yeh2012-01-121-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'ff321d496a6a07fc667112ecfe4d9a107d44147b': VPN: silence VPN notifications.
| * | Merge "VPN: silence VPN notifications." into ics-mr1Chia-chi Yeh2012-01-121-1/+1
| |\ \
| | * | VPN: silence VPN notifications.Chia-chi Yeh2012-01-111-1/+1
| | |/ | | | | | | | | | | | | Bug: 5852859 Change-Id: I269d8de298a1fd69a8d777150ae97927537a5424
* | | am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1Robert Greenwalt2012-01-121-0/+6
|\ \ \ | |/ / | | | | | | | | | * commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7': Disable wimax when mobile data is in Settings
| * | Merge "Disable wimax when mobile data is in Settings" into ics-mr1Robert Greenwalt2012-01-121-0/+6
| |\ \
| | * | Disable wimax when mobile data is in Settingstk.mun2012-01-061-0/+6
| | |/ | | | | | | | | | | | | | | | | | | - Add wimax related code in handleSetMobileData to disable wimax when Moblie data is disabled (Settings -> Wireless & Networks - More -> Mobile Networks ->Data Enabled) Change-Id: Ibf2d9da2eb90d161128005f26ac4b3e991526af4 Signed-off-by: tk.mun <tk.mun@samsung.com>
* | | am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ↵Danielle Millett2012-01-121-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr1 * commit '2931d8ace9118bafe08090cd41e235048b6c2eb2': DO NOT MERGE - Cherry picking from master to MR1
| * | DO NOT MERGE - Cherry picking from master to MR1Danielle Millett2012-01-101-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 5783857: Device Policy Manager doesn't allow Face Unlock This makes it so that if face unlock is enabled and then a device policy manager that requires something more secure than face unlock is installed, the user will be forced to choose a new acceptable lock type. This was previously fixed for the case where the device had been reset, or the shell was restarted after setting face unlock, but not for the case where the device remained on between setting face unlock and setting up a device policy manager. Also changed the function ordering of saveLockPattern() so that the overloaded wrapper function is next to the main function. Change-Id: Ibed8c4ab137ebbc07fb143faef6f047bc6dc4474
* | Show the flags in package manager debugging.Joe Onorato2012-01-041-1/+35
| | | | | | | | Change-Id: I5f603f52c7199f1fbe377df0794a85450260e974
* | Merge "Add a new ui mode for "appliance"" into ics-aahJoe Onorato2011-12-161-1/+4
|\ \
| * | Add a new ui mode for "appliance"Joe Onorato2011-12-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The idea is that this is a device which is more-or-less headless. It might have some limited interaction capabilities, but it's not something that you want to rely on having. Change-Id: Icc9f674299f8dbe2b736a5622a4965904d27e49c
* | | am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1Justin Ho2011-12-162-35/+158
|\ \ \ | |/ / |/| / | |/ | | * commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d': Cherry-picking Id45abeba and Ia065dec6 for MR1
| * Cherry-picking Id45abeba and Ia065dec6 for MR1Makoto Onuki2011-12-132-35/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ------------------------------------------------------- MCC detection fixes for CountryDetector - 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 ------------------------------------------------------- Add logging to country detector logic This is for debugging purposes to verify the effects of change Id45abeba1b1e843053ac2c946861b439ca568de4. Bug: 5670680 Change-Id: I238d953484e2c8135f7dac70fce8662c8300a286
* | am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu ↵Dianne Hackborn2011-12-131-0/+27
|\ \ | |/ | | | | | | | | | | is open" into ics-mr1 * commit '19a06fe93cccb4b1dd224b8456969821a19b07ef': 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 f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1Jeff Sharkey2011-12-131-2/+4
|\ \ | |/ | | | | | | * commit 'f0bbc494d638f4c77e688bf9410027f453301559': Avoid NPE when missing network stats.