Android (Google) Code Review
dc7ceaf5bd
Merge change 6204 into donut
...
* changes:
Migrate to new keystore with the CertTool lib.
2009-07-06 03:55:07 -07:00
Android (Google) Code Review
dea9f55274
Merge change 6198 into donut
...
* changes:
keystore: Provide a generic getter for native components.
2009-07-06 00:04:54 -07:00
Chia-chi Yeh
5d0ca76229
keystore: Provide a generic getter for native components.
2009-07-06 14:33:09 +08:00
Chung-yih Wang
6ac03019e6
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.
2009-07-05 11:06:01 +08:00
Android (Google) Code Review
928f5052b5
Merge change 6081 into donut
...
* changes:
Migrate to the CertTool library.
2009-07-03 18:40:54 -07:00
Android (Google) Code Review
f64ab9f67b
Merge change 6187 into donut
...
* changes:
Fix strings.
2009-07-03 09:44:29 -07:00
Android (Google) Code Review
4c6ee740ad
am 7de4bd9b: Merge change 6045 into donut
...
Merge commit '7de4bd9b40d80fd68fc746efd645e3df7442acea'
* commit '7de4bd9b40d80fd68fc746efd645e3df7442acea':
Remove the null-termination for Java string compatibility.
2009-07-03 09:08:36 -07:00
Android (Google) Code Review
d9245ddab9
am 288fe16c: Merge change 6043 into donut
...
Merge commit '288fe16c20e2c20556839046d38c487b0b18735c'
* commit '288fe16c20e2c20556839046d38c487b0b18735c':
System and Secure settings backup.
2009-07-03 08:58:49 -07:00
Chung-yih Wang
816afcfa11
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.
2009-07-03 08:58:46 -07:00
Android (Google) Code Review
b35262e025
am d45dcbec: Merge change 5615 into donut
...
Merge commit 'd45dcbec856710f9478ffc5689e7cdf95d757ab8'
* commit 'd45dcbec856710f9478ffc5689e7cdf95d757ab8':
Implement the generic mini-keystore for security.
2009-07-03 08:58:31 -07:00
Daisuke Miyakawa
0c37fb885e
am 40336782: Add tests. internal bug id 1868702.
...
Merge commit '40336782eaa797bca3d1487784af113ba3b143ff'
* commit '40336782eaa797bca3d1487784af113ba3b143ff':
Add tests. internal bug id 1868702.
2009-07-03 08:58:24 -07:00
Dianne Hackborn
816e7fbd46
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.
2009-07-03 08:58:10 -07:00
The Android Open Source Project
e2008a17b1
resolved conflicts for merge of cf098294 to master
2009-07-03 08:55:59 -07:00
Android (Google) Code Review
57643ce5c6
Merge change 6177 into donut
...
* changes:
Two small checks in keymgmt.
2009-07-03 08:51:59 -07:00
Android (Google) Code Review
7887aa766e
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
b63dea9658
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
1d70b6110f
Merge change 6183 into donut
...
* changes:
Fix null data handling in ServiceCommand.writeCommand()
2009-07-03 02:52:55 -07:00
Android (Google) Code Review
dfa33aa016
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
9c95f73432
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
37b49519cc
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
Mathias Agopian
af54ab9d88
don't need to link against libsgl
2009-07-02 19:04:39 -07:00
Mathias Agopian
7303c6bf1a
get rid of references to MemoryDealer in SurfaceFlinger
2009-07-02 18:50:51 -07:00
Mathias Agopian
6b5513538a
forgot to remove those files
2009-07-02 18:46:57 -07:00
Mathias Agopian
759fdb2ef7
free gralloc buffers as soon as possible (when a surface is not visible any longer), client who have the buffers still mapped won't crash, btu may see garbage data
2009-07-02 18:45:29 -07:00
Android (Google) Code Review
3fca571773
Merge change 6155 into donut
...
* changes:
Unhide android.speech.tts.TextToSpeech
2009-07-02 16:45:12 -07:00
Android (Google) Code Review
9d5ff35b19
Merge change 6143 into donut
...
* changes:
Fix the simulator.
2009-07-02 15:24:43 -07:00
Android (Google) Code Review
798bf698d6
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
dcc7c262fe
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
71a0940c8c
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
aa972a4690
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
60bbbd1a35
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
769ad5f7cf
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
e2784e4cf5
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
687a620ce4
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
Android (Google) Code Review
a4b5675eed
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
Android (Google) Code Review
c5e9a886b1
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
Android (Google) Code Review
df0a957dd7
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
cff72d8f3d
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
Android (Google) Code Review
1b6f29bbea
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
Android (Google) Code Review
a59fb52ae2
Merge change 6102 into donut
...
* changes:
Backup Wifi supplicant data.
2009-07-02 13:19:55 -07:00
Android (Google) Code Review
94a938bb14
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
Android (Google) Code Review
eb05dd5dae
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
4ed5c8958a
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
Android (Google) Code Review
6b55ae67d5
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
Android (Google) Code Review
f777ac1a2b
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
cf564240ed
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
abd7cb08cd
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
James Dong
16f3d35459
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
0919ff5f14
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
7bd460b120
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