4153 Commits

Author SHA1 Message Date
Android (Google) Code Review
24ad29c6db Merge change 6177 into donut
* changes:
  Two small checks in keymgmt.
2009-07-03 08:51:59 -07:00
Android (Google) Code Review
7a91dc11ac am 2bbb80e1: Merge change 5994 into donut
Merge commit '2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac'

* commit '2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac':
  Less logging in some places.  More in others.
2009-07-03 08:18:22 -07:00
Romain Guy
28dda652a2 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.
2009-07-03 08:18:17 -07:00
Android (Google) Code Review
7b8f782eaa Merge change 6183 into donut
* changes:
  Fix null data handling in ServiceCommand.writeCommand()
2009-07-03 02:52:55 -07:00
Hung-ying Tyan
116d890aea Fix null data handling in ServiceCommand.writeCommand() 2009-07-03 17:38:59 +08:00
Android (Google) Code Review
2f97e984b5 Merge change 6130 into donut
* changes:
  Make backup agent run in the system process as well.
2009-07-03 00:00:19 -07:00
Android (Google) Code Review
922f1b85b9 Merge change 6146 into donut
* changes:
  Fixing 1949086 Sholes telephony crash after waking from sleep.
2009-07-02 22:39:17 -07:00
Chung-yih Wang
a734207fd1 Two small checks in keymgmt.
1. Enforce the state check in listkey().
2. Enforce the password length check.
2009-07-03 12:14:36 +08:00
Wink Saville
1eee698c3e Fixing 1949086 Sholes telephony crash after waking from sleep. 2009-07-02 20:50:11 -07:00
Grace Kloba
f099481c26 Add the code to detect how long the WebViewCore thread is idle in the real time. 2009-07-02 17:22:01 -07:00
Charles Chen
4bca97ecaf Removing IPA - IPA is already handled by the phoneme tag. 2009-07-02 17:21:22 -07:00
Android (Google) Code Review
b29f8283d0 Merge change 6155 into donut
* changes:
  Unhide android.speech.tts.TextToSpeech
2009-07-02 16:45:12 -07:00
Jean-Michel Trivi
62788e9b48 Unhide android.speech.tts.TextToSpeech 2009-07-02 16:29:30 -07:00
Grace Kloba
340a1b21de Fix the performance collection in the http thread. A connection can be reused. Change the thread time collection based on per request. 2009-07-02 15:30:34 -07:00
Android (Google) Code Review
7e8cbfc2bc Merge change 6143 into donut
* changes:
  Fix the simulator.
2009-07-02 15:24:43 -07:00
Android (Google) Code Review
10063c1089 am 392282f1: Merge change 5962 into donut
Merge commit '392282f1e01518491c6536d931500c4bfac7f24f'

* commit '392282f1e01518491c6536d931500c4bfac7f24f':
  SimRecords.getServiceProviderName() always returned null.
2009-07-02 15:24:15 -07:00
Android (Google) Code Review
8fa66a5f0e am 8dd02090: Merge change 5940 into donut
Merge commit '8dd02090cec0743bb1987c2cf21f974ab2e075da'

* commit '8dd02090cec0743bb1987c2cf21f974ab2e075da':
  Add CLDR data/formats for newly-translated locales.
2009-07-02 15:24:11 -07:00
Android (Google) Code Review
fc2459b80a am d18dc8c6: Merge change 5906 into donut
Merge commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe'

* commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe':
  resolve complex value in application context instead of system context.
2009-07-02 15:24:01 -07:00
Android (Google) Code Review
0d0012ef16 am 54af78a3: Merge change 5950 into donut
Merge commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c'

* commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c':
  Fix memory leaks in system_server
2009-07-02 15:23:56 -07:00
Christopher Tate
1c502a4624 am 49401ddb: Revamp backup scheduling policy
Merge commit '49401ddb9ac11ad5caead4e4cefcaa81d2418ed2'

* commit '49401ddb9ac11ad5caead4e4cefcaa81d2418ed2':
  Revamp backup scheduling policy
2009-07-02 15:23:49 -07:00
Christopher Tate
b0b659a8aa am ce0bf069: Use secure settings for backup enable / transport selection
Merge commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1'

* commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1':
  Use secure settings for backup enable / transport selection
2009-07-02 15:23:45 -07:00
Satish Sampath
9b7df7e628 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.
2009-07-02 15:23:40 -07:00
Satish Sampath
ed9f4c4c2f 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.
2009-07-02 15:23:32 -07:00
Marco Nelissen
d595c79cdd Fix the simulator. 2009-07-02 15:23:26 -07:00
Android (Google) Code Review
ec0ab537a8 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.
2009-07-02 15:11:04 -07:00
Jason Sams
4244afa87e Add support for multitexture and fix allocation ref counting bug in RS. Add plaque to rollo and leave it disabled due to ugly appearance. 2009-07-02 15:09:27 -07:00
Christopher Tate
d23d7f2d12 Add a 'wipe' operation to Bmgr
"bmgr wipe PACKAGE" now issues the backup transport clearBackupData() operation
for the given package.
2009-07-02 14:37:50 -07:00
Android (Google) Code Review
e15df4017c Merge change 6132 into donut
* changes:
  If we can't get the restore set's metadata, don't continue
2009-07-02 14:30:56 -07:00
Christopher Tate
8c0324752a 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.
2009-07-02 14:28:47 -07:00
Android (Google) Code Review
385276028d am 74dc3e4a: Merge change 5616 into donut
Merge commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f'

* commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f':
  Revise VpnService to use new vpn.* properties.
2009-07-02 14:25:41 -07:00
Android (Google) Code Review
71eb2471a3 am 50d87fbd: Merge change 5879 into donut
Merge commit '50d87fbd691a59759d5bbe12284d322f9fa967dd'

* commit '50d87fbd691a59759d5bbe12284d322f9fa967dd':
  Represent new searchSettingsDescription attribute on searchables in
2009-07-02 14:25:33 -07:00
Amith Yamasani
426cc62598 Make backup agent run in the system process as well. 2009-07-02 14:25:21 -07:00
Android (Google) Code Review
fe11ea5e2d 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.
2009-07-02 14:20:08 -07:00
Marco Nelissen
632d553580 Use 'LOCAL_PATH' instead of 'local_path', so it's easier to see a diff of the two .mk files. 2009-07-02 14:18:30 -07:00
Android (Google) Code Review
0d81f63687 Merge change 6102 into donut
* changes:
  Backup Wifi supplicant data.
2009-07-02 13:19:55 -07:00
Android (Google) Code Review
9701b3d594 Merge change 5979 into donut
* changes:
  Remove the constraint to assign new uid when code path changes for system packages
2009-07-02 12:20:29 -07:00
Christopher Tate
4e3e50cfa7 Clean up the last two literal permission string usages 2009-07-02 12:14:05 -07:00
Android (Google) Code Review
7c5ae202c5 Merge change 6104 into donut
* changes:
  Add a "clear backed-up data" method to the backup mechanism
2009-07-02 12:10:42 -07:00
Android (Google) Code Review
7a50639236 Merge change 6067
* changes:
  recognize when plugin is eligable for user events and then notify the plugin.
2009-07-02 12:10:31 -07:00
Amith Yamasani
16d79e56ca Backup Wifi supplicant data.
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
2009-07-02 12:05:32 -07:00
Android (Google) Code Review
a642e31398 Merge change 6090 into donut
* changes:
  Adding strings for data root and data files - these are needed for returning this information in an Intent from checkVoiceData.
2009-07-02 11:31:14 -07:00
Christopher Tate
ee0e78af5a Add a "clear backed-up data" method to the backup mechanism
It's now possible to ask that the backup manager wipe the saved data for a given
application from the backing store.  LocalTransport implements this now but the
Google backend does not yet.  When the data is wiped, the on-device backup state
is also wiped to ensure that the next backup pushes all necessary data.

Bmgr has not yet been modified to actually call into this method, but it will
be soon.
2009-07-02 11:30:29 -07:00
Charles Chen
99a0feecd0 Adding strings for data root and data files - these are needed
for returning this information in an Intent from checkVoiceData.
2009-07-02 11:29:26 -07:00
Android (Google) Code Review
c7396025e5 Merge change 6084 into donut
* changes:
  Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
2009-07-02 11:00:41 -07:00
Android (Google) Code Review
d3de90f38d Merge change 5995 into donut
* changes:
  Turn off kerning when testing TextUtils.ellipsize().
2009-07-02 10:46:37 -07:00
Android (Google) Code Review
3bc64a2cb9 Merge change 6088 into donut
* changes:
  WifiManager: Limit the number of WifiLocks that can be active simultaneously.
2009-07-02 10:40:33 -07:00
Mike Lockwood
617750604c WifiManager: Limit the number of WifiLocks that can be active simultaneously.
This is to prevent a bad app from using up all the global references in the
system process due to allocating too many DeathRecipients.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-02 13:25:00 -04:00
James Dong
a1b653d41d Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726) 2009-07-02 10:04:20 -07:00
Android (Google) Code Review
7de4bd9b40 Merge change 6045 into donut
* changes:
  Remove the null-termination for Java string compatibility.
2009-07-02 08:34:35 -07:00
Chung-yih Wang
fa927c046a Remove the null-termination for Java string compatibility.
1. Also change the keyname delimiter in CertTool.java.
2. Return NOTFOUND if the result.len==0 in the listKeys().
3. Define the keystore states in the class Keystore.
2009-07-02 23:08:39 +08:00