PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
810 Commits 1 Branch 0 Tags
d92be71168bd4f552d837e223b18ccd0c040ae49
Commit Graph

810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
d92be71168 am c0e34db1: Merge change Ifad4a4c0 into eclair 
Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-plus-aosp

* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
  Add L2tpIpsec case in VpnSettings.processSecrets()
 2009-10-07 12:08:55 -07:00
Jaikumar Ganesh
caf43948b7 am 98d76cc9: Remove STOPSHIP debug log. 
Merge commit '98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-plus-aosp

* commit '98d76cc9b882466a97fb55913f5a507a642b5018':
  Remove STOPSHIP debug log.
 2009-10-07 11:55:47 -07:00
Chung-yih Wang
02c9f8eb95 am a8f2f72d: Add the auth_alg field back. 
Merge commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-plus-aosp

* commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff':
  Add the auth_alg field back.
 2009-10-07 11:39:17 -07:00
Eric Fischer
098ef4cb96 am 6de9fb39: Import revised translations. DO NOT MERGE 
Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp

* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
  Import revised translations.  DO NOT MERGE
 2009-10-07 11:36:10 -07:00
Jaikumar Ganesh
ff50d1c3a6 am 6e6d2362: Merge change I25f2afba into eclair 
Merge commit '6e6d2362ccd119e51839a4f306c26783f634ab15' into eclair-plus-aosp

* commit '6e6d2362ccd119e51839a4f306c26783f634ab15':
  Check if a device is added to the cache before returning.
 2009-10-07 11:32:19 -07:00
Chia-chi Yeh
21f14b5f46 am 85ed0862: Merge change I454a0dbf into eclair 
Merge commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6' into eclair-plus-aosp

* commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6':
  SecuritySettings: revert "minor tuning".
 2009-10-07 11:31:30 -07:00
Chia-chi Yeh
901607e2c3 am 9767612c: Merge change If764d20a into eclair 
Merge commit '9767612cc8207f906173dc9459b45cd07d881c4e' into eclair-plus-aosp

* commit '9767612cc8207f906173dc9459b45cd07d881c4e':
  SecuritySettings: fix a the status before handling the intent.
 2009-10-07 11:31:26 -07:00
Chia-chi Yeh
cb741212e3 am e61a2403: Merge change I844d3db3 into eclair 
Merge commit 'e61a2403a64bd711dcf3abb36594eb6545601c80' into eclair-plus-aosp

* commit 'e61a2403a64bd711dcf3abb36594eb6545601c80':
  SecuritySettings: set the check box before further processing.
 2009-10-07 11:31:22 -07:00
Chia-chi Yeh
85fe2beb21 am 1e98dfb4: Merge change I446bf8b5 into eclair 
Merge commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e' into eclair-plus-aosp

* commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
  SecuritySettings: minor tuning.
 2009-10-07 11:31:18 -07:00
Chia-chi Yeh
3d5f9fbf45 am b83ff4af: Merge change Ibf07c83d into eclair 
Merge commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465' into eclair-plus-aosp

* commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465':
  SecuritySettings: remove debug messages.
 2009-10-07 11:31:15 -07:00
Chia-chi Yeh
9cb59deecc am 51e97b33: Merge change Ia7c57145 into eclair 
Merge commit '51e97b33d265709da2aa69c861994574a0544aaa' into eclair-plus-aosp

* commit '51e97b33d265709da2aa69c861994574a0544aaa':
  SecuritySettings: remove trailing spaces.
 2009-10-07 11:31:11 -07:00
Chia-chi Yeh
ecd42371f4 am c49ca127: Merge change I02f58e89 into eclair 
Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c' into eclair-plus-aosp

* commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c':
  SecuritySettings: clean up.
 2009-10-07 11:31:08 -07:00
Chia-chi Yeh
69a58693d0 am d2fa30ba: Merge change I28f1a0fc into eclair 
Merge commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f' into eclair-plus-aosp

* commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f':
  WifiSettings: use keystore namespace instead of blobl.
 2009-10-07 11:31:03 -07:00
Android (Google) Code Review
c0e34db168 Merge change Ifad4a4c0 into eclair 
* changes:
  Add L2tpIpsec case in VpnSettings.processSecrets()
 2009-10-06 20:47:46 -04:00
Jaikumar Ganesh
98d76cc9b8 Remove STOPSHIP debug log. 
Bug: 2151872
Dr No: Eastham
 2009-10-06 08:01:21 -07:00
Hung-ying Tyan
fad4a4c07a Add L2tpIpsec case in VpnSettings.processSecrets() 2009-10-06 16:15:42 +08:00
Chung-yih Wang
a8f2f72da8 Add the auth_alg field back. 
This change is to fix the issue http://b/issue?id=2161539.

The auth_alg field is required for auth. type 'SHARED' with WEP mode, it will
not be automatically selected as claimed. The change has been verified on
Linksys WRT54G.
 2009-10-02 16:09:15 +08:00
Eric Fischer
6de9fb390b Import revised translations. DO NOT MERGE 
Approver: jerryw
 2009-10-01 17:02:17 -07:00
Android (Google) Code Review
6e6d2362cc Merge change I25f2afba into eclair 
* changes:
  Check if a device is added to the cache before returning.
 2009-10-01 16:07:49 -04:00
Jaikumar Ganesh
fca3c1cf8b Check if a device is added to the cache before returning. 
For incoming connections, we don't have the device in the Settings cache.
After we tried to readPairedDevices, check if we added to the cache.
If we successfully added it, continue with the connections, else bail out.

Bug id: 2160617

Change-Id: I25f2afba8ef6d2c32a7940f967cf12f1321ad9e0
 2009-10-01 13:05:22 -07:00
Android (Google) Code Review
85ed086217 Merge change I454a0dbf into eclair 
* changes:
  SecuritySettings: revert "minor tuning".
 2009-10-01 14:35:13 -04:00
Chia-chi Yeh
454a0dbf8f SecuritySettings: revert "minor tuning". 2009-10-02 02:32:54 +08:00
Android (Google) Code Review
9767612cc8 Merge change If764d20a into eclair 
* changes:
  SecuritySettings: fix a the status before handling the intent.
 2009-10-01 14:17:26 -04:00
Chia-chi Yeh
f764d20a74 SecuritySettings: fix a the status before handling the intent. 2009-10-02 02:16:08 +08:00
Android (Google) Code Review
e61a2403a6 Merge change I844d3db3 into eclair 
* changes:
  SecuritySettings: set the check box before further processing.
 2009-10-01 13:14:59 -04:00
Chia-chi Yeh
844d3db3fe SecuritySettings: set the check box before further processing. 2009-10-02 01:13:36 +08:00
Android (Google) Code Review
1e98dfb480 Merge change I446bf8b5 into eclair 
* changes:
  SecuritySettings: minor tuning.
 2009-10-01 13:12:21 -04:00
Chia-chi Yeh
446bf8b5bc SecuritySettings: minor tuning. 2009-10-02 01:11:17 +08:00
Android (Google) Code Review
b83ff4af8c Merge change Ibf07c83d into eclair 
* changes:
  SecuritySettings: remove debug messages.
 2009-10-01 13:04:25 -04:00
Chia-chi Yeh
bf07c83d92 SecuritySettings: remove debug messages. 2009-10-02 01:03:50 +08:00
Android (Google) Code Review
51e97b33d2 Merge change Ia7c57145 into eclair 
* changes:
  SecuritySettings: remove trailing spaces.
 2009-10-01 12:49:08 -04:00
Chia-chi Yeh
a7c5714599 SecuritySettings: remove trailing spaces. 2009-10-02 00:48:32 +08:00
Android (Google) Code Review
c49ca127aa Merge change I02f58e89 into eclair 
* changes:
  SecuritySettings: clean up.
 2009-10-01 12:47:24 -04:00
Android (Google) Code Review
d2fa30baee Merge change I28f1a0fc into eclair 
* changes:
  WifiSettings: use keystore namespace instead of blobl.
 2009-10-01 12:47:12 -04:00
Chia-chi Yeh
02f58e898d SecuritySettings: clean up. 2009-10-02 00:39:14 +08:00
android-build SharedAccount
3a0fc70b69 am 40906ea2: empty merge to avoid future conflicts 
Merge commit '40906ea24eceed5b06be2087d8e06738fc9cd876' into eclair-plus-aosp

* commit '40906ea24eceed5b06be2087d8e06738fc9cd876':
  b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
 2009-10-01 08:57:04 -07:00
android-build SharedAccount
40906ea24e empty merge to avoid future conflicts 
Merge branch 'eclair-release' into HEAD
 2009-10-01 08:46:43 -07:00
Michael Chan
93979854db am 7bf9e031: Merge change Ie7e8a7ef into eclair 
Merge commit '7bf9e0317cfb62b12e99ed9ab6c6975c848c519e' into eclair-plus-aosp

* commit '7bf9e0317cfb62b12e99ed9ab6c6975c848c519e':
  Don't auto-connect to OPP after pairing
 2009-10-01 07:54:39 -07:00
Android (Google) Code Review
7bf9e0317c Merge change Ie7e8a7ef into eclair 
* changes:
  Don't auto-connect to OPP after pairing
 2009-10-01 10:46:26 -04:00
Chia-chi Yeh
28f1a0fc5b WifiSettings: use keystore namespace instead of blobl. 2009-10-01 19:17:55 +08:00
Michael Chan
b547dda338 Don't auto-connect to OPP after pairing 
Change-Id: Ie7e8a7ef7188f7ffa6b32595764c100a0d72be89
 2009-09-30 23:08:19 -07:00
Amith Yamasani
7c8a08d513 am ee52bed5: Merge change I39527366 into eclair 
Merge commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b' into eclair-plus-aosp

* commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b':
  Use a custom system icon for native processes.
 2009-09-30 21:15:52 -07:00
Mike Cleron
d6372e995c am c5648906: Merge change I00ab9f0b into eclair 
Merge commit 'c564890637bf91e92ede27789e4d98863c46e681' into eclair-plus-aosp

* commit 'c564890637bf91e92ede27789e4d98863c46e681':
  Fix widgets
 2009-09-30 21:15:36 -07:00
Michael Chan
f30ebb8bc8 am e6531e25: b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..." 
Merge commit 'e6531e253bf646324d3a68de0e9cc612c5e1c8ac' into eclair-plus-aosp

* commit 'e6531e253bf646324d3a68de0e9cc612c5e1c8ac':
  b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
 2009-09-30 21:14:24 -07:00
Android (Google) Code Review
ee52bed514 Merge change I39527366 into eclair 
* changes:
  Use a custom system icon for native processes.
 2009-09-30 21:43:48 -04:00
Amith Yamasani
395273662c Use a custom system icon for native processes. 
New icons for system components in Battery Use screen.
 2009-09-30 18:42:29 -07:00
Android (Google) Code Review
c564890637 Merge change I00ab9f0b into eclair 
* changes:
  Fix widgets
 2009-09-30 21:34:36 -04:00
Mike Cleron
00ab9f0b51 Fix widgets 2009-09-30 18:29:25 -07:00
Michael Chan
e6531e253b b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..." 
Change-Id: I34249a4828707bde491da4a82dca94ecf37cf490
 2009-09-30 17:43:12 -07:00
Michael Chan
fa44848b0d b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs 
Reset connect timer event if profile was non-empty.
Clear profiles after unpair
mConnectAttemptedWithoutUuid

Change-Id: I5eab1270a755c6c87eb5be13a2f43dbbcd9a2f88
 2009-09-30 15:26:18 -07:00