Commit Graph

2545 Commits

Author SHA1 Message Date
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
crazybob
cd84ef2561 Removed system/framework/android.awt.jar. 2009-07-02 14:11:33 -05: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
Android (Google) Code Review
9fc5f84201 Merge change 5994 into donut
* changes:
  Less logging in some places.  More in others.
2009-07-01 18:04:40 -07:00
Joe Onorato
00dae0a084 Less logging in some places. More in others. 2009-07-01 21:04:03 -04:00
Mathias Agopian
78f1c1949f Allocate 16MB for surfaces on Firstone, since 8MB is way to small for our bigger screen. 2009-07-01 17:47:38 -07:00
Android (Google) Code Review
cee89ad2c9 am 9848f11f: Merge change 5826 into donut
Merge commit '9848f11fd8788b985330183aeb83cc589b8b14ae'

* commit '9848f11fd8788b985330183aeb83cc589b8b14ae':
  Fix NullPointerException in NinePatch constructor
2009-07-01 17:27:46 -07:00
Android (Google) Code Review
e41c5150da Merge change 5984
* changes:
  Update rollo and support functions.  Includes mockup of some new ui concepts.
2009-07-01 16:43:34 -07:00
Android (Google) Code Review
a339e15154 Merge change 5983
* changes:
  Begin adding mesh
2009-07-01 16:43:14 -07:00
Android (Google) Code Review
d114d5adc9 am b1a97523: Merge change 5739 into donut
Merge commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e'

* commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e':
  Check to make sure the Java camera object is still valid on the
2009-07-01 16:02:03 -07:00
Android (Google) Code Review
70856a2f0b am b7d7d5f6: Merge change 5806 into donut
Merge commit 'b7d7d5f6380e1b7c2b1754be05b0113b91ce01c9'

* commit 'b7d7d5f6380e1b7c2b1754be05b0113b91ce01c9':
  Use additional functions to collect more memory information data points.
2009-07-01 16:01:58 -07:00
Christopher Tate
47f9e6df28 am 72d19aa5: Tighten up the metadata backup logic
Merge commit '72d19aa51e90d45c7895629db78e548da2f6d469'

* commit '72d19aa51e90d45c7895629db78e548da2f6d469':
  Tighten up the metadata backup logic
2009-07-01 16:01:48 -07:00
Android (Google) Code Review
978c5e9a48 am 91c91b74: Merge change 5817 into donut
Merge commit '91c91b74df12e40c31a50ecb807ac60bed2ccb58'

* commit '91c91b74df12e40c31a50ecb807ac60bed2ccb58':
  Replace indeterminate progress animated asset with new ones
2009-07-01 16:01:40 -07:00
Android (Google) Code Review
128d240903 am 441cb04e: Merge change 5732 into donut
Merge commit '441cb04efc0048585b3a6e6fa3d564e3d1b26f62'

* commit '441cb04efc0048585b3a6e6fa3d564e3d1b26f62':
  Fix assertContentsInOrder (bug 1790350).
2009-07-01 16:01:30 -07:00
Android (Google) Code Review
2e45f3f4fc Merge change 5847
* changes:
  Adds new attributes for specifying icons to be used in the Contacts app.
2009-07-01 15:19:40 -07:00
Android (Google) Code Review
854129514c am 2f8d58b7: Merge change 5420 into donut
Merge commit '2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede'

* commit '2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede':
  Added two test cases to trace the failure in closing the hw decoder and the current playtime is greater than the duration.
2009-07-01 14:18:45 -07:00
Android (Google) Code Review
b5b84b73c8 Merge change 5894
* changes:
  Obex library cleanup, second pass.
2009-07-01 14:13:25 -07:00
Android (Google) Code Review
9378daef81 Merge change 5863
* changes:
  Obex library cleanup, first pass.
2009-07-01 14:13:18 -07:00
Android (Google) Code Review
73f3a5e10f Merge change 5827
* changes:
  Add javax.obex library, contributed by Motorola.
2009-07-01 14:12:59 -07:00
Android (Google) Code Review
bdfffcc0c2 Merge change 5962 into donut
* changes:
  SimRecords.getServiceProviderName() always returned null.
2009-07-01 14:12:10 -07:00
Android (Google) Code Review
f9aabc1c27 Merge change 5940 into donut
* changes:
  Add CLDR data/formats for newly-translated locales.
2009-07-01 14:04:32 -07:00
Android (Google) Code Review
eee4987d2c Merge change 5906 into donut
* changes:
  resolve complex value in application context instead of system context.
2009-07-01 12:53:04 -07:00
Android (Google) Code Review
5499ddc312 Merge change 5950 into donut
* changes:
  Fix memory leaks in system_server unlink DeathRecipients in a whole bunch of places to avoid memory leaks
2009-07-01 12:52:39 -07:00
Android (Google) Code Review
1353c45338 am a79ee8e2: Merge change 5792 into donut
Merge commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e'

* commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e':
  Fix typo introduced during variable cleanup.
2009-07-01 11:20:25 -07:00