Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,252 Commits 1 Branch 0 Tags
b41b85dc9b9fe1ee9adb84186c672dcc5a92e9a8
Commit Graph

1160 Commits

Author SHA1 Message Date
Dianne Hackborn
b41b85dc9b am c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo" 
* commit 'c74500f44e3673b7728c2f619ee3d61a73ad5526':
  Fix NPE due to missing ProcessItem.mPackageInfo
 2011-07-13 16:50:07 -07:00
Johannes Carlsson
8258dc23d3 Fix NPE due to missing ProcessItem.mPackageInfo 
The reason was that a item was removed from the SparseArray while
iterating it causing one ProcessItem to be skipped in the loop which
makes sure that mPackageInfo is not null. This happens when all
processes for one uid is stopped and a new process is created.
This problem was found by running monkey.

Change-Id: I5e9a76e8007819d5e6d9ba15af0c2362da193526
 2011-07-01 07:56:27 +02:00
Jaikumar Ganesh
38ae9125b4 am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread 
* commit '7ab66973a973b9d23c411bf1c6631fa93c4903bf':
  DO NOT MERGE Show user dialog for BT.
 2011-06-21 13:24:22 -07:00
Jaikumar Ganesh
7ab66973a9 Merge "DO NOT MERGE Show user dialog for BT." into gingerbread 2011-06-21 11:23:47 -07:00
Jaikumar Ganesh
7bfa6dca07 DO NOT MERGE Show user dialog for BT. 
Show user dialog for incoming BT connection
requests from unknown devices.

Contribution by: Wei (Matthew) Xie

Change-Id: I7e9e8bbbd8808a7569f84d213fa3d716f7f5bc80
 2011-06-20 19:30:21 -07:00
Jaikumar Ganesh
bd34e568bf am eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread 
* commit 'eddb21a2ebd39900893da63749a00570f37e5038':
  Changes for API of Bluetooth Discoverability. DO NOT MERGE
 2011-05-27 13:47:01 -07:00
Jaikumar Ganesh
aeca185107 am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread 
* commit 'c955d8ee1d2b134f8c41989b545b7b3ed830d058':
  Allow users to change the length of BT disoverability. DO NOT MERGE
 2011-05-27 13:46:59 -07:00
Jaikumar Ganesh
eddb21a2eb Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:49 -07:00
Jaikumar Ganesh
c955d8ee1d Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:41 -07:00
Jaikumar Ganesh
32c7a774f5 Changes for API of Bluetooth Discoverability. DO NOT MERGE 
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the default - 120 secs.
A dialog is shown by the system to the users to accept the change
in discoverability values.

Change-Id: I34ebd907656a87508b0f0b1a4bce78134edcaebf
 2011-05-27 10:32:18 -07:00
Chris Wren
cdd9d033b0 Allow users to change the length of BT disoverability. DO NOT MERGE 
It can set to be two minues, five minutes, an hour, or forever discoverable.
The default is 120 secs.
This addresses the internal bug 2413429:
	http://b/issue?id=2413429
and external issue 6348:
	http://code.google.com/p/android/issues/detail?id=6348

Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>

Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
 2011-05-27 10:27:14 -07:00
sy310.choi
531bed610c am 95364e4a: Allow alternate string to be used for min_number 
* commit '95364e4af3cb09bff58baab6fa4a6a2218e7fc94':
  Allow alternate string to be used for min_number
 2011-05-26 13:47:20 -07:00
sy310.choi
95364e4af3 Allow alternate string to be used for min_number 
"MSID" can be shown instead of "MIN" if config_msid_enable
is set to true.

Change-Id: I6d072a5db9a5b46b17a57257221e109ba9a86698
 2011-05-26 10:45:07 -07:00
Conley Owens
47cd8a47f7 am bc20d67f: Merge "Avoid crash when switching to 2G/3G network." 
* commit 'bc20d67fedd453eec9dcb127cf9df909a192baf5':
  Avoid crash when switching to 2G/3G network.
 2011-04-27 09:55:23 -07:00
Kenneth Westin
dd9131dcdf Avoid crash when switching to 2G/3G network. 
Adding test that active APN array is not empty.

Change-Id: I16246aa45c991a9396ef03d9bb083d97c3ca2e1a
 2011-04-26 14:08:45 +02:00
Park Sanghyun
2b2959b321 am e5da8565: DO NOT MERGE Add support for additional System Update menu item 
* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
  DO NOT MERGE Add support for additional System Update menu item
 2011-03-30 09:31:15 -07:00
Kenny Root
70a1ff0357 am 7fceefa7: Merge "Settings: Improved UX when viewing open source license info." 
* commit '7fceefa79229ece2efab0446841543a8f8f20a1d':
  Settings: Improved UX when viewing open source license info.
 2011-03-29 15:43:38 -07:00
Henrik Carlsson
2cb19ab9e2 Settings: Improved UX when viewing open source license info. 
Added spinning progress indicator to the open source license dialog.
The actual file loading is now handled by a separate thread, in
order to provide user feedback and reduce risk for ANR.

Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6
 2011-03-29 15:02:44 -07:00
Park Sanghyun
e5da8565ca DO NOT MERGE Add support for additional System Update menu item 
Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915
 2011-03-25 19:18:01 -07:00
Mike Lockwood
61487da6ac am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
* commit 'e6c7e45fdb5f23462693ea76eeac9489dd5c8dac':
  DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
 2011-03-14 13:34:57 -07:00
Mike Lockwood
e6c7e45fdb DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
Bug: 4061035

Change-Id: Idfec53b1da7b9b981c1c762468a3f69f78fedd7a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 19:19:27 -05:00
TK MUN
f018bd8cf3 am 36469186: DO NOT MERGE WiMAX settings menu 
* commit '36469186b7459d13688a2ca1c2316dbf172794dd':
  DO NOT MERGE WiMAX settings menu
 2011-03-09 23:11:59 -08:00
TK MUN
36469186b7 DO NOT MERGE WiMAX settings menu 
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>
 2011-03-09 23:02:21 -08:00
Lorenzo Colitti
a4fb8c8684 am f4393101: Merge "Support configuring the protocol in APN settings." into gingerbread 
* commit 'f4393101f80f0ca1a10771613a18565323b69fa2':
  Support configuring the protocol in APN settings.
 2011-03-03 17:07:39 -08:00
Lorenzo Colitti
f4393101f8 Merge "Support configuring the protocol in APN settings." into gingerbread 2011-03-03 17:03:45 -08:00
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
Lorenzo Colitti
a52c5698ca Support configuring the protocol in APN settings. 
Bug: 3333633
Change-Id: I0797cd97074fe1b8a1318168b86fe4627488215a
 2011-02-22 01:42:32 -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