Commit Graph

1134 Commits

Author SHA1 Message Date
Mike Lockwood
9d76873546 am 0552d336: DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
* commit '0552d3366487b27c619c055a04c81b8af0b84d33':
  DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
2011-03-02 15:38:51 -08:00
Mike Lockwood
0552d33664 DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB 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>
2011-03-02 00:00:09 -08:00
Amith Yamasani
255fa0e962 am aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit 'aae04e43ec277c095e181933976dfa7bfd044288':
  Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
2011-02-11 11:03:56 -08:00
Amith Yamasani
aae04e43ec Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Bug: 3443747
Change-Id: Ied9c842e306e299fec7cd201415e0cfad0d29630
2011-02-10 17:19:11 -08:00
Jake Hamby
47cb175396 am 1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '1798fc049eda5f6fd14be3a369eebe81c851abd2':
  Fixed a memory leak in the bluetooth settings
2011-02-04 16:20:15 -08:00
Gustaf Nilklint
00fa2f578e Fixed a memory leak in the bluetooth settings
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
2011-01-04 07:56:45 +01:00
Nick Pelly
934c1b9f4b am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
* commit 'c1286804cc839ec7006d6e9651c73ec7b3180157':
  Update Settings for new NfcAdapter.getDefaultAdapter(Context)
2010-12-10 17:22:30 -08:00
Nick Pelly
267419ff8b Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
2010-12-09 19:39:58 -08:00
Jean-Baptiste Queru
1acfef82bd merge from gingerbread
Change-Id: Icee740e130b9ebd21446de79b63435f5d1d046e4
2010-12-09 09:11:15 -08:00
Jake Hamby
c681e939dd Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
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
2010-12-09 07:50:04 -08:00
Jake Hamby
90b1f193ad am b0fda6f5: Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
* commit 'b0fda6f56a0ee3c42cf02813b5fc346382873c4f':
  Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
2010-12-04 23:45:23 -08:00
Jake Hamby
b0fda6f56a Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
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
2010-12-03 17:24:21 -08:00
Jean-Baptiste Queru
b68b35dd6a am 04b646df: Merge "Possible NumberFormatException of parseInt is outside try-catch"
* commit '04b646df1e9f00719d2d547fa1da59407bb6be67':
  Possible NumberFormatException of parseInt is outside try-catch
2010-11-29 16:11:16 -08:00
Peter Kuterna
378b6f6740 Possible NumberFormatException of parseInt is outside try-catch
Change-Id: I77c1e41185a8d3a1724af848d6bbfbb1da816b55
2010-11-28 22:35:31 +01:00
Dianne Hackborn
969773aa73 am 83d2698f: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread
* commit '83d2698f4f271f568333532ddbae33f8e2e13052':
  Fix issue #3177284: Account for wake lock power usage on Crespo
2010-11-10 18:07:18 -08:00
Dianne Hackborn
83d2698f4f Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 2010-11-10 17:58:58 -08:00
Dianne Hackborn
21023464b2 Fix issue #3177284: Account for wake lock power usage on Crespo
Change-Id: I5988d28fd192cd7fdb85140172a92141eb389964
2010-11-08 19:05:00 -08:00
Nick Pelly
b93b018ac6 am 91ba0709: Update settings text on success, so we clear out error text after recovery.
* commit '91ba0709b032d0c80ca086f53552f251a21c6df4':
  Update settings text on success, so we clear out error text after recovery.
2010-11-03 19:59:47 -07:00
Nick Pelly
91ba0709b0 Update settings text on success, so we clear out error text after recovery.
Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d
Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-03 21:56:36 -05:00
Dianne Hackborn
5f3017975a am 4e4ed14e: Fix issue #3146784: ANR in manage applications
* commit '4e4ed14ee2b82cb90a25b3027eb36f190ce2e1e7':
  Fix issue #3146784: ANR in manage applications
2010-10-29 15:40:36 -07:00
Dianne Hackborn
4e4ed14ee2 Fix issue #3146784: ANR in manage applications
See the big comment.

Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37
2010-10-29 13:58:49 -07:00
Jean-Baptiste Queru
2853989715 am 8815f032: Merge "Always set right auth_type value in apn."
Merge commit '8815f03202abf3117b6a1f6a058a835915ddae04' into gingerbread-plus-aosp

* commit '8815f03202abf3117b6a1f6a058a835915ddae04':
  Always set right auth_type value in apn.
2010-10-25 17:32:17 -07:00
Marta Białka
1929008ac5 Always set right auth_type value in apn.
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
2010-10-25 15:39:04 +02:00
Dianne Hackborn
8731cb1b6a am 5e34f239: Fix issue #3124528: Mange applications is including cache files in storage size 2010-10-22 12:59:31 -07:00
Dianne Hackborn
5e34f23986 Fix issue #3124528: Mange applications is including cache files in storage size
Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
2010-10-22 12:18:16 -07:00
Nick Pelly
26d6e4704a am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread
Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp

* commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571':
  NFC Settings cleanup.
2010-10-21 09:37:55 -07:00
Nick Pelly
781c0aa21e Merge "NFC Settings cleanup." into gingerbread 2010-10-21 03:56:18 -07:00
Nick Pelly
e16f78d54a NFC Settings cleanup.
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>
2010-10-20 18:42:23 -07:00
Dianne Hackborn
149fec6a89 am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread
Merge commit '7a51995581128a9ade44682abe064d9fcca79aa6' into gingerbread-plus-aosp

* commit '7a51995581128a9ade44682abe064d9fcca79aa6':
  Fix issue #3114356: Storage visualization in Manage Apps is confusing
2010-10-20 17:05:19 -07:00
Dianne Hackborn
d2be882d8f Fix issue #3114356: Storage visualization in Manage Apps is confusing
Also fixes issue #3097388: If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached

Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
2010-10-20 16:54:41 -07:00
Dianne Hackborn
5cfa75875f am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCs
Merge commit '916adce02d5b37038cd78d11a8c884237684f9a8' into gingerbread-plus-aosp

* commit '916adce02d5b37038cd78d11a8c884237684f9a8':
  Fix issue #3108683: GRH18: Battery usage chart FCs
2010-10-19 18:20:40 -07:00
Dianne Hackborn
916adce02d Fix issue #3108683: GRH18: Battery usage chart FCs
Make array more bigger, and bounds check the thing.

Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a
2010-10-19 16:23:53 -07:00
Brad Fitzpatrick
17001cea9e NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
2010-10-18 17:03:44 -07:00
Brad Fitzpatrick
d36d650a81 NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
2010-10-18 15:25:49 -07:00
Dianne Hackborn
593a7049f5 am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd card
Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp

* commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87':
  Implement issue #3094621 and #3094609 - wipe sd card
2010-10-16 16:55:30 -07:00
Dianne Hackborn
1337d0f70b Implement issue #3094621 and #3094609 - wipe sd card
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
2010-10-16 16:27:25 -07:00
Nick Pelly
fb515337c2 am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp

* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
2010-10-15 18:21:06 -07:00
Nick Pelly
e1a9ca6862 Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread 2010-10-15 10:56:05 -07:00
Amith Yamasani
8de45a6686 am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp

* commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
  Make summary appear for both checked and unchecked NFC checkbox in Settings.
2010-10-15 10:06:18 -07:00
Amith Yamasani
1bdb7874ad Make summary appear for both checked and unchecked NFC checkbox in Settings.
And remove the extra "Tag" in the summary.

Bug: 3083079
Change-Id: I998c2556a88180098a060d43b720276a7619a368
2010-10-15 10:00:40 -07:00
Nick Pelly
a57eacef3c Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:15:27 -07:00
Jaikumar Ganesh
7805fa99ff am 022299df: Merge "Disconnect dock only if its connected." into gingerbread
Merge commit '022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp

* commit '022299dfce6a705a8cbaff972a4309da6e90a8c2':
  Disconnect dock only if its connected.
2010-10-14 15:33:42 -07:00
Jaikumar Ganesh
9d03e98d22 Disconnect dock only if its connected.
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
2010-10-14 15:09:57 -07:00
Jake Hamby
8028cea196 am 8021537f: BT settings wait for HS service before connect. DO NOT MERGE
Merge commit '8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp

* commit '8021537ffea45d1a36274217610a314b3a0ac774':
  BT settings wait for HS service before connect.  DO NOT MERGE
2010-10-13 16:28:34 -07:00
Jake Hamby
8021537ffe BT settings wait for HS service before connect. DO NOT MERGE
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
2010-10-13 16:10:47 -07:00
Jaikumar Ganesh
836b4297cc am 03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
Merge commit '0340371297887290d7593d7c346e422a4c9ecd1a' into gingerbread-plus-aosp

* commit '0340371297887290d7593d7c346e422a4c9ecd1a':
  DO NOT MERGE Add null check before disconnecting a device.
2010-10-13 11:13:33 -07:00
Jaikumar Ganesh
0340371297 Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread 2010-10-13 11:09:35 -07:00
Jaikumar Ganesh
268d1f1e4b DO NOT MERGE Add null check before disconnecting a device.
Bug: 3076404
Change-Id: I8ef140395503816296124a38e42ab9cc7e6f7159
2010-10-13 10:56:01 -07:00
Nick Pelly
f4e4319f41 am 083310d3: Update NFC settings description, and fix polarity.
Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp

* commit '083310d316059c6592120c32e1c0b736e85b83c0':
  Update NFC settings description, and fix polarity.
2010-10-12 21:27:48 -07:00
Nick Pelly
083310d316 Update NFC settings description, and fix polarity.
Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
2010-10-12 21:22:54 -07:00