summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * No quotes for passwordIrfan Sheriff2010-05-261-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | Putting quotes for password in soft AP is not useful. It simplifies processing in framework. Bug: 2708960 Change-Id: If44aeb336732aa8089d3e401b546ebf9b3cbd25a
* | | Set profiles as preferred and then try to connect.Jaikumar Ganesh2010-05-241-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The APIs implementations are being updated to expose A2DP and HFP APIs. A connect call is not honoured if its not a preferred profile. So if an app changes the preference of the profile than it should first update the state before making the connect call. The API for updating preference might not be exposed and will be mostly an API for app with ADMIN privileges like Settings app. Change-Id: I58b8e8201357bcfe615dc2322342520319d9e355
* | | am 48112876: merge from open-source masterThe Android Open Source Project2010-05-193-12/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '4811287623e6cbd9a3584828087ea414454dbfc5' into kraken * commit '4811287623e6cbd9a3584828087ea414454dbfc5': Removed Calls to deprecated APIs and unused imports
| * | merge from open-source masterThe Android Open Source Project2010-05-193-12/+4
| |\ \ | | | | | | | | | | | | Change-Id: Id9c258165d9bb326271218a562d782fa52608213
| | * | Removed Calls to deprecated APIs and unused importsChristian Mehlmauer2010-05-173-12/+4
| | | | | | | | | | | | | | | | Change-Id: Ibaaf3418ec2c97a99495eca7ea546af415370c3e
* | | | am 75a43c60: am cd8f068e: Merge "Fix crash for tether with quotes in SSID" ↵Irfan Sheriff2010-05-173-6/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '75a43c605449e72074fc55576c8e712ff12906db' into kraken * commit '75a43c605449e72074fc55576c8e712ff12906db': Fix crash for tether with quotes in SSID
| * | | am cd8f068e: Merge "Fix crash for tether with quotes in SSID" into froyoIrfan Sheriff2010-05-173-6/+11
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448' into froyo-plus-aosp * commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448': Fix crash for tether with quotes in SSID
| | * | Fix crash for tether with quotes in SSIDIrfan Sheriff2010-05-173-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple quotes cause havoc with netd interaction right now. The solution is to revert the changes for WifiConfiguration on Access Point side done in Change I0f1e508b and remove all quotes in the SSID. Essentially a low risk one line change on top of the revert. We dont expose API for WifiConfiguration on AP side. This solution essentially means we treat SSID in WifiConfiguration on AP side differently. When we do expose things, we should make things consistent. Change-Id: I0a7e5074b83ace743fc843ee61c1ff86cde8267f
* | | | am 8719f0d2: am 8c81257f: Fix the double-quoted SSID issue.Chung-yih Wang2010-05-146-9/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '8719f0d20a301cc7509c9bd3ce3275f551329dd7' into kraken * commit '8719f0d20a301cc7509c9bd3ce3275f551329dd7': Fix the double-quoted SSID issue.
| * | | am 8c81257f: Fix the double-quoted SSID issue.Chung-yih Wang2010-05-146-9/+25
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c' into froyo-plus-aosp * commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c': Fix the double-quoted SSID issue.
| | * | Fix the double-quoted SSID issue.Chung-yih Wang2010-05-156-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | Bug id http://b/issue?id=2684571 Change-Id: I0f1e508b9a3d0fefcef28235380392368a51e42a
* | | | am 0b53ac73: merge from open-source masterThe Android Open Source Project2010-05-121-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '0b53ac733c36e14a5e2e948393360bba00048ccb' into kraken * commit '0b53ac733c36e14a5e2e948393360bba00048ccb': The password in the APN settings is shown instead of stars
| * | | merge from open-source masterThe Android Open Source Project2010-05-121-1/+5
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7
| | * | Merge "The password in the APN settings is shown instead of stars"Romain Guy2010-05-111-1/+5
| | |\ \
| | | * | The password in the APN settings is shown instead of starsJiehua Dai2010-03-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The password is presented as stars in the edit box, also if one exits and then enters the APN editor the password is stars. With this patch the APN password is consistently starified.
* | | | | am 482eadea: am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-102-0/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '482eadeae85a1764b86133172d11364df6ce7227' into kraken * commit '482eadeae85a1764b86133172d11364df6ce7227': String change - wifi tether = hotspot
| * | | | am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-102-0/+23
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp * commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7': String change - wifi tether = hotspot
| | * | | String change - wifi tether = hotspotRobert Greenwalt2010-05-082-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | bug:2664412 Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
* | | | | am 15bb4754: am d2c81986: b/2652059 Refresh UI after bond state changeMichael Chan2010-05-101-19/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '15bb47545686395c0d94b54dd67c4f080fe625e5' into kraken * commit '15bb47545686395c0d94b54dd67c4f080fe625e5': b/2652059 Refresh UI after bond state change
| * | | | am d2c81986: b/2652059 Refresh UI after bond state changeMichael Chan2010-05-101-19/+18
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2' into froyo-plus-aosp * commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2': b/2652059 Refresh UI after bond state change
| | * | | b/2652059 Refresh UI after bond state changeMichael Chan2010-05-071-19/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I8f8a939ba3f383aae36091986cea4e8a6eae13fb
* | | | | am d17eb48e: am 1308453b: b/2652059 Fixed the broken BT connects/disconnects ↵Michael Chan2010-05-041-0/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after unpair Merge commit 'd17eb48e9c87e02cbcb42899915dbfc921075231' into kraken * commit 'd17eb48e9c87e02cbcb42899915dbfc921075231': b/2652059 Fixed the broken BT connects/disconnects after unpair
| * | | | am 1308453b: b/2652059 Fixed the broken BT connects/disconnects after unpairMichael Chan2010-05-041-0/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e' into froyo-plus-aosp * commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e': b/2652059 Fixed the broken BT connects/disconnects after unpair
| | * | | b/2652059 Fixed the broken BT connects/disconnects after unpairMichael Chan2010-05-031-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unpair command was stuck in the queue. Change-Id: I803cb10adcfaedbe6fd202e0db463593880e4280
* | | | | am 3a1204f7: am 6078d450: Merge "b/2630339 Fixed the crash when an app ↵Michael Chan2010-04-281-27/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests BT to be enabled" into froyo Merge commit '3a1204f7cd231ed1c451ca90901eae082541b9ef' into kraken * commit '3a1204f7cd231ed1c451ca90901eae082541b9ef': b/2630339 Fixed the crash when an app requests BT to be enabled
| * | | | am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be ↵Michael Chan2010-04-281-27/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled" into froyo Merge commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e' into froyo-plus-aosp * commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e': b/2630339 Fixed the crash when an app requests BT to be enabled
| | * | | b/2630339 Fixed the crash when an app requests BT to be enabledMichael Chan2010-04-281-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For AlertActivity, the dialog needs to display at onCreate() time. Otherwise, the decor view would be made. Trying to display the dialog afterward would crash. Changed to AlertDialog instead. Change-Id: I2ea8463b4c475b9b54746d0a722fa80eea3d4529
* | | | | am 0bca1653: am 6368b25c: Merge "b/2608693 Fix the problem where BT was ↵Michael Chan2010-04-231-25/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automatically reconnecting ... after the user unpaired while docked." into froyo Merge commit '0bca1653cb78693e2c892efb48b944ddad98b66d' into kraken * commit '0bca1653cb78693e2c892efb48b944ddad98b66d': b/2608693 Fix the problem where BT was automatically reconnecting
| * | | | am 6368b25c: Merge "b/2608693 Fix the problem where BT was automatically ↵Michael Chan2010-04-231-25/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reconnecting ... after the user unpaired while docked." into froyo Merge commit '6368b25c09992172b1900da3fd326c4fd2fdd203' into froyo-plus-aosp * commit '6368b25c09992172b1900da3fd326c4fd2fdd203': b/2608693 Fix the problem where BT was automatically reconnecting
| | * | | Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... ↵Michael Chan2010-04-231-25/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | after the user unpaired while docked." into froyo
| | | * | | b/2608693 Fix the problem where BT was automatically reconnectingMichael Chan2010-04-221-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... after the user unpaired while docked. Change-Id: I65642f440109968387401fc3c103da0f2b15f49f
* | | | | | am b12b21a5: am b99e029d: Fix string for uninstall button for system apps.Suchi Amalapurapu2010-04-221-4/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b12b21a5b02468d601190de23f91675973ead44d' into kraken * commit 'b12b21a5b02468d601190de23f91675973ead44d': Fix string for uninstall button for system apps.
| * | | | | am b99e029d: Fix string for uninstall button for system apps.Suchi Amalapurapu2010-04-221-4/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b99e029db14ae276a47da39da9378b6af9aef403' into froyo-plus-aosp * commit 'b99e029db14ae276a47da39da9378b6af9aef403': Fix string for uninstall button for system apps.
| | * | | | Fix string for uninstall button for system apps.Suchi Amalapurapu2010-04-221-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad26aae3d99447eddb6997e66c84080cdce727da
* | | | | | am a6bde3c9: am a3683a51: Enable moving packages when install location is ↵Suchi Amalapurapu2010-04-221-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set to auto. Merge commit 'a6bde3c9cd0db85538ff6166cb35f626c303352b' into kraken * commit 'a6bde3c9cd0db85538ff6166cb35f626c303352b': Enable moving packages when install location is set to auto.
| * | | | | am a3683a51: Enable moving packages when install location is set to auto.Suchi Amalapurapu2010-04-221-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a3683a51faab316c1577cd13c708a41938bcc646' into froyo-plus-aosp * commit 'a3683a51faab316c1577cd13c708a41938bcc646': Enable moving packages when install location is set to auto.
| | * | | | Enable moving packages when install location is set to auto.Suchi Amalapurapu2010-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If081ad949cb2aed6b3555275c582e951e579ffc9
* | | | | | am dd379184: am f0746678: Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-211-41/+91
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7' into kraken * commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7': Redesign vibration settings.
| * | | | | am f0746678: Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-211-41/+91
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp * commit 'f07466782bb25ce4f2738133d0992f3531af28e5': Redesign vibration settings.
| | * | | | Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-211-41/+91
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Redesign vibration settings.Daniel Sandler2010-04-211-41/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under the hood there remain three axes: 1. Are we in silent mode now? | RINGER_MODE_{VIBRATE,SILENT} 2. Do we vibrate in silent mode? | VIBRATE_IN_SILENT == 1 3. Do calls vibrate: | getVibrateSetting(VIBRATE_TYPE_RINGER) - always | == VIBRATE_SETTING_ON - never | == VIBRATE_SETTING_OFF - only in silent | == VIBRATE_SETTING_ONLY_SILENT We now expose this to the user much more simply by collapsing (2) and (3) above, and discarding states that don't make sense: - VIBRATE_SETTING_OFF + VIBRATE_IN_SILENT - VIBRATE_SETTING_ONLY_SILENT + !VIBRATE_IN_SILENT Now we offer the user four choices: Phone vibrate: * "Never" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_OFF * "Always" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ON * "Only in silent mode" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ONLY_SILENT * "Only when not in silent mode" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_ON This should make it easier to choose exactly the behavior the user wants as well as avoid nonsensical combinations of settings. Bug: 2598014 Change-Id: I9244d25ec97a3e2b572b71b521049debd22fa4e0
* | | | | | am 70631ab7: am 4c3b2f0c: Fix the tethering help page.Robert Greenwalt2010-04-211-3/+24
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '70631ab7146b149b1f221d59131fe4efe9d91ac0' into kraken * commit '70631ab7146b149b1f221d59131fe4efe9d91ac0': Fix the tethering help page.
| * | | | | am 4c3b2f0c: Fix the tethering help page.Robert Greenwalt2010-04-211-3/+24
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b' into froyo-plus-aosp * commit '4c3b2f0cf062b38a6e380cc15ff8dc9abdca518b': Fix the tethering help page.
| | * | | | Fix the tethering help page.Robert Greenwalt2010-04-191-3/+24
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It worked with language+country resources but for some resources it's just language. Added a check to see if we had lanugage+country before deciding which to use. bug:2605981 Change-Id: Icb667a51f0c376f5188e3a43f264e236cd265468
* | | | | am 2c3265af: merge from open-source masterThe Android Open Source Project2010-04-211-3/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken * commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40': Display current IP address in advanced Wifi settings screen
| * | | | merge from open-source masterThe Android Open Source Project2010-04-211-3/+18
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
| | * | Display current IP address in advanced Wifi settings screenMike Lockwood2010-04-201-3/+18
| | |/ | | | | | | | | | | | | Change-Id: I47c6eece376e712b73add72057462926f7b2349f Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am ea87b6d7: Merge "Stop scanning after errors" into froyoIrfan Sheriff2010-04-171-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'ea87b6d75cf04051b327c89338951c7d1377c16f' into kraken * commit 'ea87b6d75cf04051b327c89338951c7d1377c16f': Stop scanning after errors
| * | Merge "Stop scanning after errors" into froyoIrfan Sheriff2010-04-171-1/+4
| |\ \
| | * | Stop scanning after errorsIrfan Sheriff2010-04-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scan fails for 3 times, we show a failure toast and continue to scan. In one case this caused infinite toasts, until the user stopped wifi. Its not clear what can cause this kind of a state since wifi disable broadcast should stop the scans. This fix will stop scans after 3 continuous failures. Any wifi state change will restart scan. Bug: 2601937 Change-Id: I68733394cb3c9b76ffb15f7579e7af6c1f54d39c