OSDN Git Service
Chung-yih Wang [Wed, 14 Oct 2009 00:05:12 +0000 (17:05 -0700)]
am
c0ef160b: am
a5b7b45b: Push down the supplicant-specific double-quote handling to framework.
Merge commit '
c0ef160be719ae320e9d9574898ec9eef01ceb55'
* commit '
c0ef160be719ae320e9d9574898ec9eef01ceb55':
Push down the supplicant-specific double-quote handling to framework.
Eric Fischer [Tue, 13 Oct 2009 23:43:35 +0000 (16:43 -0700)]
Reimport translations.
Change-Id: I0127a0ad80f0736263d4e5dd01371184f2e16cdf
Eric Fischer [Tue, 13 Oct 2009 19:04:40 +0000 (12:04 -0700)]
am
b8ecb297: (-s ours) am
5204b662: am
9ef9801f: (-s ours) am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
b8ecb2977928e26ac93d083134e6a18aec29fcb1'
* commit '
b8ecb2977928e26ac93d083134e6a18aec29fcb1':
Jaikumar Ganesh [Tue, 13 Oct 2009 19:04:36 +0000 (12:04 -0700)]
am
9e976090: am
db99bb36: am
c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.
Merge commit '
9e9760903dbb6918fd978e0b419d1ac4465d28c1'
* commit '
9e9760903dbb6918fd978e0b419d1ac4465d28c1':
Eric Fischer [Tue, 13 Oct 2009 19:04:33 +0000 (12:04 -0700)]
am
978a9512: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
Merge commit '
978a95129323da61aaf2dc0d39302ae0cb043ba2'
* commit '
978a95129323da61aaf2dc0d39302ae0cb043ba2':
Show an error message when the remote side cancels the authentication
Import revised translations. DO NOT MERGE
Michael Chan [Tue, 13 Oct 2009 18:58:14 +0000 (11:58 -0700)]
am
875a034b: am
81cdaff7: b/
2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Merge commit '
875a034b6eed70e1928c96f336d9f5831f4023ea'
* commit '
875a034b6eed70e1928c96f336d9f5831f4023ea':
b/
2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Chung-yih Wang [Tue, 13 Oct 2009 01:41:08 +0000 (18:41 -0700)]
am
a5b7b45b: Push down the supplicant-specific double-quote handling to framework.
Merge commit '
a5b7b45b6fe125b5f04d248b0f624eee9a7ea7da' into eclair-mr2-plus-aosp
* commit '
a5b7b45b6fe125b5f04d248b0f624eee9a7ea7da':
Push down the supplicant-specific double-quote handling to framework.
Nick Pelly [Mon, 12 Oct 2009 19:38:39 +0000 (12:38 -0700)]
am
1577fac1: am
94ca23dc: am
d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Merge commit '
1577fac18ac6f084e81d68ffb444c3510a030f3c'
* commit '
1577fac18ac6f084e81d68ffb444c3510a030f3c':
Nick Pelly [Mon, 12 Oct 2009 19:38:35 +0000 (12:38 -0700)]
am
c7423763: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
Merge commit '
c74237633f0e5a3c4d1c59058e45b6e056e840ea'
* commit '
c74237633f0e5a3c4d1c59058e45b6e056e840ea':
Update application code for BluetoothAdapter.getDefaultAdapter().
Elliott Hughes [Mon, 12 Oct 2009 19:32:19 +0000 (12:32 -0700)]
am
c4cd095d: am
c52637df: Merge change I8e1b0fb7 into eclair-mr2
Merge commit '
c4cd095d7b90f1d35f661948283de0f2694b0b92'
* commit '
c4cd095d7b90f1d35f661948283de0f2694b0b92':
Fix Settings to show versionName instead of versionCode.
Eric Fischer [Mon, 12 Oct 2009 19:31:37 +0000 (12:31 -0700)]
am
8ba6a2d5: (-s ours) am
c197f154: am
06a111be: (-s ours) Merge change Ia3151ad3 into eclair
Merge commit '
8ba6a2d5e8591173ce3d1d6a5c4317c35e684d78'
* commit '
8ba6a2d5e8591173ce3d1d6a5c4317c35e684d78':
Import revised translations. DO NOT MERGE
Hung-ying Tyan [Mon, 12 Oct 2009 19:31:33 +0000 (12:31 -0700)]
am
b08ff302: am
1cd02cac: am
c0e34db1: Merge change Ifad4a4c0 into eclair
Merge commit '
b08ff302c987c58e58b3a26881fc4dac5f016185'
* commit '
b08ff302c987c58e58b3a26881fc4dac5f016185':
Add L2tpIpsec case in VpnSettings.processSecrets()
Amith Yamasani [Mon, 12 Oct 2009 18:43:56 +0000 (11:43 -0700)]
am
33aa0fad: am
cab9fe2d: Merge change I3c9f79ba into eclair-mr2
Merge commit '
33aa0fadf8cb0a7e4a4f23af17b30959927f083e'
* commit '
33aa0fadf8cb0a7e4a4f23af17b30959927f083e':
Retain webview history when viewing Safety notices. Fixes #
2160518
Jaikumar Ganesh [Mon, 12 Oct 2009 18:43:52 +0000 (11:43 -0700)]
Chia-chi Yeh [Mon, 12 Oct 2009 18:38:18 +0000 (11:38 -0700)]
am
b01a6f96: am
0bc5e275: SecuritySettings: reduce 1 access to KeyStore and clean up.
Merge commit '
b01a6f96c3da6d5ce718eca38f2f4185570a431b'
* commit '
b01a6f96c3da6d5ce718eca38f2f4185570a431b':
SecuritySettings: reduce 1 access to KeyStore and clean up.
Dan Vacura [Mon, 12 Oct 2009 18:38:15 +0000 (11:38 -0700)]
am
a89d3d35: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
Merge commit '
a89d3d3591c4457d46f1f2726c05ae8c2b3dc708'
* commit '
a89d3d3591c4457d46f1f2726c05ae8c2b3dc708':
Chung-yih Wang [Mon, 12 Oct 2009 18:17:39 +0000 (11:17 -0700)]
am
059c3f5d: am
a8f2f72d: Add the auth_alg field back.
Merge commit '
059c3f5d1eb52a7564208464b1d0f76af509e891'
* commit '
059c3f5d1eb52a7564208464b1d0f76af509e891':
Add the auth_alg field back.
Eric Fischer [Mon, 12 Oct 2009 18:17:35 +0000 (11:17 -0700)]
am
9ff282bb: (-s ours) am
6de9fb39: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9ff282bb755829145245d4730e6f87c042da1de4'
* commit '
9ff282bb755829145245d4730e6f87c042da1de4':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Mon, 12 Oct 2009 18:17:31 +0000 (11:17 -0700)]
am
6e6d2362: Merge change I25f2afba into eclair
Merge commit '
6e6d2362ccd119e51839a4f306c26783f634ab15'
* commit '
6e6d2362ccd119e51839a4f306c26783f634ab15':
Check if a device is added to the cache before returning.
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:26 +0000 (11:17 -0700)]
am
85ed0862: Merge change I454a0dbf into eclair
Merge commit '
85ed086217427308c3b2df5b4ba77fa5ae7326e6'
* commit '
85ed086217427308c3b2df5b4ba77fa5ae7326e6':
SecuritySettings: revert "minor tuning".
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:22 +0000 (11:17 -0700)]
am
9767612c: Merge change If764d20a into eclair
Merge commit '
9767612cc8207f906173dc9459b45cd07d881c4e'
* commit '
9767612cc8207f906173dc9459b45cd07d881c4e':
SecuritySettings: fix a the status before handling the intent.
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:18 +0000 (11:17 -0700)]
am
e61a2403: Merge change I844d3db3 into eclair
Merge commit '
e61a2403a64bd711dcf3abb36594eb6545601c80'
* commit '
e61a2403a64bd711dcf3abb36594eb6545601c80':
SecuritySettings: set the check box before further processing.
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:15 +0000 (11:17 -0700)]
am
1e98dfb4: Merge change I446bf8b5 into eclair
Merge commit '
1e98dfb480f7c7be6bd2c0dc752d7742765cd74e'
* commit '
1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
SecuritySettings: minor tuning.
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:11 +0000 (11:17 -0700)]
am
b83ff4af: Merge change Ibf07c83d into eclair
Merge commit '
b83ff4af8c359fd5cea276318f0c9e4487ec7465'
* commit '
b83ff4af8c359fd5cea276318f0c9e4487ec7465':
SecuritySettings: remove debug messages.
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:07 +0000 (11:17 -0700)]
am
51e97b33: Merge change Ia7c57145 into eclair
Merge commit '
51e97b33d265709da2aa69c861994574a0544aaa'
* commit '
51e97b33d265709da2aa69c861994574a0544aaa':
SecuritySettings: remove trailing spaces.
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:03 +0000 (11:17 -0700)]
am
c49ca127: Merge change I02f58e89 into eclair
Merge commit '
c49ca127aa993dc2ae402680ce392da06f0e1d4c'
* commit '
c49ca127aa993dc2ae402680ce392da06f0e1d4c':
SecuritySettings: clean up.
Chia-chi Yeh [Mon, 12 Oct 2009 18:16:59 +0000 (11:16 -0700)]
am
d2fa30ba: Merge change I28f1a0fc into eclair
Merge commit '
d2fa30baee10b755704beded16e8cf0ab2eb502f'
* commit '
d2fa30baee10b755704beded16e8cf0ab2eb502f':
WifiSettings: use keystore namespace instead of blobl.
Chung-yih Wang [Fri, 9 Oct 2009 03:29:45 +0000 (11:29 +0800)]
Push down the supplicant-specific double-quote handling to framework.
So we are able to connect to AP with ssid containing double-quotes.
Eric Fischer [Fri, 9 Oct 2009 00:52:46 +0000 (17:52 -0700)]
am
5204b662: am
9ef9801f: (-s ours) am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
5204b662a0c155f695cf4e7b6341872a803a7e80' into eclair-mr2-plus-aosp
* commit '
5204b662a0c155f695cf4e7b6341872a803a7e80':
Jaikumar Ganesh [Fri, 9 Oct 2009 00:52:42 +0000 (17:52 -0700)]
am
db99bb36: am
c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.
Merge commit '
db99bb36449f34d6f26f61092a6c77de1bb98c91' into eclair-mr2-plus-aosp
* commit '
db99bb36449f34d6f26f61092a6c77de1bb98c91':
Eric Fischer [Fri, 9 Oct 2009 00:52:42 +0000 (17:52 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
Eric Fischer [Fri, 9 Oct 2009 00:35:21 +0000 (17:35 -0700)]
am
9ef9801f: (-s ours) am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-mr2
* commit '
9ef9801f6f42d25b7e539262ebfec428546107fc':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Fri, 9 Oct 2009 00:30:28 +0000 (17:30 -0700)]
am
c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.
Merge commit '
c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-mr2
* commit '
c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
Show an error message when the remote side cancels the authentication
Eric Fischer [Thu, 8 Oct 2009 22:15:52 +0000 (15:15 -0700)]
am
9ef9801f: am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-plus-aosp
* commit '
9ef9801f6f42d25b7e539262ebfec428546107fc':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:02:30 +0000 (15:02 -0700)]
am
0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0512f51f21901e4a3f3f60aba82e3bb87ab0cc72' into eclair
* commit '
0512f51f21901e4a3f3f60aba82e3bb87ab0cc72':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Thu, 8 Oct 2009 20:18:24 +0000 (13:18 -0700)]
am
c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.
Merge commit '
c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-plus-aosp
* commit '
c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
Show an error message when the remote side cancels the authentication
Michael Chan [Thu, 8 Oct 2009 19:07:14 +0000 (12:07 -0700)]
am
81cdaff7: b/
2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Merge commit '
81cdaff7b5aed3ea2b987b23e2e9a6c0213b0aa5' into eclair-mr2-plus-aosp
* commit '
81cdaff7b5aed3ea2b987b23e2e9a6c0213b0aa5':
b/
2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Michael Chan [Wed, 7 Oct 2009 23:13:47 +0000 (16:13 -0700)]
b/
2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Change-Id: Ib4dd6254c90da619e853b1be22fba3ff1365258e
Jaikumar Ganesh [Thu, 8 Oct 2009 15:06:27 +0000 (08:06 -0700)]
Show an error message when the remote side cancels the authentication
and show OPP device list correctly.
Dr No: Eastham
Bug:
2174874
Nick Pelly [Wed, 7 Oct 2009 23:41:31 +0000 (16:41 -0700)]
am
94ca23dc: am
d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Merge commit '
94ca23dcb049c11b097c3c1f9fe9091b3d40d337' into eclair-mr2-plus-aosp
* commit '
94ca23dcb049c11b097c3c1f9fe9091b3d40d337':
Nick Pelly [Wed, 7 Oct 2009 23:41:31 +0000 (16:41 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
Nick Pelly [Wed, 7 Oct 2009 23:36:16 +0000 (16:36 -0700)]
am
d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Merge commit '
d1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-plus-aosp
* commit '
d1a04291c537e271999c7e7c5c72f1f61632aacf':
Update application code for BluetoothAdapter.getDefaultAdapter().
Nick Pelly [Wed, 7 Oct 2009 23:36:07 +0000 (16:36 -0700)]
am
d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Merge commit '
d1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-mr2
* commit '
d1a04291c537e271999c7e7c5c72f1f61632aacf':
Update application code for BluetoothAdapter.getDefaultAdapter().
Nick Pelly [Wed, 7 Oct 2009 23:03:34 +0000 (01:03 +0200)]
Update application code for BluetoothAdapter.getDefaultAdapter().
Change-Id: Ic8f2188a28631f55ceb048daff545ca5e6053f92
DrNo: eastham
Bug:
2158765
Joke: When is a car not a car? When it turns into a driveway.
Eric Fischer [Wed, 7 Oct 2009 19:08:59 +0000 (12:08 -0700)]
am
06a111be: Merge change Ia3151ad3 into eclair
Merge commit '
06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp
* commit '
06a111be6d3ccf44de545a084302c2085cbb07de':
Import revised translations. DO NOT MERGE
Hung-ying Tyan [Wed, 7 Oct 2009 19:08:55 +0000 (12:08 -0700)]
am
c0e34db1: Merge change Ifad4a4c0 into eclair
Merge commit '
c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-plus-aosp
* commit '
c0e34db16864e25946b288cb165ad833b62d3b18':
Add L2tpIpsec case in VpnSettings.processSecrets()
Elliott Hughes [Wed, 7 Oct 2009 19:02:16 +0000 (12:02 -0700)]
am
c52637df: Merge change I8e1b0fb7 into eclair-mr2
Merge commit '
c52637dfab3178fa4d973ec3b41158903b71454f' into eclair-mr2-plus-aosp
* commit '
c52637dfab3178fa4d973ec3b41158903b71454f':
Fix Settings to show versionName instead of versionCode.
Android (Google) Code Review [Wed, 7 Oct 2009 18:58:06 +0000 (14:58 -0400)]
Merge change I8e1b0fb7 into eclair-mr2
* changes:
Fix Settings to show versionName instead of versionCode.
Jaikumar Ganesh [Wed, 7 Oct 2009 18:55:47 +0000 (11:55 -0700)]
am
98d76cc9: Remove STOPSHIP debug log.
Merge commit '
98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-plus-aosp
* commit '
98d76cc9b882466a97fb55913f5a507a642b5018':
Remove STOPSHIP debug log.
Eric Fischer [Wed, 7 Oct 2009 18:52:21 +0000 (11:52 -0700)]
am
c197f154: am
06a111be: (-s ours) Merge change Ia3151ad3 into eclair
Merge commit '
c197f15486c053e89bc610c7e7b497130f4fb5a7' into eclair-mr2-plus-aosp
* commit '
c197f15486c053e89bc610c7e7b497130f4fb5a7':
Import revised translations. DO NOT MERGE
Hung-ying Tyan [Wed, 7 Oct 2009 18:52:17 +0000 (11:52 -0700)]
am
1cd02cac: am
c0e34db1: Merge change Ifad4a4c0 into eclair
Merge commit '
1cd02caccd4aa5b70ae342de386a21255cf9bed7' into eclair-mr2-plus-aosp
* commit '
1cd02caccd4aa5b70ae342de386a21255cf9bed7':
Add L2tpIpsec case in VpnSettings.processSecrets()
Eric Fischer [Wed, 7 Oct 2009 18:46:42 +0000 (11:46 -0700)]
am
06a111be: (-s ours) Merge change Ia3151ad3 into eclair
Merge commit '
06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-mr2
* commit '
06a111be6d3ccf44de545a084302c2085cbb07de':
Import revised translations. DO NOT MERGE
Hung-ying Tyan [Wed, 7 Oct 2009 18:46:38 +0000 (11:46 -0700)]
am
c0e34db1: Merge change Ifad4a4c0 into eclair
Merge commit '
c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-mr2
* commit '
c0e34db16864e25946b288cb165ad833b62d3b18':
Add L2tpIpsec case in VpnSettings.processSecrets()
Chung-yih Wang [Wed, 7 Oct 2009 18:39:17 +0000 (11:39 -0700)]
am
a8f2f72d: Add the auth_alg field back.
Merge commit '
a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-plus-aosp
* commit '
a8f2f72da8693418f867de9c904eb250b7aae4ff':
Add the auth_alg field back.
Android (Google) Code Review [Wed, 7 Oct 2009 18:38:10 +0000 (14:38 -0400)]
Merge change Ia3151ad3 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 7 Oct 2009 18:36:10 +0000 (11:36 -0700)]
am
6de9fb39: Import revised translations. DO NOT MERGE
Merge commit '
6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp
* commit '
6de9fb390b9eab0dbaf9709db5149eefc18724da':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Wed, 7 Oct 2009 18:32:19 +0000 (11:32 -0700)]
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.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:30 +0000 (11:31 -0700)]
am
85ed0862: Merge change I454a0dbf into eclair
Merge commit '
85ed086217427308c3b2df5b4ba77fa5ae7326e6' into eclair-plus-aosp
* commit '
85ed086217427308c3b2df5b4ba77fa5ae7326e6':
SecuritySettings: revert "minor tuning".
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:26 +0000 (11:31 -0700)]
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.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:22 +0000 (11:31 -0700)]
am
e61a2403: Merge change I844d3db3 into eclair
Merge commit '
e61a2403a64bd711dcf3abb36594eb6545601c80' into eclair-plus-aosp
* commit '
e61a2403a64bd711dcf3abb36594eb6545601c80':
SecuritySettings: set the check box before further processing.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:18 +0000 (11:31 -0700)]
am
1e98dfb4: Merge change I446bf8b5 into eclair
Merge commit '
1e98dfb480f7c7be6bd2c0dc752d7742765cd74e' into eclair-plus-aosp
* commit '
1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
SecuritySettings: minor tuning.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:15 +0000 (11:31 -0700)]
am
b83ff4af: Merge change Ibf07c83d into eclair
Merge commit '
b83ff4af8c359fd5cea276318f0c9e4487ec7465' into eclair-plus-aosp
* commit '
b83ff4af8c359fd5cea276318f0c9e4487ec7465':
SecuritySettings: remove debug messages.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:11 +0000 (11:31 -0700)]
am
51e97b33: Merge change Ia7c57145 into eclair
Merge commit '
51e97b33d265709da2aa69c861994574a0544aaa' into eclair-plus-aosp
* commit '
51e97b33d265709da2aa69c861994574a0544aaa':
SecuritySettings: remove trailing spaces.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:08 +0000 (11:31 -0700)]
am
c49ca127: Merge change I02f58e89 into eclair
Merge commit '
c49ca127aa993dc2ae402680ce392da06f0e1d4c' into eclair-plus-aosp
* commit '
c49ca127aa993dc2ae402680ce392da06f0e1d4c':
SecuritySettings: clean up.
Chia-chi Yeh [Wed, 7 Oct 2009 18:31:03 +0000 (11:31 -0700)]
am
d2fa30ba: Merge change I28f1a0fc into eclair
Merge commit '
d2fa30baee10b755704beded16e8cf0ab2eb502f' into eclair-plus-aosp
* commit '
d2fa30baee10b755704beded16e8cf0ab2eb502f':
WifiSettings: use keystore namespace instead of blobl.
Elliott Hughes [Wed, 7 Oct 2009 18:12:33 +0000 (11:12 -0700)]
Fix Settings to show versionName instead of versionCode.
Android (Google) Code Review [Wed, 7 Oct 2009 00:47:46 +0000 (20:47 -0400)]
Merge change Ifad4a4c0 into eclair
* changes:
Add L2tpIpsec case in VpnSettings.processSecrets()
Eric Fischer [Tue, 6 Oct 2009 23:54:08 +0000 (16:54 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Amith Yamasani [Tue, 6 Oct 2009 22:18:15 +0000 (15:18 -0700)]
am
cab9fe2d: Merge change I3c9f79ba into eclair-mr2
Merge commit '
cab9fe2d41eba522a485dcad2b8e91f789e48c57' into eclair-mr2-plus-aosp
* commit '
cab9fe2d41eba522a485dcad2b8e91f789e48c57':
Retain webview history when viewing Safety notices. Fixes #
2160518
Jaikumar Ganesh [Tue, 6 Oct 2009 21:50:40 +0000 (14:50 -0700)]
am
f43b1a9d: am
98d76cc9: Remove STOPSHIP debug log.
Merge commit '
f43b1a9d2428ec9e403a918ffb724ccf755ba2f9' into eclair-mr2-plus-aosp
* commit '
f43b1a9d2428ec9e403a918ffb724ccf755ba2f9':
Remove STOPSHIP debug log.
Android (Google) Code Review [Tue, 6 Oct 2009 20:58:21 +0000 (16:58 -0400)]
Merge change I3c9f79ba into eclair-mr2
* changes:
Retain webview history when viewing Safety notices. Fixes #
2160518
Jaikumar Ganesh [Tue, 6 Oct 2009 20:35:19 +0000 (13:35 -0700)]
am
98d76cc9: Remove STOPSHIP debug log.
Merge commit '
98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-mr2
* commit '
98d76cc9b882466a97fb55913f5a507a642b5018':
Remove STOPSHIP debug log.
Amith Yamasani [Tue, 6 Oct 2009 20:10:14 +0000 (13:10 -0700)]
Retain webview history when viewing Safety notices. Fixes #
2160518
Save and restore webview history when changing orientation.
Jaikumar Ganesh [Tue, 6 Oct 2009 15:01:21 +0000 (08:01 -0700)]
Remove STOPSHIP debug log.
Bug:
2151872
Dr No: Eastham
Chia-chi Yeh [Tue, 6 Oct 2009 10:05:02 +0000 (03:05 -0700)]
am
0bc5e275: SecuritySettings: reduce 1 access to KeyStore and clean up.
Merge commit '
0bc5e275fdbbb8e80f8259136caf45a356922c40' into eclair-mr2-plus-aosp
* commit '
0bc5e275fdbbb8e80f8259136caf45a356922c40':
SecuritySettings: reduce 1 access to KeyStore and clean up.
Dan Vacura [Tue, 6 Oct 2009 10:05:02 +0000 (03:05 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
Hung-ying Tyan [Tue, 6 Oct 2009 08:15:42 +0000 (16:15 +0800)]
Add L2tpIpsec case in VpnSettings.processSecrets()
Chia-chi Yeh [Tue, 6 Oct 2009 07:43:55 +0000 (15:43 +0800)]
SecuritySettings: reduce 1 access to KeyStore and clean up.
Chung-yih Wang [Sun, 4 Oct 2009 22:18:34 +0000 (15:18 -0700)]
am
a8f2f72d: Add the auth_alg field back.
Merge commit '
a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-mr2
* commit '
a8f2f72da8693418f867de9c904eb250b7aae4ff':
Add the auth_alg field back.
Eric Fischer [Sun, 4 Oct 2009 22:15:58 +0000 (15:15 -0700)]
am
6de9fb39: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-mr2
* commit '
6de9fb390b9eab0dbaf9709db5149eefc18724da':
Import revised translations. DO NOT MERGE
Chung-yih Wang [Fri, 2 Oct 2009 08:06:22 +0000 (16:06 +0800)]
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.
Eric Fischer [Fri, 2 Oct 2009 00:02:17 +0000 (17:02 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
android-build SharedAccount [Thu, 1 Oct 2009 22:13:00 +0000 (15:13 -0700)]
am
3a0fc70b: am
40906ea2: empty merge to avoid future conflicts
Merge commit '
3a0fc70b691201cf1806661224c94bd564354f63'
* commit '
3a0fc70b691201cf1806661224c94bd564354f63':
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Michael Chan [Thu, 1 Oct 2009 22:12:16 +0000 (15:12 -0700)]
am
93979854: am
7bf9e031: Merge change Ie7e8a7ef into eclair
Merge commit '
93979854db687085e66173b10551ebf8915e7ab1'
* commit '
93979854db687085e66173b10551ebf8915e7ab1':
Don't auto-connect to OPP after pairing
Amith Yamasani [Thu, 1 Oct 2009 20:39:27 +0000 (13:39 -0700)]
am
7c8a08d5: am
ee52bed5: Merge change I39527366 into eclair
Merge commit '
7c8a08d51389e1c2c0411a1a4a12646880199e01'
* commit '
7c8a08d51389e1c2c0411a1a4a12646880199e01':
Use a custom system icon for native processes.
Mike Cleron [Thu, 1 Oct 2009 20:39:22 +0000 (13:39 -0700)]
Michael Chan [Thu, 1 Oct 2009 20:39:17 +0000 (13:39 -0700)]
am
f30ebb8b: am
e6531e25: b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Merge commit '
f30ebb8bc86482e057f68083f0c09f7da1c89652'
* commit '
f30ebb8bc86482e057f68083f0c09f7da1c89652':
b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Android (Google) Code Review [Thu, 1 Oct 2009 20:07:49 +0000 (16:07 -0400)]
Merge change I25f2afba into eclair
* changes:
Check if a device is added to the cache before returning.
Jaikumar Ganesh [Thu, 1 Oct 2009 18:34:17 +0000 (11:34 -0700)]
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
Amith Yamasani [Thu, 1 Oct 2009 19:21:07 +0000 (12:21 -0700)]
Jaikumar Ganesh [Thu, 1 Oct 2009 19:17:53 +0000 (12:17 -0700)]
am
8c5ff4b7: am
1eb1df08: Add strings for authentication type.
Merge commit '
8c5ff4b76a5bd3bc7d578ca2cdf89c2e1c423973'
* commit '
8c5ff4b76a5bd3bc7d578ca2cdf89c2e1c423973':
Add strings for authentication type.
Michael Chan [Thu, 1 Oct 2009 19:15:45 +0000 (12:15 -0700)]
am
eedf612f: am
e3b59f19: Merge change I5eab1270 into eclair
Merge commit '
eedf612f83c78eb8c60cb8b9034c25bd627eda8f'
* commit '
eedf612f83c78eb8c60cb8b9034c25bd627eda8f':
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Debajit Ghosh [Thu, 1 Oct 2009 19:13:27 +0000 (12:13 -0700)]
Hung-ying Tyan [Thu, 1 Oct 2009 18:55:05 +0000 (11:55 -0700)]
am
39087f8a: am
8fd062e1: Use the new VpnType.getDescriptionId().
Merge commit '
39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa'
* commit '
39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa':
Use the new VpnType.getDescriptionId().
Mike Cleron [Thu, 1 Oct 2009 18:54:10 +0000 (11:54 -0700)]
Hung-ying Tyan [Thu, 1 Oct 2009 18:49:17 +0000 (11:49 -0700)]
am
06167cc3: am
b0883cb3: Fix bugs in credential storage settings:
Merge commit '
06167cc39569fde2a9bdbff859ff5358f2f90a0b'
* commit '
06167cc39569fde2a9bdbff859ff5358f2f90a0b':
Fix bugs in credential storage settings:
Dianne Hackborn [Thu, 1 Oct 2009 18:44:45 +0000 (11:44 -0700)]
am
78651523: am
cabb147c: Improve running services info.
Merge commit '
78651523727ee3aadec008faa7ae5a945c51ab69'
* commit '
78651523727ee3aadec008faa7ae5a945c51ab69':
Improve running services info.
Jim Miller [Thu, 1 Oct 2009 18:40:29 +0000 (11:40 -0700)]
am
356ceb58: am
be699645: Merge change I56544d0e into eclair
Merge commit '
356ceb5853243762d00d0c4e1482fbe887f66e3e'
* commit '
356ceb5853243762d00d0c4e1482fbe887f66e3e':
Fix for
2137900: Be more conservative about poking the wakelock
Ken Shirriff [Thu, 1 Oct 2009 18:38:10 +0000 (11:38 -0700)]
am
f666279a: am
eb8d6f78: Merge change Id80d1999 into eclair
Merge commit '
f666279a60cd371c938955448453ccac2428b539'
* commit '
f666279a60cd371c938955448453ccac2428b539':
Fix power widget brightness.
Android (Google) Code Review [Thu, 1 Oct 2009 18:35:13 +0000 (14:35 -0400)]
Merge change I454a0dbf into eclair
* changes:
SecuritySettings: revert "minor tuning".
OSDN Git Service
