ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,416 Commits 2 Branches 0 Tags 54 MiB
12b47c56de
Commit Graph

2416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
952aa2322b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-06 11:31:10 -07:00
Android (Google) Code Review
cbdf6a97b6 Merge change 6227 into donut 
* changes:
  Adding tts result codes.
 2009-07-06 11:26:15 -07:00
Android (Google) Code Review
8de5607307 Merge change 6232 
* changes:
  frameworks/base: Update mPdu in createFromPdu
 2009-07-06 11:22:51 -07:00
Hung-ying Tyan
5eff27ce82 am 46841db4: Add PPTP and L2TP/IPSec PSK service dispatching 
Merge commit '46841db4f2c7360d3b861a816e51f76acca0d677'

* commit '46841db4f2c7360d3b861a816e51f76acca0d677':
  Add PPTP and L2TP/IPSec PSK service dispatching
 2009-07-06 11:22:45 -07:00
Android (Google) Code Review
3882f676c1 am 1f2bb46b: Merge change 6204 into donut 
Merge commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f'

* commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f':
  Migrate to new keystore with the CertTool lib.
 2009-07-06 11:22:36 -07:00
Android (Google) Code Review
29f5a900db am 3383df38: Merge change 6198 into donut 
Merge commit '3383df385e208807b1dc5f2956f82a7f75f65fd8'

* commit '3383df385e208807b1dc5f2956f82a7f75f65fd8':
  keystore: Provide a generic getter for native components.
 2009-07-06 11:22:25 -07:00
Chung-yih Wang
e439029f8a am 699ca3f2: Add password field for WiFi configuration. 
Merge commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91'

* commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91':
  Add password field for WiFi configuration.
 2009-07-06 11:22:18 -07:00
Android (Google) Code Review
e68a938829 am 4492bcb8: Merge change 6081 into donut 
Merge commit '4492bcb851f4ee862a446664eb9045045ebb7b5e'

* commit '4492bcb851f4ee862a446664eb9045045ebb7b5e':
  Migrate to the CertTool library.
 2009-07-06 11:22:11 -07:00
Android (Google) Code Review
9acbfd90b7 am 6b1ab257: Merge change 6187 into donut 
Merge commit '6b1ab2572ed114beba07230f6fa9c02519cf27df'

* commit '6b1ab2572ed114beba07230f6fa9c02519cf27df':
  Fix strings.
 2009-07-06 11:22:07 -07:00
Android (Google) Code Review
2659e77bd2 am 24ad29c6: Merge change 6177 into donut 
Merge commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625'

* commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625':
  Two small checks in keymgmt.
 2009-07-06 11:21:59 -07:00
Android (Google) Code Review
a244e8cdc9 am 7b8f782e: Merge change 6183 into donut 
Merge commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9'

* commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9':
  Fix null data handling in ServiceCommand.writeCommand()
 2009-07-06 11:21:50 -07:00
Android (Google) Code Review
065659ac1b am 2f97e984: (-s ours) Merge change 6130 into donut 
Merge commit '2f97e984b52b243a5433596c8c291f35778d6b38'

* commit '2f97e984b52b243a5433596c8c291f35778d6b38':
  Make backup agent run in the system process as well.
 2009-07-06 11:21:45 -07:00
Android (Google) Code Review
de2f14d2b9 am 922f1b85: Merge change 6146 into donut 
Merge commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1'

* commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1':
  Fixing 1949086 Sholes telephony crash after waking from sleep.
 2009-07-06 11:17:56 -07:00
Charles Chen
a8aad0ecc0 am 4bca97ec: Removing IPA - IPA is already handled by the phoneme tag. 
Merge commit '4bca97ecaf04c50d5ed49920d119f9ffa6c29402'

* commit '4bca97ecaf04c50d5ed49920d119f9ffa6c29402':
  Removing IPA - IPA is already handled by the phoneme tag.
 2009-07-06 11:17:45 -07:00
Android (Google) Code Review
72deb7d3b0 am b29f8283: Merge change 6155 into donut 
Merge commit 'b29f8283d06c2ab4eb54c991d7ffb5181d91af15'

* commit 'b29f8283d06c2ab4eb54c991d7ffb5181d91af15':
  Unhide android.speech.tts.TextToSpeech
 2009-07-06 11:17:34 -07:00
Android (Google) Code Review
0e7703b87d am 7e8cbfc2: Merge change 6143 into donut 
Merge commit '7e8cbfc2bc3ea2334c38db7fd2b6a1e17eefcac6'

* commit '7e8cbfc2bc3ea2334c38db7fd2b6a1e17eefcac6':
  Fix the simulator.
 2009-07-06 11:17:12 -07:00
Christopher Tate
57d03b4bbf am d23d7f2d: Add a \'wipe\' operation to Bmgr 
Merge commit 'd23d7f2d12c20314e1e8ff206fafc8f21745ca2d'

* commit 'd23d7f2d12c20314e1e8ff206fafc8f21745ca2d':
  Add a 'wipe' operation to Bmgr
 2009-07-06 11:17:02 -07:00
Android (Google) Code Review
02764a8712 am e15df401: Merge change 6132 into donut 
Merge commit 'e15df4017c3625de700e9f9953073f38898bbc89'

* commit 'e15df4017c3625de700e9f9953073f38898bbc89':
  If we can't get the restore set's metadata, don't continue
 2009-07-06 11:16:58 -07:00
Android (Google) Code Review
257755deb4 am fe11ea5e: Merge change 6126 into donut 
Merge commit 'fe11ea5e2df4a4414aa266e93179c3098b03a795'

* commit 'fe11ea5e2df4a4414aa266e93179c3098b03a795':
  Use 'LOCAL_PATH' instead of 'local_path', so it's easier to see a diff of the two .mk files.
 2009-07-06 11:16:48 -07:00
Android (Google) Code Review
e1a935d3e5 am 0d81f636: (-s ours) Merge change 6102 into donut 
Merge commit '0d81f6368708b1faa42a3bb6413210e01fea9222'

* commit '0d81f6368708b1faa42a3bb6413210e01fea9222':
  Backup Wifi supplicant data.
 2009-07-06 11:16:34 -07:00
Dianne Hackborn
0f253efba5 Don't re-parse the framework resources all the time. 
A small optimization to the resource code, to not re-parse the framework
resources every time we build a new AssetManager.  Instead, you can now
construct a ResTable from a previously created one...  of course, like the
existing code for using the data in-place, you can't delete the original
ResTable until you have deleted the one that has been constructed from it.
 2009-07-06 11:12:37 -07:00
Android (Google) Code Review
88008f1955 Merge change 6231 into donut 
* changes:
  Don't trim() in the mediascanner, as that would remove the special "sort first" character.
 2009-07-06 11:09:20 -07:00
Android (Google) Code Review
3e2f5fba64 am 9701b3d5: Merge change 5979 into donut 
Merge commit '9701b3d594868bd6750d5887af560c6295ea091b'

* commit '9701b3d594868bd6750d5887af560c6295ea091b':
  Remove the constraint to assign new uid when code path changes for system packages
 2009-07-06 11:02:59 -07:00
Christopher Tate
f5bab08384 am 4e3e50cf: Clean up the last two literal permission string usages 
Merge commit '4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14'

* commit '4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14':
  Clean up the last two literal permission string usages
 2009-07-06 11:02:55 -07:00
Android (Google) Code Review
509519028e am 7c5ae202: Merge change 6104 into donut 
Merge commit '7c5ae202c53be1ab4881a6811aa5bd091c3aef10'

* commit '7c5ae202c53be1ab4881a6811aa5bd091c3aef10':
  Add a "clear backed-up data" method to the backup mechanism
 2009-07-06 11:02:50 -07:00
Android (Google) Code Review
d0773614ac am a642e313: Merge change 6090 into donut 
Merge commit 'a642e313988ec7f9e732ead00edbded8b57d7452'

* commit 'a642e313988ec7f9e732ead00edbded8b57d7452':
  Adding strings for data root and data files - these are needed
 2009-07-06 11:02:40 -07:00
Android (Google) Code Review
4361996a8c am c7396025: Merge change 6084 into donut 
Merge commit 'c7396025e59524e7ef639fd86fc23123939ee91c'

* commit 'c7396025e59524e7ef639fd86fc23123939ee91c':
  Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
 2009-07-06 11:02:33 -07:00
Android (Google) Code Review
d356587db3 am d3de90f3: Merge change 5995 into donut 
Merge commit 'd3de90f38d779d28a724e89297c83e6ba1a66fa7'

* commit 'd3de90f38d779d28a724e89297c83e6ba1a66fa7':
  Turn off kerning when testing TextUtils.ellipsize().
 2009-07-06 11:02:25 -07:00
Android (Google) Code Review
0b41add758 Merge change 6221 into donut 
* changes:
  Remove links to wikipedia; fix typo; remove .vsd file (bug 1918247).
 2009-07-06 11:01:43 -07:00
Android (Google) Code Review
8639184334 Merge change 6159 
* changes:
  Add the code to detect how long the WebViewCore thread is idle in the real time.
 2009-07-06 10:29:41 -07:00
Android (Google) Code Review
4103765d02 Merge change 6144 
* changes:
  Fix the performance collection in the http thread. A connection can be reused. Change the thread time collection based on per request.
 2009-07-06 10:29:08 -07:00
Android (Google) Code Review
0c7987e511 am 3bc64a2c: Merge change 6088 into donut 
Merge commit '3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc'

* commit '3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc':
  WifiManager: Limit the number of WifiLocks that can be active simultaneously.
 2009-07-06 09:12:56 -07:00
Android (Google) Code Review
bb1b5ef4e4 Merge change 6071 
* changes:
  In WebTextView, check the focus before sending a key.
 2009-07-06 08:49:19 -07:00
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