Commit Graph

4025 Commits

Author SHA1 Message Date
Android (Google) Code Review
84fcd18ecb 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
133ec72f24 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
82c30ee562 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
7d9e45b223 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
92aaac8cb0 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
5d16cd0462 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
575d1af980 resolved conflicts for merge of cf098294 to master 2009-07-03 08:55: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
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
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
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
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
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
Derek Sollenberger
945f3b43a0 recognize when plugin is eligable for user events and then notify the plugin. 2009-07-02 10:27:08 -04:00
Android (Google) Code Review
288fe16c20 Merge change 6043 into donut
* changes:
  System and Secure settings backup.
2009-07-02 05:01:23 -07:00
Amith Yamasani
220f4d633b System and Secure settings backup.
This backs up the basic system and secure settings. THe restoration doesn't
take effect immediately. You many need to restart the runtime to see all
restored values take effect.
2009-07-02 04:58:09 -07:00
Chung-yih Wang
eec11827a6 Add CertTool for handling the keygen and certificate download.
1. Have the new Keystore for mini-keystore impelemntation.
2. Add CertTool library and jni dll for handling keygen and certificates.
3. Make Reply hidden.
4. Revert some 'incorrect' change and correct the description.
2009-07-02 18:56:12 +08:00
Android (Google) Code Review
d45dcbec85 Merge change 5615 into donut
* changes:
  Implement the generic mini-keystore for security.
2009-07-02 00:16:21 -07:00
Chung-yih Wang
70246ebb9b Implement the generic mini-keystore for security.
1. We will progressively migrate to this implementation.
2. For richc to have a quick review on the keymgmt part.
3. Add remove_key and make sure all functions are working.
4. Add permission check for get operation.
5. Return the retry count if unlock failed.
6. Add the reset operation for keystore reset.
7. Add the putfile shell command for putting the key value from file.
8. Fix the boundary issue during parsing command.
9. Use the ' ' as delimiter and reset the reply structure for each request.
10. Add change password retry count check.
11. Extract the read_marshal/write_marshal for certtool.h.
12. Remove the old implementation.
2009-07-02 14:08:20 +08:00
Android (Google) Code Review
4dd4ce292e am c56096fe: Merge change 5878 into donut
Merge commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47'

* commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47':
  Add new attribute 'searchSettingsDescription' for use within an app's
2009-07-01 22:44:50 -07:00
Android (Google) Code Review
f73a65c2d7 am 65363830: Merge change 5854 into donut
Merge commit '65363830c1e5ca8c59b6e12b4b43a3f03688ca2e'

* commit '65363830c1e5ca8c59b6e12b4b43a3f03688ca2e':
  Run backups at background priority
2009-07-01 22:44:37 -07:00
Android (Google) Code Review
c885577145 am b0b815da: Merge change 5845 into donut
Merge commit 'b0b815da8c487bbfac6b2eadc91c619682720a71'

* commit 'b0b815da8c487bbfac6b2eadc91c619682720a71':
  Always clear the TextView drag state whenever a touch begins.
2009-07-01 22:44:33 -07:00
Android (Google) Code Review
4a79a017a1 am daa5a215: Merge change 5810 into donut
Merge commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825'

* commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825':
  Fix bug 1930055 of NullPointerException.
2009-07-01 22:44:22 -07:00
Android (Google) Code Review
730babbd5e am 85d650c8: Merge change 5804 into donut
Merge commit '85d650c89998eb108faa2c02dcc32467e23f9555'

* commit '85d650c89998eb108faa2c02dcc32467e23f9555':
  Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that
2009-07-01 22:44:16 -07:00
Android (Google) Code Review
023d7564a6 am f3ab3c34: Merge change 5833 into donut
Merge commit 'f3ab3c3437f18834ce63542062c2ed7a87a05fca'

* commit 'f3ab3c3437f18834ce63542062c2ed7a87a05fca':
  Fix nit on length of flag constant.
2009-07-01 22:44:08 -07:00
Android (Google) Code Review
f83d7785d2 am f9eca3d4: Merge change 5807 into donut
Merge commit 'f9eca3d43aed870774633a176aa691d3e530a12b'

* commit 'f9eca3d43aed870774633a176aa691d3e530a12b':
  Fixing synth to file to use the speech queue.
2009-07-01 22:44:02 -07:00
Android (Google) Code Review
d96e0b0cf1 am 6e1647a2: Merge change 5829 into donut
Merge commit '6e1647a212317f4ee8bcc23948b6621a59172954'

* commit '6e1647a212317f4ee8bcc23948b6621a59172954':
  Fix issue #1673793: Theme styles don't apply.
2009-07-01 22:43:58 -07:00
Android (Google) Code Review
74ab31598b am d8de2ba4: Merge change 5750 into donut
Merge commit 'd8de2ba42679a10db2adc11995d6596a0045ab3a'

* commit 'd8de2ba42679a10db2adc11995d6596a0045ab3a':
  Add a new checkin server flag for Vending Machine client server ping frequency for pending downloads.
2009-07-01 22:43:48 -07:00
Daisuke Miyakawa
40336782ea Add tests. internal bug id 1868702. 2009-07-02 14:33:39 +09:00
Android (Google) Code Review
2ca4d49ef0 Merge change 6026
* changes:
  Merge commit '1dac277f' into manualmerge
2009-07-01 21:33:39 -07:00
Dianne Hackborn
8ec5b83fc8 Merge commit '1dac277f' into manualmerge
Required rewriting the okay battery broadcast stuff.

Conflicts:
	services/java/com/android/server/status/StatusBarPolicy.java
2009-07-01 21:19:35 -07:00
Dianne Hackborn
d7cd29da91 Add facility to run setup wizard after an update.
The system now keeps a tag of the last version (just an arbitrary string)
that the setup wizard was run for.  If this is different than the current
one in the setup wizard, then setup is launched at boot.

This introduces a new intent action for the part of the setup wizard that
gets run for an ungrade, which the system uses to find its current version
tag for comparing against what was last stored.  It is up to the launched
setup activity update the stored setting to reflect its current value,
once it is happy.
2009-07-01 20:20:47 -07:00
Android (Google) Code Review
ae78df4b46 Merge change 6022
* changes:
  Update rollo with icon images.
2009-07-01 20:18:01 -07:00
Jason Sams
aabd00960f Update rollo with icon images. 2009-07-01 20:17:07 -07:00
Dianne Hackborn
cf098294da Move backup state to settings, change permission checks to use symbol.
This changes the backup service to use the settings provider instead
of system properties, correspondingly making it off by default and
allowing specific devices to define the transport.  Also tweaks
the permission checks to use the permission symbol instead of raw
strings.

This requires some corresponding changes in the vendor projects.
2009-07-01 20:12:36 -07:00
Android (Google) Code Review
7f32b426cd Merge change 5992
* changes:
  Allocate 16MB for surfaces on Firstone, since 8MB is way to small for our bigger screen.
2009-07-01 18:29:21 -07:00
Android (Google) Code Review
2bbb80e183 Merge change 5994 into donut
* changes:
  Less logging in some places.  More in others.
2009-07-01 18:04:40 -07:00
Joe Onorato
9a5e3e115f Less logging in some places. More in others. 2009-07-01 21:04:03 -04:00
Mathias Agopian
ff80ceb80d Allocate 16MB for surfaces on Firstone, since 8MB is way to small for our bigger screen. 2009-07-01 17:47:38 -07:00