OSDN Git Service
Michael Chan [Fri, 6 Nov 2009 21:32:42 +0000 (13:32 -0800)]
am
834e5993: b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '
834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-plus-aosp
* commit '
834e5993e4f2f34d5aceb3196601b30231d00b07':
b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Michael Chan [Fri, 6 Nov 2009 02:25:55 +0000 (18:25 -0800)]
b/
2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Also added test app.
Michael Chan [Thu, 5 Nov 2009 18:32:02 +0000 (10:32 -0800)]
am
4d004e91: b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '
4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-plus-aosp
* commit '
4d004e910732565ddd449c7c525f7d6cbd353392':
b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Michael Chan [Thu, 5 Nov 2009 01:19:48 +0000 (17:19 -0800)]
b/
2238546 Fixed NPE in Settings when Bluetooth "class" is null
Jean-Michel Trivi [Mon, 2 Nov 2009 18:52:23 +0000 (10:52 -0800)]
am
9d6be2ba: Add backup string for a platform setting to enable or disable advanced audio recording features on QSD8k phones.
Merge commit '
9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp
* commit '
9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Jean-Michel Trivi [Fri, 30 Oct 2009 23:03:47 +0000 (16:03 -0700)]
Add backup string for a platform setting to enable or disable
advanced audio recording features on QSD8k phones.
Eric Fischer [Fri, 30 Oct 2009 18:17:48 +0000 (11:17 -0700)]
am
8e3c8c20: Merge change I1d016ce3 into eclair
Merge commit '
8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-plus-aosp
* commit '
8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Fri, 30 Oct 2009 18:09:06 +0000 (14:09 -0400)]
Merge change I1d016ce3 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 17:05:54 +0000 (10:05 -0700)]
Import revised translations. DO NOT MERGE
Mike Lockwood [Fri, 30 Oct 2009 17:00:39 +0000 (10:00 -0700)]
am
fd07eb22: Merge change Ibe1d06fc into eclair
Merge commit '
fd07eb222b6bd32039cdc2545fb75552835e418f' into eclair-plus-aosp
* commit '
fd07eb222b6bd32039cdc2545fb75552835e418f':
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Android (Google) Code Review [Fri, 30 Oct 2009 16:56:20 +0000 (12:56 -0400)]
Merge change Ibe1d06fc into eclair
* changes:
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Mike Lockwood [Fri, 30 Oct 2009 07:08:03 +0000 (03:08 -0400)]
Avoid setting screen brightness when initializing brightness dialog in automatic mode.
Fixes bug b/
2226257 (Brightness wonky)
Change-Id: Ibe1d06fc907960dcb6a70faa92e6c3a562016865
Signed-off-by: Mike Lockwood <lockwood@android.com>
Michael Chan [Fri, 30 Oct 2009 00:55:04 +0000 (17:55 -0700)]
am
0cb3743e: b/
2219381 Gray out Bluetooth Settings for the emulator
Merge commit '
0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-plus-aosp
* commit '
0cb3743e93aef81e7669f1e6c81184559e0f8154':
b/
2219381 Gray out Bluetooth Settings for the emulator
Michael Chan [Thu, 29 Oct 2009 21:42:06 +0000 (14:42 -0700)]
b/
2219381 Gray out Bluetooth Settings for the emulator
Change-Id: I11ae2e6c7652ba550aeadf0dadb6f520c19dedc6
Amith Yamasani [Thu, 29 Oct 2009 13:35:07 +0000 (06:35 -0700)]
am
dd45a47b: Merge change I4d31288f into eclair
Merge commit '
dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-plus-aosp
* commit '
dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
Fix for
1974140. Delete entry if not valid on hitting home.
Android (Google) Code Review [Thu, 29 Oct 2009 13:28:35 +0000 (09:28 -0400)]
Merge change I4d31288f into eclair
* changes:
Fix for
1974140. Delete entry if not valid on hitting home.
Eric Fischer [Thu, 29 Oct 2009 06:35:05 +0000 (23:35 -0700)]
am
17fcd476: Import revised translations. DO NOT MERGE
Merge commit '
17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-plus-aosp
* commit '
17fcd476643e27943f548415e49e1be7d8e74ac1':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 04:19:37 +0000 (21:19 -0700)]
Import revised translations. DO NOT MERGE
Mike Lockwood [Thu, 29 Oct 2009 00:14:34 +0000 (17:14 -0700)]
am
53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.
Merge commit '
53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-plus-aosp
* commit '
53dcdeeb85e523e0b752d802d3413f5d4001d575':
Don't restore old brightness when cancelling brightness dialog in automatic mode.
Amith Yamasani [Wed, 28 Oct 2009 23:59:17 +0000 (16:59 -0700)]
Fix for
1974140. Delete entry if not valid on hitting home.
If user doesn't enter an APN or name, then delete the entry on hitting home.
And if user has enough information but doesn't enter a name, then set the
name to "Untitled" to avoid blank APNs in the list.
Mike Lockwood [Wed, 28 Oct 2009 22:33:04 +0000 (18:33 -0400)]
Don't restore old brightness when cancelling brightness dialog in automatic mode.
Fixes a problem that could result in the backlight getting set to a bogus brightness
level if you open the dialog and cancel when in automatic mode.
Bug b/
2015734
Change-Id: I302697e4ebd37afcdbfdd74ba0b1cc9be27ee40b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Cleron [Wed, 28 Oct 2009 07:22:03 +0000 (00:22 -0700)]
am
d02acfb9: Merge change I2abbb876 into eclair
Merge commit '
d02acfb908562780eec830a85e121f9925108c36' into eclair-plus-aosp
* commit '
d02acfb908562780eec830a85e121f9925108c36':
New widgets
Android (Google) Code Review [Wed, 28 Oct 2009 07:16:41 +0000 (03:16 -0400)]
Merge change I2abbb876 into eclair
* changes:
New widgets
Mike Cleron [Tue, 27 Oct 2009 21:05:27 +0000 (14:05 -0700)]
New widgets
Eric Fischer [Tue, 27 Oct 2009 19:17:40 +0000 (12:17 -0700)]
am
e0711522: Use consistent punctuation for the Chinese locale names.
Merge commit '
e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-plus-aosp
* commit '
e0711522bc5e7c62951b0e429c4b4550feeeabf0':
Use consistent punctuation for the Chinese locale names.
Eric Fischer [Tue, 27 Oct 2009 00:54:44 +0000 (17:54 -0700)]
Use consistent punctuation for the Chinese locale names.
Bug
2216349
Jaikumar Ganesh [Mon, 26 Oct 2009 22:26:52 +0000 (15:26 -0700)]
am
195bc434: Add Authentication Type field to the APN settings.
Merge commit '
195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-plus-aosp
* commit '
195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
Jaikumar Ganesh [Mon, 26 Oct 2009 20:01:36 +0000 (13:01 -0700)]
Add Authentication Type field to the APN settings.
Bug:
1817100
Amith Yamasani [Fri, 23 Oct 2009 17:16:35 +0000 (10:16 -0700)]
am
b3735744: Merge change I40dd2cfc into eclair
Merge commit '
b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-plus-aosp
* commit '
b3735744fdd78a2098853d58a1fef6c643e7cb50':
Fix for
2202408: Replace Never Timeout with 30 minutes
Neel Parekh [Fri, 23 Oct 2009 17:16:30 +0000 (10:16 -0700)]
am
62d3407d: Minor change to use defined key rather than a string.
Merge commit '
62d3407de4a843cb83397fa757bc89653d78c800' into eclair-plus-aosp
* commit '
62d3407de4a843cb83397fa757bc89653d78c800':
Minor change to use defined key rather than a string.
Android (Google) Code Review [Fri, 23 Oct 2009 17:09:14 +0000 (13:09 -0400)]
Merge change I40dd2cfc into eclair
* changes:
Fix for
2202408: Replace Never Timeout with 30 minutes
Amith Yamasani [Fri, 23 Oct 2009 03:57:32 +0000 (20:57 -0700)]
Fix for
2202408: Replace Never Timeout with 30 minutes
Maximum timeout is now 30 minutes. Never Timeout will cause
burn-in problems with OLED and a bit with LCD as well.
Neel Parekh [Fri, 23 Oct 2009 01:30:00 +0000 (18:30 -0700)]
Minor change to use defined key rather than a string.
Neel Parekh [Fri, 23 Oct 2009 00:46:23 +0000 (17:46 -0700)]
am
e304b9f4: Add a intent extra to only show the access points in the settings menu.
Merge commit '
e304b9f4f7f5bf07522fcc05615d172abd6c52a3' into eclair-plus-aosp
* commit '
e304b9f4f7f5bf07522fcc05615d172abd6c52a3':
Add a intent extra to only show the access points in the settings menu.
Neel Parekh [Fri, 23 Oct 2009 00:12:49 +0000 (17:12 -0700)]
Add a intent extra to only show the access points in the settings menu.
Bug:
2198865
Eric Fischer [Wed, 21 Oct 2009 19:03:06 +0000 (12:03 -0700)]
am
8355d934: Import revised translations. DO NOT MERGE
Merge commit '
8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-plus-aosp
* commit '
8355d9343455eaacf559f0df0e752f236b7464d2':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:47:42 +0000 (10:47 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Amith Yamasani [Mon, 19 Oct 2009 22:27:51 +0000 (15:27 -0700)]
am
941c3b17: Merge change I61c28c5f into eclair
Merge commit '
941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-plus-aosp
* commit '
941c3b1794203b48a8aa2e9d6f04c09d412262bd':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Android (Google) Code Review [Mon, 19 Oct 2009 22:22:38 +0000 (18:22 -0400)]
Merge change I61c28c5f into eclair
* changes:
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Amith Yamasani [Mon, 19 Oct 2009 18:45:18 +0000 (11:45 -0700)]
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #
2176141
Mike Lockwood [Fri, 16 Oct 2009 16:37:10 +0000 (09:37 -0700)]
am
cdf42466: Remove PowerManager.setAutoBrightness()
Merge commit '
cdf42466bf3471337f1355b872eb2d529ba9409c' into eclair-plus-aosp
* commit '
cdf42466bf3471337f1355b872eb2d529ba9409c':
Remove PowerManager.setAutoBrightness()
Mike Lockwood [Thu, 15 Oct 2009 04:19:04 +0000 (21:19 -0700)]
Remove PowerManager.setAutoBrightness()
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Change-Id: I1850549f513e3541b5761aae28ebc615410377de
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dianne Hackborn [Tue, 13 Oct 2009 22:52:28 +0000 (15:52 -0700)]
am
9f1900dc: Fix issue #
2185893: Can not install 3D Media Gallery
Merge commit '
9f1900dc05773a0659030e21a8c2fa1641655669' into eclair-plus-aosp
* commit '
9f1900dc05773a0659030e21a8c2fa1641655669':
Fix issue #
2185893: Can not install 3D Media Gallery
Dianne Hackborn [Tue, 13 Oct 2009 22:03:57 +0000 (15:03 -0700)]
Fix issue #
2185893: Can not install 3D Media Gallery
Allow the package details to show packages whose .apk is not installed.
Change-Id: I45aec93e6f731beb5fe7010ec680eb8df0241aed
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
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: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: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()
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.
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.
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
Jaikumar Ganesh [Tue, 6 Oct 2009 15:01:21 +0000 (08:01 -0700)]
Remove STOPSHIP debug log.
Bug:
2151872
Dr No: Eastham
Hung-ying Tyan [Tue, 6 Oct 2009 08:15:42 +0000 (16:15 +0800)]
Add L2tpIpsec case in VpnSettings.processSecrets()
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 (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
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".
Chia-chi Yeh [Thu, 1 Oct 2009 18:32:54 +0000 (02:32 +0800)]
SecuritySettings: revert "minor tuning".
Android (Google) Code Review [Thu, 1 Oct 2009 18:17:26 +0000 (14:17 -0400)]
Merge change If764d20a into eclair
* changes:
SecuritySettings: fix a the status before handling the intent.
Chia-chi Yeh [Thu, 1 Oct 2009 18:16:08 +0000 (02:16 +0800)]
SecuritySettings: fix a the status before handling the intent.
Android (Google) Code Review [Thu, 1 Oct 2009 17:14:59 +0000 (13:14 -0400)]
Merge change I844d3db3 into eclair
* changes:
SecuritySettings: set the check box before further processing.
Chia-chi Yeh [Thu, 1 Oct 2009 17:13:36 +0000 (01:13 +0800)]
SecuritySettings: set the check box before further processing.
Android (Google) Code Review [Thu, 1 Oct 2009 17:12:21 +0000 (13:12 -0400)]
Merge change I446bf8b5 into eclair
* changes:
SecuritySettings: minor tuning.
Chia-chi Yeh [Thu, 1 Oct 2009 17:11:17 +0000 (01:11 +0800)]
SecuritySettings: minor tuning.
Android (Google) Code Review [Thu, 1 Oct 2009 17:04:25 +0000 (13:04 -0400)]
Merge change Ibf07c83d into eclair
* changes:
SecuritySettings: remove debug messages.
Chia-chi Yeh [Thu, 1 Oct 2009 17:03:50 +0000 (01:03 +0800)]
SecuritySettings: remove debug messages.
Android (Google) Code Review [Thu, 1 Oct 2009 16:49:08 +0000 (12:49 -0400)]
Merge change Ia7c57145 into eclair
* changes:
SecuritySettings: remove trailing spaces.
Chia-chi Yeh [Thu, 1 Oct 2009 16:48:32 +0000 (00:48 +0800)]
SecuritySettings: remove trailing spaces.
Android (Google) Code Review [Thu, 1 Oct 2009 16:47:24 +0000 (12:47 -0400)]
Merge change I02f58e89 into eclair
* changes:
SecuritySettings: clean up.
Android (Google) Code Review [Thu, 1 Oct 2009 16:47:12 +0000 (12:47 -0400)]
Merge change I28f1a0fc into eclair
* changes:
WifiSettings: use keystore namespace instead of blobl.
Chia-chi Yeh [Thu, 1 Oct 2009 16:39:14 +0000 (00:39 +0800)]
SecuritySettings: clean up.
android-build SharedAccount [Thu, 1 Oct 2009 15:57:04 +0000 (08:57 -0700)]
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
android-build SharedAccount [Thu, 1 Oct 2009 15:46:43 +0000 (08:46 -0700)]
empty merge to avoid future conflicts
Merge branch 'eclair-release' into HEAD
Michael Chan [Thu, 1 Oct 2009 14:54:39 +0000 (07:54 -0700)]
am
7bf9e031: Merge change Ie7e8a7ef into eclair
Merge commit '
7bf9e0317cfb62b12e99ed9ab6c6975c848c519e' into eclair-plus-aosp
* commit '
7bf9e0317cfb62b12e99ed9ab6c6975c848c519e':
Don't auto-connect to OPP after pairing
Android (Google) Code Review [Thu, 1 Oct 2009 14:46:26 +0000 (10:46 -0400)]
Merge change Ie7e8a7ef into eclair
* changes:
Don't auto-connect to OPP after pairing
Chia-chi Yeh [Thu, 1 Oct 2009 11:17:55 +0000 (19:17 +0800)]
WifiSettings: use keystore namespace instead of blobl.
Michael Chan [Thu, 1 Oct 2009 06:08:19 +0000 (23:08 -0700)]
Don't auto-connect to OPP after pairing
Change-Id: Ie7e8a7ef7188f7ffa6b32595764c100a0d72be89
Amith Yamasani [Thu, 1 Oct 2009 04:15:52 +0000 (21:15 -0700)]
am
ee52bed5: Merge change I39527366 into eclair
Merge commit '
ee52bed514cbee1fade95a9f862e238c4975cd8b' into eclair-plus-aosp
* commit '
ee52bed514cbee1fade95a9f862e238c4975cd8b':
Use a custom system icon for native processes.
Mike Cleron [Thu, 1 Oct 2009 04:15:36 +0000 (21:15 -0700)]
am
c5648906: Merge change I00ab9f0b into eclair
Merge commit '
c564890637bf91e92ede27789e4d98863c46e681' into eclair-plus-aosp
* commit '
c564890637bf91e92ede27789e4d98863c46e681':
Fix widgets
Michael Chan [Thu, 1 Oct 2009 04:14:24 +0000 (21:14 -0700)]
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..."
Android (Google) Code Review [Thu, 1 Oct 2009 01:43:48 +0000 (21:43 -0400)]
Merge change I39527366 into eclair
* changes:
Use a custom system icon for native processes.
Amith Yamasani [Wed, 30 Sep 2009 22:54:26 +0000 (15:54 -0700)]
Use a custom system icon for native processes.
New icons for system components in Battery Use screen.
Android (Google) Code Review [Thu, 1 Oct 2009 01:34:36 +0000 (21:34 -0400)]
Merge change I00ab9f0b into eclair
* changes:
Fix widgets
OSDN Git Service
