OSDN Git Service
Android (Google) Code Review [Mon, 6 Jul 2009 19:00:17 +0000 (12:00 -0700)]
Android (Google) Code Review [Mon, 6 Jul 2009 19:00:12 +0000 (12:00 -0700)]
am
ef1f21b3: Merge change 6231 into donut
Merge commit '
ef1f21b34f5624adb7436d3da927660ed16c97c7'
* commit '
ef1f21b34f5624adb7436d3da927660ed16c97c7':
Don't trim() in the mediascanner, as that would remove the special "sort first" character.
Android (Google) Code Review [Mon, 6 Jul 2009 19:00:08 +0000 (12:00 -0700)]
am
8ad422ad: Merge change 6221 into donut
Merge commit '
8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab'
* commit '
8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab':
Remove links to wikipedia; fix typo; remove .vsd file (bug
1918247).
Marco Nelissen [Mon, 6 Jul 2009 19:00:02 +0000 (12:00 -0700)]
am
899725b0: Make sure ringtones are sorted correctly.
Merge commit '
899725b05dd5c8c51f9f802d4f0a7190532ce0a5'
* commit '
899725b05dd5c8c51f9f802d4f0a7190532ce0a5':
Make sure ringtones are sorted correctly.
Marco Nelissen [Mon, 6 Jul 2009 18:54:24 +0000 (11:54 -0700)]
am
816cf52a: Fix the DEFAULT_SORT_ORDER value for media files. Changing this is OK, because existing app will have the old value compiled in as a literal, and so will continue to (not) work in the same way as before. Add code to media key generator to give a leading a
Merge commit '
816cf52abd8f45770f0ac922bbb819184ed4b90f'
* commit '
816cf52abd8f45770f0ac922bbb819184ed4b90f':
Fix the DEFAULT_SORT_ORDER value for media files. Changing this
The Android Open Source Project [Mon, 6 Jul 2009 18:31:10 +0000 (11:31 -0700)]
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
Android (Google) Code Review [Mon, 6 Jul 2009 18:26:15 +0000 (11:26 -0700)]
Merge change 6227 into donut
* changes:
Adding tts result codes.
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:51 +0000 (11:22 -0700)]
Merge change 6232
* changes:
frameworks/base: Update mPdu in createFromPdu
Hung-ying Tyan [Mon, 6 Jul 2009 18:22:45 +0000 (11:22 -0700)]
am
46841db4: Add PPTP and L2TP/IPSec PSK service dispatching
Merge commit '
46841db4f2c7360d3b861a816e51f76acca0d677'
* commit '
46841db4f2c7360d3b861a816e51f76acca0d677':
Add PPTP and L2TP/IPSec PSK service dispatching
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:36 +0000 (11:22 -0700)]
am
1f2bb46b: Merge change 6204 into donut
Merge commit '
1f2bb46b9a2762a6f57ca8801d91e9dee002158f'
* commit '
1f2bb46b9a2762a6f57ca8801d91e9dee002158f':
Migrate to new keystore with the CertTool lib.
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:25 +0000 (11:22 -0700)]
am
3383df38: Merge change 6198 into donut
Merge commit '
3383df385e208807b1dc5f2956f82a7f75f65fd8'
* commit '
3383df385e208807b1dc5f2956f82a7f75f65fd8':
keystore: Provide a generic getter for native components.
Chung-yih Wang [Mon, 6 Jul 2009 18:22:18 +0000 (11:22 -0700)]
am
699ca3f2: Add password field for WiFi configuration.
Merge commit '
699ca3f2518360ea3250ff5a0e5d39e122c64a91'
* commit '
699ca3f2518360ea3250ff5a0e5d39e122c64a91':
Add password field for WiFi configuration.
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:11 +0000 (11:22 -0700)]
am
4492bcb8: Merge change 6081 into donut
Merge commit '
4492bcb851f4ee862a446664eb9045045ebb7b5e'
* commit '
4492bcb851f4ee862a446664eb9045045ebb7b5e':
Migrate to the CertTool library.
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:07 +0000 (11:22 -0700)]
Android (Google) Code Review [Mon, 6 Jul 2009 18:21:59 +0000 (11:21 -0700)]
am
24ad29c6: Merge change 6177 into donut
Merge commit '
24ad29c6dbbf62096bcb41ddb2fa3975720ee625'
* commit '
24ad29c6dbbf62096bcb41ddb2fa3975720ee625':
Two small checks in keymgmt.
Android (Google) Code Review [Mon, 6 Jul 2009 18:21:50 +0000 (11:21 -0700)]
am
7b8f782e: Merge change 6183 into donut
Merge commit '
7b8f782eaaef392154fe3acd3ffb48c0a81024e9'
* commit '
7b8f782eaaef392154fe3acd3ffb48c0a81024e9':
Fix null data handling in ServiceCommand.writeCommand()
Android (Google) Code Review [Mon, 6 Jul 2009 18:21:45 +0000 (11:21 -0700)]
am
2f97e984: (-s ours) Merge change 6130 into donut
Merge commit '
2f97e984b52b243a5433596c8c291f35778d6b38'
* commit '
2f97e984b52b243a5433596c8c291f35778d6b38':
Make backup agent run in the system process as well.
Android (Google) Code Review [Mon, 6 Jul 2009 18:17:56 +0000 (11:17 -0700)]
am
922f1b85: Merge change 6146 into donut
Merge commit '
922f1b85b9096d9056f1b9e2d777098d1e4ed8b1'
* commit '
922f1b85b9096d9056f1b9e2d777098d1e4ed8b1':
Fixing
1949086 Sholes telephony crash after waking from sleep.
Charles Chen [Mon, 6 Jul 2009 18:17:45 +0000 (11:17 -0700)]
am
4bca97ec: Removing IPA - IPA is already handled by the phoneme tag.
Merge commit '
4bca97ecaf04c50d5ed49920d119f9ffa6c29402'
* commit '
4bca97ecaf04c50d5ed49920d119f9ffa6c29402':
Removing IPA - IPA is already handled by the phoneme tag.
Android (Google) Code Review [Mon, 6 Jul 2009 18:17:34 +0000 (11:17 -0700)]
am
b29f8283: Merge change 6155 into donut
Merge commit '
b29f8283d06c2ab4eb54c991d7ffb5181d91af15'
* commit '
b29f8283d06c2ab4eb54c991d7ffb5181d91af15':
Unhide android.speech.tts.TextToSpeech
Android (Google) Code Review [Mon, 6 Jul 2009 18:17:12 +0000 (11:17 -0700)]
Christopher Tate [Mon, 6 Jul 2009 18:17:02 +0000 (11:17 -0700)]
am
d23d7f2d: Add a \'wipe\' operation to Bmgr
Merge commit '
d23d7f2d12c20314e1e8ff206fafc8f21745ca2d'
* commit '
d23d7f2d12c20314e1e8ff206fafc8f21745ca2d':
Add a 'wipe' operation to Bmgr
Android (Google) Code Review [Mon, 6 Jul 2009 18:16:58 +0000 (11:16 -0700)]
am
e15df401: Merge change 6132 into donut
Merge commit '
e15df4017c3625de700e9f9953073f38898bbc89'
* commit '
e15df4017c3625de700e9f9953073f38898bbc89':
If we can't get the restore set's metadata, don't continue
Android (Google) Code Review [Mon, 6 Jul 2009 18:16:48 +0000 (11:16 -0700)]
am
fe11ea5e: Merge change 6126 into donut
Merge commit '
fe11ea5e2df4a4414aa266e93179c3098b03a795'
* commit '
fe11ea5e2df4a4414aa266e93179c3098b03a795':
Use 'LOCAL_PATH' instead of 'local_path', so it's easier to see a diff of the two .mk files.
Android (Google) Code Review [Mon, 6 Jul 2009 18:16:34 +0000 (11:16 -0700)]
am
0d81f636: (-s ours) Merge change 6102 into donut
Merge commit '
0d81f6368708b1faa42a3bb6413210e01fea9222'
* commit '
0d81f6368708b1faa42a3bb6413210e01fea9222':
Backup Wifi supplicant data.
Android (Google) Code Review [Mon, 6 Jul 2009 18:09:20 +0000 (11:09 -0700)]
Merge change 6231 into donut
* changes:
Don't trim() in the mediascanner, as that would remove the special "sort first" character.
Patrick Scott [Thu, 2 Jul 2009 12:56:10 +0000 (08:56 -0400)]
Basic changes to get embedded video working.
Add the ViewManager class to handle child views within a WebView. This class
attaches and removes the views in the UI thread. It also scales the layout
params based on the scale of the WebView.
Marco Nelissen [Mon, 6 Jul 2009 18:07:27 +0000 (11:07 -0700)]
Don't trim() in the mediascanner, as that would remove the special "sort first" character.
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:59 +0000 (11:02 -0700)]
am
9701b3d5: Merge change 5979 into donut
Merge commit '
9701b3d594868bd6750d5887af560c6295ea091b'
* commit '
9701b3d594868bd6750d5887af560c6295ea091b':
Remove the constraint to assign new uid when code path changes for system packages
Christopher Tate [Mon, 6 Jul 2009 18:02:55 +0000 (11:02 -0700)]
am
4e3e50cf: Clean up the last two literal permission string usages
Merge commit '
4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14'
* commit '
4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14':
Clean up the last two literal permission string usages
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:50 +0000 (11:02 -0700)]
am
7c5ae202: Merge change 6104 into donut
Merge commit '
7c5ae202c53be1ab4881a6811aa5bd091c3aef10'
* commit '
7c5ae202c53be1ab4881a6811aa5bd091c3aef10':
Add a "clear backed-up data" method to the backup mechanism
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:40 +0000 (11:02 -0700)]
am
a642e313: Merge change 6090 into donut
Merge commit '
a642e313988ec7f9e732ead00edbded8b57d7452'
* commit '
a642e313988ec7f9e732ead00edbded8b57d7452':
Adding strings for data root and data files - these are needed
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:33 +0000 (11:02 -0700)]
am
c7396025: Merge change 6084 into donut
Merge commit '
c7396025e59524e7ef639fd86fc23123939ee91c'
* commit '
c7396025e59524e7ef639fd86fc23123939ee91c':
Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug
1956726)
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:25 +0000 (11:02 -0700)]
am
d3de90f3: Merge change 5995 into donut
Merge commit '
d3de90f38d779d28a724e89297c83e6ba1a66fa7'
* commit '
d3de90f38d779d28a724e89297c83e6ba1a66fa7':
Turn off kerning when testing TextUtils.ellipsize().
Android (Google) Code Review [Mon, 6 Jul 2009 18:01:43 +0000 (11:01 -0700)]
Merge change 6221 into donut
* changes:
Remove links to wikipedia; fix typo; remove .vsd file (bug
1918247).
Marco Nelissen [Mon, 6 Jul 2009 17:57:01 +0000 (10:57 -0700)]
Make sure ringtones are sorted correctly.
Charles Chen [Mon, 6 Jul 2009 17:51:48 +0000 (10:51 -0700)]
Adding tts result codes.
Android (Google) Code Review [Mon, 6 Jul 2009 17:29:41 +0000 (10:29 -0700)]
Merge change 6159
* changes:
Add the code to detect how long the WebViewCore thread is idle in the real time.
Android (Google) Code Review [Mon, 6 Jul 2009 17:29:08 +0000 (10:29 -0700)]
Merge change 6144
* changes:
Fix the performance collection in the http thread. A connection can be reused. Change the thread time collection based on per request.
Katarina Stenstedt [Mon, 6 Jul 2009 17:10:19 +0000 (10:10 -0700)]
Remove links to wikipedia; fix typo; remove .vsd file (bug
1918247).
Marco Nelissen [Mon, 6 Jul 2009 16:19:10 +0000 (09:19 -0700)]
Fix the DEFAULT_SORT_ORDER value for media files. Changing this
is OK, because existing app will have the old value compiled in
as a literal, and so will continue to (not) work in the same
way as before. Add code to media key generator to give a leading
ascii \001 the special meaning of "sort first".
Satish Roddom [Wed, 24 Jun 2009 10:10:24 +0000 (05:10 -0500)]
frameworks/base: Update mPdu in createFromPdu
Inside createFromPdu(), the passed-in parameter 'pdu' is assigned
to msg.mPdu, so that we can call getPdu() to get it back.
Android (Google) Code Review [Mon, 6 Jul 2009 16:12:56 +0000 (09:12 -0700)]
am
3bc64a2c: Merge change 6088 into donut
Merge commit '
3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc'
* commit '
3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc':
WifiManager: Limit the number of WifiLocks that can be active simultaneously.
Android (Google) Code Review [Mon, 6 Jul 2009 15:49:19 +0000 (08:49 -0700)]
Merge change 6071
* changes:
In WebTextView, check the focus before sending a key.
Hung-ying Tyan [Mon, 6 Jul 2009 15:31:33 +0000 (23:31 +0800)]
Add PPTP and L2TP/IPSec PSK service dispatching
Leon Scroggins [Thu, 2 Jul 2009 14:37:10 +0000 (10:37 -0400)]
In WebTextView, check the focus before sending a key.
This fixes a bug where the DOM has moved the focus, but the WebTextView
is still sending keys to the old focus. Requires a change in
external/webkit.
Patrick Scott [Thu, 2 Jul 2009 15:31:12 +0000 (11:31 -0400)]
Improve the Vibrator service by keeping track of multiple vibration requests.
There are 2 types of vibrations: simple and repeated. Simple vibrations run for
a given length of time while repeated patterns run until canceled or the calling
process dies.
If a vibration is currently running and another request is issued, the newer
request always takes precedence unless the current vibration is a simple one and
the time left is longer than the new request.
If a repeating vibration is running and a new request overrides that vibration,
the current vibration is pushed onto a stack. Once the new vibration completes,
the previous vibration resumes. IBinder tokens are used to identify Vibration
requests which means that multiple calls to Vibrator.vibrate with the same
Vibrator object will override previous vibrations on that object.
Android (Google) Code Review [Mon, 6 Jul 2009 10:55:07 +0000 (03:55 -0700)]
Merge change 6204 into donut
* changes:
Migrate to new keystore with the CertTool lib.
Hung-ying Tyan [Mon, 6 Jul 2009 09:12:53 +0000 (17:12 +0800)]
Migrate to new keystore with the CertTool lib.
Android (Google) Code Review [Mon, 6 Jul 2009 07:04:54 +0000 (00:04 -0700)]
Merge change 6198 into donut
* changes:
keystore: Provide a generic getter for native components.
Chia-chi Yeh [Mon, 6 Jul 2009 03:13:25 +0000 (11:13 +0800)]
keystore: Provide a generic getter for native components.
Chung-yih Wang [Sat, 4 Jul 2009 14:19:51 +0000 (22:19 +0800)]
Add password field for WiFi configuration.
1. the certtool.h is modified for avoiding the side effect,
for saving the configuration with wpa_supplicant.
2. put the loadLibrary back in CertTool.java
3. Fix incorrect JNI declarations.
Android (Google) Code Review [Sat, 4 Jul 2009 01:40:54 +0000 (18:40 -0700)]
Merge change 6081 into donut
* changes:
Migrate to the CertTool library.
The Android Open Source Project [Fri, 3 Jul 2009 17:51:26 +0000 (10:51 -0700)]
hand rolled out
220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again
Android (Google) Code Review [Fri, 3 Jul 2009 16:44:29 +0000 (09:44 -0700)]
Merge change 6187 into donut
* changes:
Fix strings.
Hung-ying Tyan [Fri, 3 Jul 2009 16:24:48 +0000 (00:24 +0800)]
Fix strings.
* Changes
+ Remove "Up time:" from ongoing event display.
+ Add hint in disconnected notification.
Chung-yih Wang [Thu, 2 Jul 2009 15:42:12 +0000 (23:42 +0800)]
Migrate to the CertTool library.
Keystore is reimplemented and it is mainly for storing
(key, value) pair generically. The certificate related
APIs are moved to the class CertTool instead.
Updates:
Provide the getInstance() which gives the singleton.
Fix the missing construction of the BIO in cert.c.
Android (Google) Code Review [Fri, 3 Jul 2009 16:08:36 +0000 (09:08 -0700)]
am
7de4bd9b: Merge change 6045 into donut
Merge commit '
7de4bd9b40d80fd68fc746efd645e3df7442acea'
* commit '
7de4bd9b40d80fd68fc746efd645e3df7442acea':
Remove the null-termination for Java string compatibility.
Android (Google) Code Review [Fri, 3 Jul 2009 15:58:49 +0000 (08:58 -0700)]
am
288fe16c: Merge change 6043 into donut
Merge commit '
288fe16c20e2c20556839046d38c487b0b18735c'
* commit '
288fe16c20e2c20556839046d38c487b0b18735c':
System and Secure settings backup.
Chung-yih Wang [Fri, 3 Jul 2009 15:58:46 +0000 (08:58 -0700)]
am
eec11827: Add CertTool for handling the keygen and certificate download.
Merge commit '
eec11827a6c06b029030f43c8d54fd871cc3347d'
* commit '
eec11827a6c06b029030f43c8d54fd871cc3347d':
Add CertTool for handling the keygen and certificate download.
Android (Google) Code Review [Fri, 3 Jul 2009 15:58:31 +0000 (08:58 -0700)]
am
d45dcbec: Merge change 5615 into donut
Merge commit '
d45dcbec856710f9478ffc5689e7cdf95d757ab8'
* commit '
d45dcbec856710f9478ffc5689e7cdf95d757ab8':
Implement the generic mini-keystore for security.
Daisuke Miyakawa [Fri, 3 Jul 2009 15:58:24 +0000 (08:58 -0700)]
Dianne Hackborn [Fri, 3 Jul 2009 15:58:10 +0000 (08:58 -0700)]
am
d7cd29da: Add facility to run setup wizard after an update.
Merge commit '
d7cd29da91ccc0aba1f1097e19366f9ca36c7ce1'
* commit '
d7cd29da91ccc0aba1f1097e19366f9ca36c7ce1':
Add facility to run setup wizard after an update.
The Android Open Source Project [Fri, 3 Jul 2009 15:55:59 +0000 (08:55 -0700)]
resolved conflicts for merge of
cf098294 to master
Android (Google) Code Review [Fri, 3 Jul 2009 15:51:59 +0000 (08:51 -0700)]
Merge change 6177 into donut
* changes:
Two small checks in keymgmt.
Android (Google) Code Review [Fri, 3 Jul 2009 15:18:22 +0000 (08:18 -0700)]
am
2bbb80e1: Merge change 5994 into donut
Merge commit '
2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac'
* commit '
2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac':
Less logging in some places. More in others.
Romain Guy [Fri, 3 Jul 2009 15:18:17 +0000 (08:18 -0700)]
am
a5475596: Cleanup a bunch of warnings in app widgets code.
Merge commit '
a54755962ca7725d1e2b6cacbbaece6f1cbf5af4'
* commit '
a54755962ca7725d1e2b6cacbbaece6f1cbf5af4':
Cleanup a bunch of warnings in app widgets code.
Android (Google) Code Review [Fri, 3 Jul 2009 09:52:55 +0000 (02:52 -0700)]
Merge change 6183 into donut
* changes:
Fix null data handling in ServiceCommand.writeCommand()
Hung-ying Tyan [Fri, 3 Jul 2009 09:38:59 +0000 (17:38 +0800)]
Fix null data handling in ServiceCommand.writeCommand()
Android (Google) Code Review [Fri, 3 Jul 2009 07:00:19 +0000 (00:00 -0700)]
Merge change 6130 into donut
* changes:
Make backup agent run in the system process as well.
Android (Google) Code Review [Fri, 3 Jul 2009 05:39:17 +0000 (22:39 -0700)]
Merge change 6146 into donut
* changes:
Fixing
1949086 Sholes telephony crash after waking from sleep.
Chung-yih Wang [Fri, 3 Jul 2009 04:09:52 +0000 (12:09 +0800)]
Two small checks in keymgmt.
1. Enforce the state check in listkey().
2. Enforce the password length check.
Wink Saville [Fri, 3 Jul 2009 03:50:11 +0000 (20:50 -0700)]
Fixing
1949086 Sholes telephony crash after waking from sleep.
Grace Kloba [Fri, 3 Jul 2009 00:22:01 +0000 (17:22 -0700)]
Add the code to detect how long the WebViewCore thread is idle in the real time.
Charles Chen [Fri, 3 Jul 2009 00:21:22 +0000 (17:21 -0700)]
Removing IPA - IPA is already handled by the phoneme tag.
Android (Google) Code Review [Thu, 2 Jul 2009 23:45:12 +0000 (16:45 -0700)]
Merge change 6155 into donut
* changes:
Unhide android.speech.tts.TextToSpeech
Jean-Michel Trivi [Thu, 2 Jul 2009 23:29:30 +0000 (16:29 -0700)]
Unhide android.speech.tts.TextToSpeech
Grace Kloba [Thu, 2 Jul 2009 22:30:34 +0000 (15:30 -0700)]
Fix the performance collection in the http thread. A connection can be reused. Change the thread time collection based on per request.
Android (Google) Code Review [Thu, 2 Jul 2009 22:24:43 +0000 (15:24 -0700)]
Merge change 6143 into donut
* changes:
Fix the simulator.
Android (Google) Code Review [Thu, 2 Jul 2009 22:24:15 +0000 (15:24 -0700)]
am
392282f1: Merge change 5962 into donut
Merge commit '
392282f1e01518491c6536d931500c4bfac7f24f'
* commit '
392282f1e01518491c6536d931500c4bfac7f24f':
SimRecords.getServiceProviderName() always returned null.
Android (Google) Code Review [Thu, 2 Jul 2009 22:24:11 +0000 (15:24 -0700)]
am
8dd02090: Merge change 5940 into donut
Merge commit '
8dd02090cec0743bb1987c2cf21f974ab2e075da'
* commit '
8dd02090cec0743bb1987c2cf21f974ab2e075da':
Add CLDR data/formats for newly-translated locales.
Android (Google) Code Review [Thu, 2 Jul 2009 22:24:01 +0000 (15:24 -0700)]
am
d18dc8c6: Merge change 5906 into donut
Merge commit '
d18dc8c641cb4c89ffb205fb510e59a40ddf43fe'
* commit '
d18dc8c641cb4c89ffb205fb510e59a40ddf43fe':
resolve complex value in application context instead of system context.
Android (Google) Code Review [Thu, 2 Jul 2009 22:23:56 +0000 (15:23 -0700)]
am
54af78a3: Merge change 5950 into donut
Merge commit '
54af78a3f7064e04d7ebd64c985d4149f9f7b05c'
* commit '
54af78a3f7064e04d7ebd64c985d4149f9f7b05c':
Fix memory leaks in system_server
Christopher Tate [Thu, 2 Jul 2009 22:23:49 +0000 (15:23 -0700)]
am
49401ddb: Revamp backup scheduling policy
Merge commit '
49401ddb9ac11ad5caead4e4cefcaa81d2418ed2'
* commit '
49401ddb9ac11ad5caead4e4cefcaa81d2418ed2':
Revamp backup scheduling policy
Christopher Tate [Thu, 2 Jul 2009 22:23:45 +0000 (15:23 -0700)]
am
ce0bf069: Use secure settings for backup enable / transport selection
Merge commit '
ce0bf069fe8c5c93f91cb70b0cd9365245d144c1'
* commit '
ce0bf069fe8c5c93f91cb70b0cd9365245d144c1':
Use secure settings for backup enable / transport selection
Satish Sampath [Thu, 2 Jul 2009 22:23:40 +0000 (15:23 -0700)]
am
1b1a6e40: Fix build break by adding an @hide javadoc comment.
Merge commit '
1b1a6e406c4233b309baee85e14f5a563ca63c48'
* commit '
1b1a6e406c4233b309baee85e14f5a563ca63c48':
Fix build break by adding an @hide javadoc comment.
Satish Sampath [Thu, 2 Jul 2009 22:23:32 +0000 (15:23 -0700)]
am
fef8d3e4: Make search UI open up quicker to the user.
Merge commit '
fef8d3e4d8f6f46c098d04b3a57409c947ec1c75'
* commit '
fef8d3e4d8f6f46c098d04b3a57409c947ec1c75':
Make search UI open up quicker to the user.
Marco Nelissen [Thu, 2 Jul 2009 22:23:26 +0000 (15:23 -0700)]
Fix the simulator.
Android (Google) Code Review [Thu, 2 Jul 2009 22:11:04 +0000 (15:11 -0700)]
Merge change 6140
* changes:
Add support for multitexture and fix allocation ref counting bug in RS. Add plaque to rollo and leave it disabled due to ugly appearance.
Jason Sams [Thu, 2 Jul 2009 22:09:27 +0000 (15:09 -0700)]
Add support for multitexture and fix allocation ref counting bug in RS. Add plaque to rollo and leave it disabled due to ugly appearance.
Christopher Tate [Thu, 2 Jul 2009 21:37:05 +0000 (14:37 -0700)]
Add a 'wipe' operation to Bmgr
"bmgr wipe PACKAGE" now issues the backup transport clearBackupData() operation
for the given package.
Android (Google) Code Review [Thu, 2 Jul 2009 21:30:56 +0000 (14:30 -0700)]
Merge change 6132 into donut
* changes:
If we can't get the restore set's metadata, don't continue
Christopher Tate [Thu, 2 Jul 2009 21:28:47 +0000 (14:28 -0700)]
If we can't get the restore set's metadata, don't continue
Without the metadata we can't verify the version number or the signatures of the
apps whose data we'd be trying to restore against the apps present on device.
This is not acceptable; we need to refuse to give data to an unauthenticated
app.
Android (Google) Code Review [Thu, 2 Jul 2009 21:25:41 +0000 (14:25 -0700)]
am
74dc3e4a: Merge change 5616 into donut
Merge commit '
74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f'
* commit '
74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f':
Revise VpnService to use new vpn.* properties.
Android (Google) Code Review [Thu, 2 Jul 2009 21:25:33 +0000 (14:25 -0700)]
am
50d87fbd: Merge change 5879 into donut
Merge commit '
50d87fbd691a59759d5bbe12284d322f9fa967dd'
* commit '
50d87fbd691a59759d5bbe12284d322f9fa967dd':
Represent new searchSettingsDescription attribute on searchables in
Amith Yamasani [Thu, 2 Jul 2009 21:25:21 +0000 (14:25 -0700)]
Make backup agent run in the system process as well.
Android (Google) Code Review [Thu, 2 Jul 2009 21:20:08 +0000 (14:20 -0700)]
Merge change 6126 into donut
* changes:
Use 'LOCAL_PATH' instead of 'local_path', so it's easier to see a diff of the two .mk files.
Marco Nelissen [Thu, 2 Jul 2009 21:18:30 +0000 (14:18 -0700)]
Use 'LOCAL_PATH' instead of 'local_path', so it's easier to see a diff of the two .mk files.
Android (Google) Code Review [Thu, 2 Jul 2009 20:19:55 +0000 (13:19 -0700)]
Merge change 6102 into donut
* changes:
Backup Wifi supplicant data.
Android (Google) Code Review [Thu, 2 Jul 2009 19:20:29 +0000 (12:20 -0700)]
Merge change 5979 into donut
* changes:
Remove the constraint to assign new uid when code path changes for system packages