summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* am 36469186: DO NOT MERGE WiMAX settings menuTK MUN2011-03-092-3/+42
|\ | | | | | | | | * commit '36469186b7459d13688a2ca1c2316dbf172794dd': DO NOT MERGE WiMAX settings menu
| * DO NOT MERGE WiMAX settings menuTK MUN2011-03-092-3/+42
| | | | | | | | | | | | | | | | | | 1. Show the 4G menu. 2. Show the 4G MAC address 3. Execute 4G setting apk. Change-Id: Id9d5551e5bfdb7d79279de42b36ec0ebccdf6099 Signed-off-by: TK MUN <tk.mun@samsung.com>
* | am f4393101: Merge "Support configuring the protocol in APN settings." into ↵Lorenzo Colitti2011-03-031-1/+49
|\ \ | |/ | | | | | | | | | | gingerbread * commit 'f4393101f80f0ca1a10771613a18565323b69fa2': Support configuring the protocol in APN settings.
| * Merge "Support configuring the protocol in APN settings." into gingerbreadLorenzo Colitti2011-03-031-1/+49
| |\
| | * Support configuring the protocol in APN settings.Lorenzo Colitti2011-02-221-1/+49
| | | | | | | | | | | | | | | Bug: 3333633 Change-Id: I0797cd97074fe1b8a1318168b86fe4627488215a
* | | am 0552d336: DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now ↵Mike Lockwood2011-03-021-3/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | clears USB service settings * commit '0552d3366487b27c619c055a04c81b8af0b84d33': DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
| * | DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB ↵Mike Lockwood2011-03-021-3/+19
| |/ | | | | | | | | | | | | | | | | | | | | | | service settings The USB service caches the preferred activity preferences for USB devices and accessories and allows permission to access the hardware based on the user's selection. The "Clear defaults" button can now be used to clear these settings. Change-Id: If865df98214506cf2f1e35c8c6a3dbe319b125f2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am aae04e43: Prevent monkeys from USB tethering. It disconnects the test ↵Amith Yamasani2011-02-111-1/+1
|\ \ | |/ | | | | | | | | | | host. DO NOT MERGE. * commit 'aae04e43ec277c095e181933976dfa7bfd044288': Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
| * Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.Amith Yamasani2011-02-101-1/+1
| | | | | | | | | | Bug: 3443747 Change-Id: Ied9c842e306e299fec7cd201415e0cfad0d29630
* | am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"Jake Hamby2011-02-041-2/+3
|\ \ | | | | | | | | | | | | * commit '1798fc049eda5f6fd14be3a369eebe81c851abd2': Fixed a memory leak in the bluetooth settings
| * | Fixed a memory leak in the bluetooth settingsGustaf Nilklint2011-01-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Release resources in onPause rather than onResume to fix a memory leak. Without this fix the app will crash if you are in Bluetooth settings and tap "Device name" and then roate the device a few times. Change-Id: I57a8346247c13f5113e7c4ea39dde5b29a7359bb
| * | merge from gingerbreadJean-Baptiste Queru2010-12-091-1/+2
| |\ \ | | | | | | | | | | | | Change-Id: Icee740e130b9ebd21446de79b63435f5d1d046e4
| | * | Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)Jake Hamby2010-12-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maximum Bluetooth device name length is 248 bytes. There are bugs in Bluez and D-Bus that can cause the Bluetooth service to go into a reboot loop when the device name is set to the maximum length. Changed Settings app to limit the device name length to 246 bytes. Bug: 3246147 Change-Id: I2f46303cf44951f0b3907c43d4b096736f08765b
* | | | am c1286804: Merge "Update Settings for new ↵Nick Pelly2010-12-102-2/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | NfcAdapter.getDefaultAdapter(Context)" into gingerbread * commit 'c1286804cc839ec7006d6e9651c73ec7b3180157': Update Settings for new NfcAdapter.getDefaultAdapter(Context)
| * | | Update Settings for new NfcAdapter.getDefaultAdapter(Context)Nick Pelly2010-12-092-2/+2
| | | | | | | | | | | | | | | | Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
* | | | am b0fda6f5: Reduce max BT device length to 246 bytes due to Bluez bug. (DO ↵Jake Hamby2010-12-041-1/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | NOT MERGE) * commit 'b0fda6f56a0ee3c42cf02813b5fc346382873c4f': Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
| * | Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)Jake Hamby2010-12-031-1/+2
| |/ | | | | | | | | | | | | | | | | | | The maximum Bluetooth device name length is 248 bytes. There are bugs in Bluez and D-Bus that can cause the Bluetooth service to go into a reboot loop when the device name is set to the maximum length. Changed Settings app to limit the device name length to 246 bytes. Bug: 3246147 Change-Id: I320fc7a9a0bfdf8067387ec8de80efccaca2b5f6
* | am 04b646df: Merge "Possible NumberFormatException of parseInt is outside ↵Jean-Baptiste Queru2010-11-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | try-catch" * commit '04b646df1e9f00719d2d547fa1da59407bb6be67': Possible NumberFormatException of parseInt is outside try-catch
| * | Possible NumberFormatException of parseInt is outside try-catchPeter Kuterna2010-11-281-1/+1
| | | | | | | | | | | | Change-Id: I77c1e41185a8d3a1724af848d6bbfbb1da816b55
* | | am 83d2698f: Merge "Fix issue #3177284: Account for wake lock power usage on ↵Dianne Hackborn2010-11-101-0/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Crespo" into gingerbread * commit '83d2698f4f271f568333532ddbae33f8e2e13052': Fix issue #3177284: Account for wake lock power usage on Crespo
| * | Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into ↵Dianne Hackborn2010-11-101-0/+4
| |\ \ | | | | | | | | | | | | gingerbread
| | * | Fix issue #3177284: Account for wake lock power usage on CrespoDianne Hackborn2010-11-081-0/+4
| | | | | | | | | | | | | | | | Change-Id: I5988d28fd192cd7fdb85140172a92141eb389964
* | | | am 91ba0709: Update settings text on success, so we clear out error text ↵Nick Pelly2010-11-031-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | after recovery. * commit '91ba0709b032d0c80ca086f53552f251a21c6df4': Update settings text on success, so we clear out error text after recovery.
| * | | Update settings text on success, so we clear out error text after recovery.Nick Pelly2010-11-031-1/+6
| |/ / | | | | | | | | | | | | Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d Signed-off-by: Nick Pelly <npelly@google.com>
* | | am 4e4ed14e: Fix issue #3146784: ANR in manage applicationsDianne Hackborn2010-10-292-5/+64
|\ \ \ | |/ / | | | | | | | | | * commit '4e4ed14ee2b82cb90a25b3027eb36f190ce2e1e7': Fix issue #3146784: ANR in manage applications
| * | Fix issue #3146784: ANR in manage applicationsDianne Hackborn2010-10-292-5/+64
| | | | | | | | | | | | | | | | | | See the big comment. Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37
* | | am 8815f032: Merge "Always set right auth_type value in apn."Jean-Baptiste Queru2010-10-251-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '8815f03202abf3117b6a1f6a058a835915ddae04' into gingerbread-plus-aosp * commit '8815f03202abf3117b6a1f6a058a835915ddae04': Always set right auth_type value in apn.
| * | Always set right auth_type value in apn.Marta Białka2010-10-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fixes a bug that automatically sets auth_type value of editing apn that has and should have that value set to null (-1 = Not yet set) to auth_type value of an apn previously displayed in the apn editor. It is caused by careless persisting and reading data from SharedPreferences. Fixed to keep and persist (to be consistent with other apn's Preferences) null value for not yet set auth_type property. Change-Id: I4e125a4cdbad968c9f6ea8781a8c849f4c31c929
* | | am 5e34f239: Fix issue #3124528: Mange applications is including cache files ↵Dianne Hackborn2010-10-221-1/+1
|\ \ \ | | |/ | |/| | | | in storage size
| * | Fix issue #3124528: Mange applications is including cache files in storage sizeDianne Hackborn2010-10-221-1/+1
| | | | | | | | | | | | Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
* | | am 781c0aa2: Merge "NFC Settings cleanup." into gingerbreadNick Pelly2010-10-211-4/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp * commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571': NFC Settings cleanup.
| * | Merge "NFC Settings cleanup." into gingerbreadNick Pelly2010-10-211-4/+3
| |\ \
| | * | NFC Settings cleanup.Nick Pelly2010-10-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NFC service now tracks its own settings. Call the NFC API to determine state. Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b Signed-off-by: Nick Pelly <npelly@google.com>
* | | | am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps ↵Dianne Hackborn2010-10-204-32/+119
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | is confusing" into gingerbread Merge commit '7a51995581128a9ade44682abe064d9fcca79aa6' into gingerbread-plus-aosp * commit '7a51995581128a9ade44682abe064d9fcca79aa6': Fix issue #3114356: Storage visualization in Manage Apps is confusing
| * | | Fix issue #3114356: Storage visualization in Manage Apps is confusingDianne Hackborn2010-10-204-32/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes issue #3097388: If you launch Manage Applications when SD card app info isn't available, incomplete information gets cached Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
* | | | am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCsDianne Hackborn2010-10-191-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '916adce02d5b37038cd78d11a8c884237684f9a8' into gingerbread-plus-aosp * commit '916adce02d5b37038cd78d11a8c884237684f9a8': Fix issue #3108683: GRH18: Battery usage chart FCs
| * | | Fix issue #3108683: GRH18: Battery usage chart FCsDianne Hackborn2010-10-191-2/+2
| |/ / | | | | | | | | | | | | | | | Make array more bigger, and bounds check the thing. Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a
| * | NFC: async enabling/disabling, ala Bluewooth & Wifi.Brad Fitzpatrick2010-10-181-25/+61
| | | | | | | | | | | | | | | | | | | | | Don't ANR when toggling. Bug: 3097279 Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
* | | NFC: async enabling/disabling, ala Bluewooth & Wifi.Brad Fitzpatrick2010-10-181-25/+61
| | | | | | | | | | | | | | | | | | | | | Don't ANR when toggling. Bug: 3097279 Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
* | | am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-168-161/+532
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp * commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87': Implement issue #3094621 and #3094609 - wipe sd card
| * | Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-168-161/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3094621: add "wipe sd card" option to factory data reset 3094609: collapse unmount/format into one command Implements requested UI changes. Also some final tweaks to Manage Applications. Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
* | | am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC ↵Nick Pelly2010-10-151-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | prescence." into gingerbread Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp * commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f': Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
| * | Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into ↵Nick Pelly2010-10-151-1/+2
| |\ \ | | | | | | | | | | | | gingerbread
| | * | Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.Nick Pelly2010-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a Signed-off-by: Nick Pelly <npelly@google.com>
* | | | am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox ↵Amith Yamasani2010-10-151-6/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | in Settings. Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp * commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed': Make summary appear for both checked and unchecked NFC checkbox in Settings.
| * | | Make summary appear for both checked and unchecked NFC checkbox in Settings.Amith Yamasani2010-10-151-6/+1
| |/ / | | | | | | | | | | | | | | | | | | And remove the extra "Tag" in the summary. Bug: 3083079 Change-Id: I998c2556a88180098a060d43b720276a7619a368
* | | am 022299df: Merge "Disconnect dock only if its connected." into gingerbreadJaikumar Ganesh2010-10-141-3/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp * commit '022299dfce6a705a8cbaff972a4309da6e90a8c2': Disconnect dock only if its connected.
| * | Disconnect dock only if its connected.Jaikumar Ganesh2010-10-141-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scenario: BT is off, device is paired with the desk dock. Media is switched off. So when the user docks, it was trying to disconnect even when BT was off and hence DBUS was crashing. Bug: 3097224 Change-Id: I13e1dd4459c47d5ba9a403f2ae1cc8a131f02a08
* | | am 8021537f: BT settings wait for HS service before connect. DO NOT MERGEJake Hamby2010-10-131-8/+54
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp * commit '8021537ffea45d1a36274217610a314b3a0ac774': BT settings wait for HS service before connect. DO NOT MERGE
| * | BT settings wait for HS service before connect. DO NOT MERGEJake Hamby2010-10-131-8/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluetooth connections from Settings app can sometimes fail if the connection to BluetoothHeadsetService isn't ready. Changed code to delay any headset connect or disconnect attempt when the service isn't connected until onServiceConnected() is called. Tested by adding a call to Thread.sleep(5000) before the return statement in BluetoothHeadsetService.onBind(). This makes it easier to kill the phone process and then attempt to connect in the settings app before the service restarts. Bug: 3048839 Change-Id: I2114ff8ad67c8c672fcf6ce0bf3de61fca7a49b3
generated by cgit v1.1 at 2025-01-28 23:09:28 +0000