Commit Graph

2130 Commits

Author SHA1 Message Date
Android (Google) Code Review
28d48710f1 Merge change 5386 into donut
* changes:
  Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is targeted.
2009-06-25 12:05:08 -07:00
Hung-ying Tyan
c0b5d8a5fe Add PPTP, L2TP/IPSec preshared key and other fixes.
* Changes
  + Add PptpProfile.java, PptpService.java.
  + Add L2tpIpsecPskProfile.java
  + Add PPTP and L2TP_IPSEC_PSK entries in VpnType.java.
  + Add the secret option to L2tpProfile.java and have L2tpIpsecProfile
    extend it.
  + Add MtpdHelper to send common PPP options.
  + Add getGatewayIp() to VpnService().
  + Revise VpnService.reallyGetHostIp().

  Patch Set 6, 7, 8:
  + Add L2TP secret flag in L2tpProfile.

  Patch Set 9:
  + Add description to VpnType.

  Patch Set 11:
  + Pass ipparam to mtpd.

  Patch Set 12:
  + Add L2TP secret support
  + Fix string constants
2009-06-26 03:02:22 +08:00
Android (Google) Code Review
45802bafc1 Merge change 5383
* changes:
  Oops, need to hide the new api.
2009-06-25 11:57:14 -07:00
Grace Kloba
5a53548800 resolved conflicts for merge of 0d8b77c2 to master 2009-06-25 11:42:46 -07:00
Android (Google) Code Review
c3d936e093 Merge change 5316
* changes:
  add Gservices setting for data messaging app token url.
2009-06-25 10:32:38 -07:00
Android (Google) Code Review
219ebad565 am d4eac5f3: Merge change 5300 into donut
Merge commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7'

* commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7':
  Using a sendBroadcast to notify interested parties of when
2009-06-25 10:21:34 -07:00
Android (Google) Code Review
4af209f6b0 Merge change 5300 into donut
* changes:
  Using a sendBroadcast to notify interested parties of when the TTS queue has finished processing.
2009-06-25 10:20:31 -07:00
Android (Google) Code Review
33c49708b2 Merge change 5348
* changes:
  Add missing filename remap to RenamingDelegatingContext
2009-06-25 09:24:08 -07:00
Android (Google) Code Review
e54af13157 am f881762f: Merge change 5351 into donut
Merge commit 'f881762f97c74253bbc7f629380bb65739457041'

* commit 'f881762f97c74253bbc7f629380bb65739457041':
  Add a method to Process to get uid for a pid.
2009-06-25 00:47:51 -07:00
Android (Google) Code Review
e0ed7d7660 Merge change 5351 into donut
* changes:
  Add a method to Process to get uid for a pid.
2009-06-25 00:46:17 -07:00
Android (Google) Code Review
6b4855db08 am d48388ab: Merge change 5344 into donut
Merge commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca'

* commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca':
  frameworks/base: CDMA voicemail support
2009-06-25 00:10:18 -07:00
Android (Google) Code Review
e8503ae079 Merge change 5344 into donut
* changes:
  frameworks/base: CDMA voicemail support
2009-06-25 00:09:18 -07:00
Android (Google) Code Review
53aeca1d37 am 6184a2ad: Merge change 5339 into donut
Merge commit '6184a2ad42ee7b83f9db5a6fd9c99013a914c49e'

* commit '6184a2ad42ee7b83f9db5a6fd9c99013a914c49e':
  Fix intermittent crash related to call waiting
2009-06-25 00:00:31 -07:00
Mathias Agopian
f51f9c8af3 fix [1942438] eglGetCurrentSurface() returns bogus value 2009-06-24 23:59:16 -07:00
Android (Google) Code Review
7863d064fe Merge change 5339 into donut
* changes:
  Fix intermittent crash related to call waiting
2009-06-24 23:57:59 -07:00
Android (Google) Code Review
8b04323a32 am 60a0ad65: Merge change 5329 into donut
Merge commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6'

* commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6':
  frameworks/base - CDMA settings additions
2009-06-24 23:41:00 -07:00
Android (Google) Code Review
8ceb326988 Merge change 5329 into donut
* changes:
  frameworks/base - CDMA settings additions
2009-06-24 23:39:07 -07:00
Android (Google) Code Review
8da70e8049 am c6a482e7: Merge change 5199 into donut
Merge commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112'

* commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112':
  Only remove client after the hardware is teared down, so a new client
2009-06-24 20:34:35 -07:00
Android (Google) Code Review
6007b6d7fa Merge change 5199 into donut
* changes:
  Only remove client after the hardware is teared down, so a new client is rejected before old client is done.
2009-06-24 20:33:11 -07:00
Android (Google) Code Review
d54efb52ac am 83b8678d: Merge change 5319 into donut
Merge commit '83b8678dd4cc78dc89fe853161bd470ef28561c8'

* commit '83b8678dd4cc78dc89fe853161bd470ef28561c8':
  Add new APIs to LauncherActivity to be used elsewhere.
2009-06-24 20:31:09 -07:00
Android (Google) Code Review
01fb8feae5 Merge change 5319 into donut
* changes:
  Add new APIs to LauncherActivity to be used elsewhere.
2009-06-24 20:29:21 -07:00
Chih-Chung Chang
d2d6bc7552 Only remove client after the hardware is teared down, so a new client
is rejected before old client is done.

Also check mUsers in all cases to make sure there are no existing client.
2009-06-25 11:03:55 +08:00
Android (Google) Code Review
2ff5c78161 Merge change 4292
* changes:
  Moved owning package and restricted flag to Contact.
2009-06-24 19:51:29 -07:00
Jack Palevich
df0be3d154 am c7410f6f: Add includes to enable host C++ tools to compile with GCC 4.4
Merge commit 'c7410f6f9f8f2aeb9368502a4a725b1a7abe1190'

* commit 'c7410f6f9f8f2aeb9368502a4a725b1a7abe1190':
  Add includes to enable host C++ tools to compile with GCC 4.4
2009-06-24 19:35:14 -07:00
Android (Google) Code Review
3d377e3468 am ad39eb0a: Merge change 5302 into donut
Merge commit 'ad39eb0a2555762a1d9157f8017097579d14f39d'

* commit 'ad39eb0a2555762a1d9157f8017097579d14f39d':
  Add includes to enable host C++ tools to compile with GCC 4.4
2009-06-24 19:15:57 -07:00
Android (Google) Code Review
d5b7ba2daf Merge change 5302 into donut
* changes:
  Add includes to enable host C++ tools to compile with GCC 4.4
2009-06-24 19:14:17 -07:00
Android (Google) Code Review
8e5a0e87fe am 5416d7c9: Merge change 5317 into donut
Merge commit '5416d7c905e723a978ac29ccaf22a91b76e9d5c2'

* commit '5416d7c905e723a978ac29ccaf22a91b76e9d5c2':
  Start backing up wallpaper
2009-06-24 18:48:39 -07:00
Android (Google) Code Review
1fe7737153 Merge change 5317 into donut
* changes:
  Start backing up wallpaper
2009-06-24 18:46:59 -07:00
Android (Google) Code Review
6ebed66004 am 7941e903: Merge change 5091 into donut
Merge commit '7941e903c973af66075bbd4fa4bcadf021a61ccc'

* commit '7941e903c973af66075bbd4fa4bcadf021a61ccc':
  * new screen resolution support impl.
2009-06-24 17:56:05 -07:00
Android (Google) Code Review
3e6438995b Merge change 5091 into donut
* changes:
  * new screen resolution support impl.   * use full window for activities, and shift & clip the content   * refactored the compatibility code, and introdcued Translator class to handle cooridnate translations.   * removed a workaround to handle an activity with configChagne=rotation in old implementation.   * I'll fix background issue on rotation in next CL.
2009-06-24 17:53:57 -07:00
Android (Google) Code Review
c571dc43c0 am 69e1f472: Merge change 5289 into donut
Merge commit '69e1f472c33e241f729c470285a5680866ede75c'

* commit '69e1f472c33e241f729c470285a5680866ede75c':
  Fix TextView's fading edge when compound drawables are setup.
2009-06-24 17:39:19 -07:00
Android (Google) Code Review
7feb4cb790 am 67669c9c: Merge change 5196 into donut
Merge commit '67669c9c1753b062fe2a71f89b589d01b32ba0f7'

* commit '67669c9c1753b062fe2a71f89b589d01b32ba0f7':
  Modify the IBackupTransport API to support bulk restore operations.
2009-06-24 17:39:15 -07:00
Android (Google) Code Review
d7a055a03f Merge change 5289 into donut
* changes:
  Fix TextView's fading edge when compound drawables are setup.
2009-06-24 17:18:48 -07:00
Charles Chen
46bc681cad resolved conflicts for merge of 5158cc55 to master 2009-06-24 16:54:35 -07:00
Android (Google) Code Review
0dc0e02445 Merge change 5196 into donut
* changes:
  Modify the IBackupTransport API to support bulk restore operations. Change the BackupManagerService and LocalTransport to support the new API.
2009-06-24 16:52:16 -07:00
Android (Google) Code Review
4d3273dcc0 Merge change 5259 into donut
* changes:
  Adding TTS_QUEUE_PROCESSING_COMPLETED action to the list of Intents
2009-06-24 16:25:29 -07:00
Dianne Hackborn
304adbffd4 am 9c8dd55a: Fix bug 1829561 ("am profile" with bad filename kills process).
Merge commit '9c8dd55a9d829c29a3feee9469d8c2f27a9f5516'

* commit '9c8dd55a9d829c29a3feee9469d8c2f27a9f5516':
  Fix bug 1829561 ("am profile" with bad filename kills process).
2009-06-24 16:25:26 -07:00
Android (Google) Code Review
66dfa24ffd am 0bc7b849: Merge change 5248 into donut
Merge commit '0bc7b8490b1575bb8266a3b0c6652d4f460fcda1'

* commit '0bc7b8490b1575bb8266a3b0c6652d4f460fcda1':
  Spell out the month names in the de_AT date format file.
2009-06-24 15:57:52 -07:00
Android (Google) Code Review
fd69c79a11 Merge change 5248 into donut
* changes:
  Spell out the month names in the de_AT date format file.
2009-06-24 15:55:48 -07:00
Android (Google) Code Review
a4392013c1 am 3e376a74: Merge change 5171 into donut
Merge commit '3e376a74b3edd8c311e8d69ca5baf986c9da4a06'

* commit '3e376a74b3edd8c311e8d69ca5baf986c9da4a06':
  Track native processes and airplane mode.
2009-06-24 15:45:49 -07:00
Romain Guy
f0568c7ae6 am 95607038: Reverse the order in which RelativeLayout measures and positions children.
Merge commit '956070383945db5f842ec05e507fd0233705738c'

* commit '956070383945db5f842ec05e507fd0233705738c':
  Reverse the order in which RelativeLayout measures and positions children.
2009-06-24 15:45:37 -07:00
Android (Google) Code Review
87a435aeb2 am ae7c980e: Merge change 4556 into donut
Merge commit 'ae7c980e8e5f5e8c78536f0b37fca50d1a7966ca'

* commit 'ae7c980e8e5f5e8c78536f0b37fca50d1a7966ca':
  Added info about mcc and mnc, plus other changes per http://b/1918247; rewrote "How Android find best match" section per rgreenwalt's comments and added flowchart.
2009-06-24 15:45:32 -07:00
Romain Guy
2d6be60fdd am a0fd1d74: Fix NPE in RelativeLayout.
Merge commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503'

* commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503':
  Fix NPE in RelativeLayout.
2009-06-24 15:45:27 -07:00
Android (Google) Code Review
714d24f2b1 am e181409c: Merge change 5240 into donut
Merge commit 'e181409ced966f2bea6128bf32b0334e34fcf58c'

* commit 'e181409ced966f2bea6128bf32b0334e34fcf58c':
  Fixing the synth function so that queue processing continues.
2009-06-24 15:45:23 -07:00
Android (Google) Code Review
6ef6895b03 am df65b60c: Merge change 5243 into donut
Merge commit 'df65b60ce33e5a56815864f8f0713e25378fa649'

* commit 'df65b60ce33e5a56815864f8f0713e25378fa649':
  Only report "unknown metadata" once per restore helper
2009-06-24 15:45:20 -07:00
Android (Google) Code Review
21c7d43004 am 2cf6f5df: Merge change 5238 into donut
Merge commit '2cf6f5df59d466a729cc10b7688e17cd548a2fda'

* commit '2cf6f5df59d466a729cc10b7688e17cd548a2fda':
  Fix the weird anchoring of the search dropdown when pivoting into an
2009-06-24 15:45:17 -07:00
Android (Google) Code Review
0dbed7d687 am b28bf241: Merge change 5226 into donut
Merge commit 'b28bf241c56264b915ec3ca0e81256bb1d009aa5'

* commit 'b28bf241c56264b915ec3ca0e81256bb1d009aa5':
  Fix bug in TTS service where the language setting was using the default language
2009-06-24 15:45:06 -07:00
Android (Google) Code Review
c52aaa9088 am 83f6b130: Merge change 5237 into donut
Merge commit '83f6b130181982eb653621c2c4028feae36f1ffb'

* commit '83f6b130181982eb653621c2c4028feae36f1ffb':
  Calling setItemChecked(p, true) twice would toggle the selection in ListView.
2009-06-24 15:45:03 -07:00
Android (Google) Code Review
7c8c554e2d am a4335ee8: Merge change 5236 into donut
Merge commit 'a4335ee8a7ce9e45b1d3b7a0eb7aefa16b7024b1'

* commit 'a4335ee8a7ce9e45b1d3b7a0eb7aefa16b7024b1':
  RelativeLayout was ignoring some dependencies.
2009-06-24 15:44:51 -07:00
Android (Google) Code Review
aa8d188de3 am a93466f5: Merge change 5220 into donut
Merge commit 'a93466f5ca41c2ba6c3524c8d1edc2138bf753e3'

* commit 'a93466f5ca41c2ba6c3524c8d1edc2138bf753e3':
  Cleanup header file. Disallow copy of Camera object by making copy
2009-06-24 15:44:45 -07:00