Commit Graph

2416 Commits

Author SHA1 Message Date
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
Android (Google) Code Review
cdf34e02ed Merge change 6043 into donut
* changes:
  System and Secure settings backup.
2009-07-02 05:01:23 -07:00
Android (Google) Code Review
dca4e5332c Merge change 5615 into donut
* changes:
  Implement the generic mini-keystore for security.
2009-07-02 00:16:21 -07:00
Chung-yih Wang
c186c66a29 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
7749ef9aa3 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
c175093823 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
fa0ccc88a9 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
1dcc7190c6 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
562f50350a 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
aca69df509 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
9b8762a329 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
47a1a39ce9 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
49a09200fc 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
Android (Google) Code Review
0086cbea6e Merge change 6026
* changes:
  Merge commit '1dac277f' into manualmerge
2009-07-01 21:33:39 -07:00
Dianne Hackborn
36d4d5ce3e 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
Android (Google) Code Review
beecae7494 Merge change 6022
* changes:
  Update rollo with icon images.
2009-07-01 20:18:01 -07:00
Mathias Agopian
84d1f7a098 Merge commit 'goog/master' into merge_master 2009-07-01 18:33:18 -07:00
Android (Google) Code Review
9ff0fe07b6 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